создание операций и терминалов конструкторами

Author: Mr-Rm

src/OneScript.Language/SyntaxAnalysis/AstNodes/BinaryOperationNode.cs

@@ -17,5 +17,13 @@ public BinaryOperationNode(Lexem operation) : base(NodeKind.BinaryOperation, ope
         {
             Operation = operation.Token;
         }
+
+        public BinaryOperationNode(BslSyntaxNode firstArg, BslSyntaxNode secondArg, Lexem operation)
+            : base(NodeKind.BinaryOperation, operation)
+        {
+            Operation = operation.Token;
+            AddChild(firstArg);
+            AddChild(secondArg);
+        }
     }
 }

src/OneScript.Language/SyntaxAnalysis/AstNodes/UnaryOperationNode.cs

@@ -16,6 +16,12 @@ public class UnaryOperationNode : NonTerminalNode
         public UnaryOperationNode(Lexem operation) : base(NodeKind.UnaryOperation, operation)
         {
             Operation = operation.Token;
-        }
+        }
+
+        public UnaryOperationNode(BslSyntaxNode arg, Lexem operation) : base(NodeKind.UnaryOperation, operation)
+        {
+            Operation = operation.Token;
+            AddChild(arg);
+        }
     }
 }

src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs

@@ -757,9 +757,7 @@ private BslSyntaxNode BuildExpressionAwaitOperator(Lexem lexem)
             if (argument != default)
             {
                 CheckAsyncMethod();
-                var awaitOperator = new UnaryOperationNode(lexem);
-                awaitOperator.AddChild(argument);
-                return awaitOperator;
+                return new UnaryOperationNode(argument, lexem);
             }
             else if (!_isInAsyncMethod)
             {
@@ -1140,7 +1138,7 @@ private BslSyntaxNode BuildGlobalCall(Lexem identifier)
 
         private BslSyntaxNode CallOrVariable(Lexem identifier)
         {
-            var target = NodeBuilder.CreateNode(NodeKind.Identifier, identifier);
+            BslSyntaxNode target = new TerminalNode(NodeKind.Identifier, identifier);
             if (_lastExtractedLexem.Token != Token.OpenPar)
             {
                 _lastDereferenceIsWritable = true; // одиночный идентификатор
@@ -1251,7 +1249,7 @@ private BslSyntaxNode BuildExpression(int prio)
                 NextLexem();
                 var secondArg = BuildExpression(LanguageDef.GetBinaryPriority(operationLexem.Token));
 
-                firstArg = MakeBinaryOperationNode(firstArg, secondArg, operationLexem);
+                firstArg = new BinaryOperationNode(firstArg, secondArg, operationLexem);
             }
 
             return firstArg;
@@ -1293,9 +1291,7 @@ private BslSyntaxNode BuildPrimaryExpression()
             }
 
             var arg = BuildExpression(prio);
-            var op = new UnaryOperationNode(operation);
-            op.AddChild(arg);
-            return op;
+            return new UnaryOperationNode(arg, operation);
         }
 
 
@@ -1336,14 +1332,6 @@ private void BuildOptionalExpression(NonTerminalNode parent, Token stopToken)
 
         #region Operators
 
-        private static BinaryOperationNode MakeBinaryOperationNode(BslSyntaxNode firstArg, BslSyntaxNode secondArg, in Lexem lexem)
-        {
-            var node = new BinaryOperationNode(lexem);
-            node.AddChild(firstArg);
-            node.AddChild(secondArg);
-            return node;
-        }
-
         private BslSyntaxNode BuildParenthesis()
         {
             NextLexem();
@@ -1375,7 +1363,7 @@ private BslSyntaxNode SelectTerminalNode(in Lexem currentLexem, bool supportAwai
             BslSyntaxNode node = default;
             if (LanguageDef.IsLiteral(currentLexem))
             {
-                node = NodeBuilder.CreateNode(NodeKind.Constant, currentLexem);
+                node = new TerminalNode(NodeKind.Constant, currentLexem);
                 NextLexem();
             }
             else if (LanguageDef.IsUserSymbol(currentLexem))
@@ -1449,7 +1437,7 @@ private BslSyntaxNode BuildDereference(BslSyntaxNode target)
                 NextLexem();
                 if (_lastExtractedLexem.Token == Token.OpenPar)
                 {
-                    var ident = NodeBuilder.CreateNode(NodeKind.Identifier, identifier);
+                    var ident = new TerminalNode(NodeKind.Identifier, identifier);
                     var call = BuildCall(ident, NodeKind.MethodCall);
                     dotNode.AddChild(call);
                 }