refactor: Cleanup

Socordia-Org · Dec 30, 2024 · 797ce2d · 797ce2d
1 parent 5b79388
commit 797ce2d
Show file tree

Hide file tree

Showing 15 changed files with 164 additions and 104 deletions.
diff --git a/NewSource/.idea/.idea.Socordia/.idea/workspace.xml b/NewSource/.idea/.idea.Socordia/.idea/workspace.xml
diff --git a/NewSource/Socordia.CodeAnalysis/AST/Declarations/ModuleDeclaration.cs b/NewSource/Socordia.CodeAnalysis/AST/Declarations/ModuleDeclaration.cs
@@ -33,7 +33,7 @@ private IEnumerable<string> GetNames(AstNode node)
                 result.Add(id.Name);
                 break;
             }
-            if (node is BinaryOperatorExpression { Operator: "'." } bin)
+            if (node is BinaryOperatorExpression { Operator: "." } bin)
             {
                 result.Add(((Identifier)bin.Left).Name);
 

diff --git a/NewSource/Socordia.CodeAnalysis/AST/TypeNames/QualifiedTypeName.cs b/NewSource/Socordia.CodeAnalysis/AST/TypeNames/QualifiedTypeName.cs
@@ -27,7 +27,7 @@ private void AddChildrenRecursively(BinaryOperatorExpression op)
             {
                 Children.Add(new SimpleTypeName(id.Name));
             }
-            else if (child is BinaryOperatorExpression binaryChild && binaryChild.Operator == "'.")
+            else if (child is BinaryOperatorExpression binaryChild && binaryChild.Operator == ".")
             {
                 AddChildrenRecursively(binaryChild);
             }

diff --git a/NewSource/Socordia.CodeAnalysis/Parsing/Expression.cs b/NewSource/Socordia.CodeAnalysis/Parsing/Expression.cs
@@ -61,7 +61,7 @@ public static AstNode Parse(Parser parser, ParsePointCollection parsePoints = nu
 
                 var operand = Parse(parser, parsePoints, preUnaryOperatorPrecedence + 1);
 
-                left = SyntaxTree.Unary(operatorToken.Text, operand, UnaryOperatorKind.Prefix);
+                left = new UnaryOperatorExpression(operatorToken.Text, operand, UnaryOperatorKind.Prefix);
             }
         }
         else
@@ -77,7 +77,7 @@ public static AstNode Parse(Parser parser, ParsePointCollection parsePoints = nu
                 {
                     var unaryOperatorToken = parser.Iterator.NextToken();
 
-                    left = SyntaxTree.Unary(unaryOperatorToken.Text, left, UnaryOperatorKind.Suffix);
+                    left = new UnaryOperatorExpression(unaryOperatorToken.Text, left, UnaryOperatorKind.Suffix);
                 }
             }
         }
@@ -93,7 +93,7 @@ public static AstNode Parse(Parser parser, ParsePointCollection parsePoints = nu
             var operatorToken = parser.Iterator.NextToken();
             var right = Parse(parser, parsePoints, precedence);
 
-            left =  new BinaryOperatorExpression($"'{operatorToken.Text}", left, right);
+            left =  new BinaryOperatorExpression(operatorToken.Text, left, right);
 
             // parsing postunary for: Hello::new()? = false;
             var postUnaryOperatorPrecedence = GetPostUnaryOperatorPrecedence(parser.Iterator.Current.Type);
@@ -104,7 +104,7 @@ public static AstNode Parse(Parser parser, ParsePointCollection parsePoints = nu
                 {
                     var unaryOperatorToken = parser.Iterator.NextToken();
 
-                    left = SyntaxTree.Unary(unaryOperatorToken.Text, left, UnaryOperatorKind.Suffix);
+                    left = new UnaryOperatorExpression(unaryOperatorToken.Text, left, UnaryOperatorKind.Suffix);
                 }
             }
         }

diff --git a/NewSource/Socordia.CodeAnalysis/Parsing/ParsePoints/Statements/ReturnStatementParser.cs b/NewSource/Socordia.CodeAnalysis/Parsing/ParsePoints/Statements/ReturnStatementParser.cs
@@ -7,12 +7,14 @@ public sealed class ReturnStatementParser : IParsePoint
 {
     public static AstNode Parse(TokenIterator iterator, Parser parser)
     {
-        if (iterator.IsMatch(TokenType.Semicolon))
+        if (iterator.ConsumeIfMatch(TokenType.Semicolon))
         {
-            iterator.Match(TokenType.Semicolon);
-            return new ReturnStatement(Expression.Parse(parser));
+            return new ReturnStatement(new EmptyNode());
         }
 
-        return null;
+        AstNode node = new ReturnStatement(Expression.Parse(parser));
+        iterator.Match(TokenType.Semicolon);
+
+        return node;
     }
 }
diff --git a/NewSource/Socordia.CodeAnalysis/Parsing/Parser.ParsePoints.cs b/NewSource/Socordia.CodeAnalysis/Parsing/Parser.ParsePoints.cs
@@ -40,12 +40,12 @@ public void InitParsePoints()
 
         AddExpressionParsePoint<IdentifierParser>(TokenType.Identifier);
         AddExpressionParsePoint<GroupOrTupleExpressionParser>(TokenType.OpenParen);
-       // AddExpressionParsePoint<MatchExpression>(TokenType.Match);
         AddExpressionParsePoint<DefaultExpressionParser>(TokenType.Default);
         AddExpressionParsePoint<SizeOfExpressionParser>(TokenType.SizeOf);
         AddExpressionParsePoint<TypeOfExpressionParser>(TokenType.TypeOf);
         AddExpressionParsePoint<NoneExpressionParser>(TokenType.None);
         AddExpressionParsePoint<InitializerListExpression>(TokenType.OpenSquare);
+       // AddExpressionParsePoint<MatchExpression>(TokenType.Match);
 
         AddStatementParsePoint<ThrowStatementParser>(TokenType.Throw);
         AddStatementParsePoint<BreakStatementParser>(TokenType.Break);

diff --git a/NewSource/Socordia.CodeAnalysis/Parsing/SyntaxTree.cs b/NewSource/Socordia.CodeAnalysis/Parsing/SyntaxTree.cs
@@ -170,11 +170,6 @@ public static AstNode Try(Block body, List<CatchStatement> catches, Block? final
         return new TryStatement(body, catches, finallly);
     }
 
-    public static AstNode Unary(string op, AstNode operand, UnaryOperatorKind kind)
-    {
-        return new UnaryOperatorExpression(op, operand, kind);
-    }
-
     public static LNode Using(LNode expr)
     {
         if (!expr.Calls(CodeSymbols.As)) // TODO: throw error in intermediate stage when has only one arg