унификация создания узлов

Author: Mr-Rm

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

@@ -30,7 +30,7 @@ public MethodNode() : base(NodeKind.Method)
         public IReadOnlyList<VariableDefinitionNode> VariableDefinitions()
         {
             if (VariableSection == default)
-                return new VariableDefinitionNode[0];
+                return System.Array.Empty<VariableDefinitionNode>();
 
             return VariableSection.Children
                 .Cast<VariableDefinitionNode>()

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

@@ -28,7 +28,7 @@ public IEnumerable<MethodParameterNode> GetParameters()
         {
             var paramList = Children.FirstOrDefault(x => x.Kind == NodeKind.MethodParameters);
             if (paramList == default)
-                return new MethodParameterNode[0];
+                return System.Array.Empty<MethodParameterNode>();
 
             return ((NonTerminalNode) paramList).Children.Cast<MethodParameterNode>();
         }

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

@@ -26,8 +26,6 @@ public TerminalNode(NodeKind kind, Lexem lexem)
             Location = lexem.Location;
         }
 
-        public override IReadOnlyList<BslSyntaxNode> Children => EmptyChildren;
-        
-        private static readonly BslSyntaxNode[] EmptyChildren = new BslSyntaxNode[0];
+        public override IReadOnlyList<BslSyntaxNode> Children => System.Array.Empty<BslSyntaxNode>();
     }
 }

src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs

@@ -373,8 +373,8 @@ private void BuildMethodVariablesSection()
 
         private void BuildMethodBody()
         {
-            var body = CreateChild(CurrentParent, NodeKind.CodeBatch, _lastExtractedLexem);
-            PushContext((NonTerminalNode)body);
+            var body = _nodeContext.AddChild(new CodeBatchNode(_lastExtractedLexem));
+            PushContext(body);
             try
             {
                 BuildCodeBatch(_isInFunctionScope ? Token.EndFunction : Token.EndProcedure);
@@ -652,7 +652,7 @@ private void BuildCodeBatch(params Token[] endTokens)
         private void DefineLabel(Lexem label)
         {
             var node = new LabelNode(label);
-            _nodeContext.AddChild(node);
+            CurrentParent.AddChild(node);
             NextLexem();
         }
 
@@ -732,9 +732,9 @@ private void BuildComplexStructureStatement()
 
         private void BuildGlobalCallAwaitOperator()
         {
-            Debug.Assert(_lastExtractedLexem.Token == Token.Await);
-            
-            _nodeContext.AddChild(TerminalNode());
+            Debug.Assert(_lastExtractedLexem.Token == Token.Await);
+
+            CurrentParent.AddChild(TerminalNode());
         }
 
 
@@ -775,7 +775,7 @@ private void BuildGotoOperator()
             gotoNode.AddChild(new LabelNode(_lastExtractedLexem));
             NextLexem();
 
-            _nodeContext.AddChild(gotoNode);
+            CurrentParent.AddChild(gotoNode);
         }
 
         private void CheckAsyncMethod()
@@ -834,8 +834,9 @@ private void BuildWhileStatement()
             var loopNode = _nodeContext.AddChild(new WhileLoopNode(_lastExtractedLexem));
             NextLexem();
             BuildExpressionUpTo(loopNode, Token.Loop);
-            var body = CreateChild(loopNode, NodeKind.CodeBatch, _lastExtractedLexem);
-            PushContext((NonTerminalNode)body);
+            var body = loopNode.AddNode(new CodeBatchNode(_lastExtractedLexem));
+
+            PushContext(body);
             var loopState = _isInLoopScope;
             try
             {
@@ -912,8 +913,8 @@ private void BuildCountableForStatement(NonTerminalNode loopNode)
 
             var limit = new NonTerminalNode(NodeKind.ForLimit, _lastExtractedLexem);
             BuildExpressionUpTo(limit, Token.Loop);
-            loopNode.AddChild(limit);
-            
+            loopNode.AddChild(limit);
+
             BuildBatchWithContext(loopNode, Token.EndLoop);
 
             CreateChild(loopNode, NodeKind.BlockEnd, _lastExtractedLexem);
@@ -1190,7 +1191,7 @@ private void BuildCallArgument(NonTerminalNode argsList)
         {
             if (_lastExtractedLexem.Token == Token.Comma)
             {
-                CreateChild(argsList, NodeKind.CallArgument, _lastExtractedLexem);
+                argsList.AddChild(new NonTerminalNode(NodeKind.CallArgument, _lastExtractedLexem));
 
                 BuildLastDefaultArg(argsList);
             }
@@ -1210,7 +1211,7 @@ private void BuildLastDefaultArg(NonTerminalNode argsList)
             NextLexem();
             if (_lastExtractedLexem.Token == Token.ClosePar)
             {
-                CreateChild(argsList, NodeKind.CallArgument, _lastExtractedLexem);
+                argsList.AddChild(new NonTerminalNode(NodeKind.CallArgument, _lastExtractedLexem));
             }
         }
 
@@ -1588,11 +1589,10 @@ private Token[] PopStructureToken()
             return tok;
         }
 
-        private static BslSyntaxNode CreateChild(NonTerminalNode parent, NodeKind kind, in Lexem lex)
+        private static void CreateChild(NonTerminalNode parent, NodeKind kind, in Lexem lex)
         {
             var child = NodeBuilder.CreateNode(kind, lex);
             parent.AddChild(child);
-            return child;
         }
 
         private bool TryParseNode(Action action)