пустые массивы и ранний выход

Author: Mr-Rm

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

@@ -26,7 +26,7 @@ public ConditionNode(Lexem startLexem) : base(NodeKind.Condition, startLexem)
         public IEnumerable<BslSyntaxNode> GetAlternatives()
         {
             if(_alternativesStart == 0)
-                return new BslSyntaxNode[0];
+                return System.Array.Empty<BslSyntaxNode>();
 
             return Children
                 .Skip(_alternativesStart)

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

@@ -18,6 +18,6 @@ public LineMarkerNode(CodeRange location, NodeKind kind)
             Kind = kind;
         }
 
-        public override IReadOnlyList<BslSyntaxNode> Children => new BslSyntaxNode[0];
+        public override IReadOnlyList<BslSyntaxNode> Children => System.Array.Empty<BslSyntaxNode>();
     }
 }

src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs

@@ -49,20 +49,20 @@ public DefaultBslParser(
 
         private IErrorSink ErrorSink { get; }
 
-        public IEnumerable<CodeError> Errors => ErrorSink.Errors ?? new CodeError[0]; 
+        public IEnumerable<CodeError> Errors => ErrorSink.Errors ?? Array.Empty<CodeError>(); 
 
         public BslSyntaxNode ParseStatefulModule()
         {
             ModuleNode node;
 
             _preprocessorHandlers.OnModuleEnter();
-            NextLexem();
-            
+            NextLexem();
+
+            node = new ModuleNode(_lexer.Iterator.Source, _lastExtractedLexem);
+            PushContext(node);
             try
             {
-                node = new ModuleNode(_lexer.Iterator.Source, _lastExtractedLexem);
-                PushContext(node);
-                ParseModuleSections();
+                 ParseModuleSections();
             }
             finally
             {
@@ -81,11 +81,9 @@ public BslSyntaxNode ParseCodeBatch(bool allowReturns = false)
             PushContext(node);
             try
             {
-                if (allowReturns)
-                {
-                    _inMethodScope = true;
-                    _isInFunctionScope = true;
-                }
+                _inMethodScope = allowReturns;
+                _isInFunctionScope = allowReturns;
+
                 BuildModuleBody();
             }
             finally
@@ -180,20 +178,16 @@ private void BuildVariableSection()
                 while (true)
                 {
                     BuildAnnotations();
-                    if (_lastExtractedLexem.Token == Token.VarDef)
-                    {
-                        if (!hasVars)
-                        {
-                            hasVars = true;
-                            parent.AddChild(allVarsSection);
-                        }
-
-                        BuildVariableDefinition();
-                    }
-                    else
-                    {
-                        break;
-                    }
+                    if (_lastExtractedLexem.Token != Token.VarDef)
+                        break;
+
+                    if (!hasVars)
+                    {
+                        hasVars = true;
+                        parent.AddChild(allVarsSection);
+                    }
+
+                    BuildVariableDefinition();
                 }
             }
             finally
@@ -296,21 +290,17 @@ private void BuildMethodsSection()
                 while (true)
                 {
                     BuildAnnotations();
-                    if (IsStartOfMethod(_lastExtractedLexem))
-                    {
-                        if (!sectionExist)
-                        {
-                            sectionExist = true;
-                            _isMethodsDefined = true;
-                            parent.AddChild(allMethodsSection);
-                        }
-
-                        BuildMethod();
-                    }
-                    else
-                    {
-                        break;
-                    }
+                    if (!IsStartOfMethod(_lastExtractedLexem))
+                        break;
+
+                    if (!sectionExist)
+                    {
+                        sectionExist = true;
+                        _isMethodsDefined = true;
+                        parent.AddChild(allMethodsSection);
+                    }
+
+                    BuildMethod();
                 }
             }
             finally
@@ -1160,7 +1150,6 @@ private void BuildCallParameters(NonTerminalNode callNode)
             {
                 NextLexem(); // съели открывающую скобку
                 WalkCallArguments(node);
-
                 NextLexem(); // съели закрывающую скобку
             }
             finally
@@ -1366,14 +1355,14 @@ private BslSyntaxNode SelectTerminalNode(in Lexem currentLexem, bool supportAwai
             {
                 node = BuildNewObjectCreation();
             }
-            else if (currentLexem.Token == Token.Question)
-            {
-                node = BuildQuestionOperator();
-            }
             else if (LanguageDef.IsBuiltInFunction(currentLexem.Token))
             {
                 node = BuildGlobalCall(currentLexem);
             }
+            else if (currentLexem.Token == Token.Question)
+            {
+                node = BuildQuestionOperator();
+            }
             else if (supportAwait && currentLexem.Token == Token.Await)
             {
                 node = BuildExpressionAwaitOperator(currentLexem);