refactor: Cleanup

Socordia-Org · Feb 5, 2025 · b361b77 · b361b77
1 parent 6b3a1a2
commit b361b77
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 11 deletions.
diff --git a/NewSource/SocordiaC/Compilation/Listeners/Body/IfStatementListener.cs b/NewSource/SocordiaC/Compilation/Listeners/Body/IfStatementListener.cs
@@ -2,6 +2,7 @@
 using MrKWatkins.Ast.Listening;
 using Socordia.CodeAnalysis.AST;
 using Socordia.CodeAnalysis.AST.Statements;
+using Socordia.Compilation;
 
 namespace SocordiaC.Compilation.Listeners.Body;
 

diff --git a/NewSource/SocordiaC/Compilation/Listeners/Body/Lowering/AssignmentsLowerer.cs b/NewSource/SocordiaC/Compilation/Listeners/Body/Lowering/AssignmentsLowerer.cs
@@ -18,9 +18,14 @@ public class AssignmentsLowerer : Replacer<AstNode, BinaryOperatorExpression>
     {
         if (!ShortAssignmentOperators.Contains(node.Operator)) return node;
 
+        var left = node.Left;
+        var right = node.Right;
+        node.Left.RemoveFromParent();
+        node.Right.RemoveFromParent();
+
         var newOperator = node.Operator.Replace("=", "");
-        return new BinaryOperatorExpression("=", node.Left,
-            new BinaryOperatorExpression(newOperator, node.Left, node.Right)
+        return new BinaryOperatorExpression("=", left,
+            new BinaryOperatorExpression(newOperator, left, right)
         );
     }
 }
diff --git a/NewSource/SocordiaC/Compilation/Listeners/Body/Lowering/SwapLowerer.cs b/NewSource/SocordiaC/Compilation/Listeners/Body/Lowering/SwapLowerer.cs
@@ -1,6 +1,8 @@
 using MrKWatkins.Ast.Processing;
 using Socordia.CodeAnalysis.AST;
 using Socordia.CodeAnalysis.AST.Expressions;
+using Socordia.CodeAnalysis.AST.Statements;
+using Socordia.CodeAnalysis.AST.TypeNames;
 
 namespace SocordiaC.Compilation.Listeners.Body.Lowering;
 
@@ -10,12 +12,15 @@ public class SwapLowerer : Replacer<AstNode, BinaryOperatorExpression>
     {
         if (node.Operator != "<->") return node;
 
+        var leftId = (Identifier)node.Left;
+        var rightId = (Identifier)node.Right;
+
         //todo: implement a swap by introducting a new temp variable and test it
         var tmpName = Utils.GenerateIdentifier();
-        var tmp = new VariableStatement(tmpName, node.Left.Type, node.Left, false);
+        var tmp = new VariableStatement(tmpName, new NoTypeName(), new Identifier(leftId.Name), false);
 
-        var left = new BinaryOperatorExpression("=", node.Left, node.Right);
-        var right = new BinaryOperatorExpression("=", node.Right, new Identifier(tmpName));
+        var left = new BinaryOperatorExpression("=", new Identifier(leftId.Name), new Identifier(rightId.Name));
+        var right = new BinaryOperatorExpression("=", new Identifier(rightId.Name), new Identifier(tmpName));
 
         return new Block([tmp, left, right]);
     }

diff --git a/NewSource/SocordiaC/Compilation/Listeners/Body/VariableDeclarationListener.cs b/NewSource/SocordiaC/Compilation/Listeners/Body/VariableDeclarationListener.cs
@@ -13,7 +13,7 @@ public class VariableDeclarationListener : Listener<BodyCompilation, AstNode, Va
     protected override void ListenToNode(BodyCompilation context, VariableStatement node)
     {
         var value = Utils.CreateValue(node.Initializer, context);
-        if (value is Instruction instr) context.Builder.Emit(instr);
+        if (value is Instruction { Block: null } instr) context.Builder.Emit(instr);
 
         TypeDesc type;
         if (node.Type is not NoTypeName)
@@ -24,6 +24,11 @@ protected override void ListenToNode(BodyCompilation context, VariableStatement
         else
         {
             type = value.ResultType;
+
+            if (value is LocalSlot s)
+            {
+             //   type = s.Type;
+            }
         }
 
         var slot = context.Method.Body!.CreateVar(type, node.Name);

diff --git a/NewSource/SocordiaC/Compilation/Listeners/Body/WhileStatementListener.cs b/NewSource/SocordiaC/Compilation/Listeners/Body/WhileStatementListener.cs
@@ -3,6 +3,7 @@
 using MrKWatkins.Ast.Listening;
 using Socordia.CodeAnalysis.AST;
 using Socordia.CodeAnalysis.AST.Statements.Loops;
+using Socordia.Compilation;
 
 namespace SocordiaC.Compilation.Listeners.Body;
 

diff --git a/NewSource/SocordiaC/SocordiaC.csproj b/NewSource/SocordiaC/SocordiaC.csproj
@@ -6,7 +6,7 @@
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>scc</ToolCommandName>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-        <ApplicationIcon>logo.png</ApplicationIcon>
+        <ApplicationIcon>icon.ico</ApplicationIcon>
     </PropertyGroup>
 
     <ItemGroup>
@@ -19,10 +19,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <None Update="compilation.sc">
+        <None Update="compilation.scs">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
-        <None Update="hello.sc">
+        <None Update="hello.scs">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
     </ItemGroup>

diff --git a/NewSource/SocordiaC/hello.scs b/NewSource/SocordiaC/hello.scs
@@ -1,8 +1,11 @@
 
 func main()
 {
-     let x = 12;
-     let y = 5;
+     let mut x = 12;
+     let mut y = 5;
 
      x <-> y;
+
+     print(x);
+     print(y);
 }