Merge branch 'develop' of https://github.com/EvilBeaver/OneScript into develop

Author: Andrey Ovsiankin

Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
 
     environment {
         VersionPrefix = '2.0.1'
-        VersionSuffix = 'rc.1'+"+${BUILD_NUMBER}"
+        VersionSuffix = 'rc.2'+"+${BUILD_NUMBER}"
         outputEnc = '65001'
     }
 

src/OneScript.Core/Execution/ForbiddenBslProcess.cs

@@ -20,7 +20,7 @@ namespace OneScript.Execution
     /// </summary>
     public class ForbiddenBslProcess : IBslProcess
     {
-        public static IBslProcess Instance = new ForbiddenBslProcess();
+        public static readonly IBslProcess Instance = new ForbiddenBslProcess();
 
         private ForbiddenBslProcess()
         {}

src/OneScript.Language/LanguageDef.cs

@@ -282,7 +282,31 @@ public static Token GetToken(string tokText)
         public static int GetPriority(Token op)
         {
             return _priority[op];
-        }
+        }
+
+        public static int GetBinaryPriority(Token op)
+        {
+            return IsBinaryOperator(op) ? _priority[op] : -1;
+        }
+
+        public static int GetUnaryPriority(Token op)
+        {
+            return op switch
+            {
+                Token.OpenPar => MAX_OPERATION_PRIORITY + 1,
+
+                Token.Not => _priority[op],
+                Token.UnaryMinus => _priority[op],
+                Token.UnaryPlus => _priority[op],
+
+                Token.Minus => _priority[Token.UnaryMinus],
+                Token.Plus => _priority[Token.UnaryPlus],
+
+                _ => MAX_OPERATION_PRIORITY
+            };
+        }
+
+
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsBuiltInFunction(Token token)

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/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/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/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);
+        }
     }
 }