refactor: Cleanup

Socordia-Org · Jan 5, 2025 · ccdf7d9 · ccdf7d9
1 parent e55a1a1
commit ccdf7d9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/NewSource/Socordia.CodeAnalysis/AST/Statements/ImportStatement.cs b/NewSource/Socordia.CodeAnalysis/AST/Statements/ImportStatement.cs
@@ -1,6 +1,6 @@
 namespace Socordia.CodeAnalysis.AST.Statements;
 
-public class ImportStatement : AstNode
+public class ImportStatement : Declaration
 {
     public ImportStatement(AstNode expression)
     {

diff --git a/NewSource/Socordia.CodeAnalysis/Parsing/Parser.ParsePoints.cs b/NewSource/Socordia.CodeAnalysis/Parsing/Parser.ParsePoints.cs
@@ -26,14 +26,14 @@ public void InitParsePoints()
         AddDeclarationParsePoint<DelegateDeclarationParser>(TokenType.Delegate);
         AddDeclarationParsePoint<UnionDeclarationParser>(TokenType.Union);
         AddDeclarationParsePoint<UnitDeclarationParser>(TokenType.Unit);
+        AddDeclarationParsePoint<DiscriminatedUnionDeclarationParser>(TokenType.Type);
 
         AddDeclarationParsePoint<FunctionDefinitionParser>(TokenType.Function);
         AddDeclarationParsePoint<RulesForDeclarationParser>(TokenType.Rules);
 
       /*  AddDeclarationParsePoint<ConstructorDeclarationParser>(TokenType.Constructor);
         AddDeclarationParsePoint<DestructorDeclaration>(TokenType.Destructor);
         AddDeclarationParsePoint<BitFieldDeclaration>(TokenType.Bitfield);
-        AddDeclarationParsePoint<DiscriminatedUnionDeclaration>(TokenType.Type);
         AddDeclarationParsePoint<MacroDeclaration>(TokenType.Macro);
         AddDeclarationParsePoint<ImplementationDeclaration>(TokenType.Implement);*/
        // AddDeclarationParsePoint<MacroBlockDeclaration>(TokenType.Identifier);

diff --git a/NewSource/SocordiaC/Compilation/Body/ReturnStatementListener.cs b/NewSource/SocordiaC/Compilation/Body/ReturnStatementListener.cs
@@ -12,4 +12,6 @@ protected override void ListenToNode(BodyCompilation context, ReturnStatement no
         var value = Utils.CreateValue(node.Value, context);
         context.Builder.Emit(new ReturnInst(value));
     }
+
+    protected override bool ShouldListenToChildren(BodyCompilation context, AstNode node) => false;
 }
diff --git a/NewSource/SocordiaC/Compilation/Utils.Values.cs b/NewSource/SocordiaC/Compilation/Utils.Values.cs
@@ -106,10 +106,16 @@ private static Value CreateBinary(BinaryOperatorExpression binary, BodyCompilati
             "-" => compilation.Builder.CreateSub(left, right),
             "*" => compilation.Builder.CreateMul(left, right),
             "/" => compilation.Builder.CreateFDiv(left, right),
+            "=" => CreateAssignment(left, right, compilation),
             _ => throw new InvalidOperationException()
         };
     }
 
+    private static Value CreateAssignment(Value left, Value right, BodyCompilation compilation)
+    {
+        return compilation.Builder.CreateStore(left, right);
+    }
+
     private static Value CreateUnary(UnaryOperatorExpression unary, BodyCompilation compilation)
     {
         var left = CreateValue(unary.Operand, compilation);