Merge pull request #1642 from Mr-Rm/v2/optim-VM

VM: имена свойств и методов в отдельный список

Author: EvilBeaver

src/OneScript.Core/Contexts/ClassBuilder.cs

@@ -111,9 +111,10 @@ private static bool MarkedAsContextMethod(MemberInfo member, bool includeDepreca
                   .Any(x => includeDeprecations || (x as ContextMethodAttribute)?.IsDeprecated == false);
         }
 
-        private static bool MarkedAsContextProperty(MemberInfo member, bool includeDeprecations = false)
+        private static bool MarkedAsContextProperty(PropertyInfo member, bool includeDeprecations = false)
         {
-            return member.GetCustomAttributes(typeof(ContextPropertyAttribute), false).Any();
+            return member.GetCustomAttributes(typeof(ContextPropertyAttribute), false)
+                .Any(x => includeDeprecations || (x as ContextPropertyAttribute)?.IsDeprecated == false);
         }
 
         public ClassBuilder ExportConstructor(MethodInfo info)

src/OneScript.Language/SyntaxAnalysis/BslSyntaxWalker.cs

@@ -324,7 +324,7 @@ protected virtual void VisitTernaryOperation(BslSyntaxNode node)
 
         protected virtual void VisitModuleBody(BslSyntaxNode codeBlock)
         {
-            if(codeBlock.Children.Count > 0)
+            if(codeBlock.Children.Count != 0)
                 VisitCodeBlock(codeBlock.Children[0]);
         }
 

src/OneScript.Language/SyntaxAnalysis/ConditionalDirectiveHandler.cs

@@ -297,7 +297,7 @@ private void MarkAsSolved()
 
         private void PopBlock()
         {
-            if (_blocks.Count > 0)
+            if (_blocks.Count != 0)
                 _blocks.Pop();
             else
                 AddError(LocalizedErrors.DirectiveIsMissing("Если"));

src/OneScript.Language/SyntaxAnalysis/DefaultBslParser.cs

@@ -123,7 +123,7 @@ private void ParseModuleAnnotation()
                 .Cast<ModuleAnnotationDirectiveHandler>()
                 .ToList();
 
-            if (!annotationParser.Any())
+            if (annotationParser.Count == 0)
                 return;
 
             while (_lastExtractedLexem.Type == LexemType.PreprocessorDirective)
@@ -1650,7 +1650,7 @@ private void AddError(CodeError err, bool doFastForward = true)
 
             if (doFastForward)
             {
-                if (_tokenStack.Count > 0)
+                if (_tokenStack.Count != 0)
                     SkipToNextStatement(_tokenStack.Peek());
                 else
                     SkipToNextStatement();

src/OneScript.Native/Compiler/MethodCompiler.cs

@@ -713,7 +713,7 @@ protected override void VisitIfNode(ConditionNode node)
                 {
                     stack.Push(elif);
                 }
-                else if (stack.Count > 0)
+                else if (stack.Count != 0)
                 {
                     var cond = stack.Pop();
 
@@ -726,7 +726,7 @@ protected override void VisitIfNode(ConditionNode node)
                 }
             }
 
-            while (stack.Count > 0)
+            while (stack.Count != 0)
             {
                 var elseIfNode = stack.Pop();
                 VisitElseIfNode(elseIfNode);
@@ -1147,7 +1147,7 @@ protected override void VisitObjectProcedureCall(BslSyntaxNode node)
         private IEnumerable<Expression> PrepareDynamicCallArguments(BslSyntaxNode argList)
         {
             return argList.Children.Select(passedArg =>
-                passedArg.Children.Count > 0
+                passedArg.Children.Count != 0
                     ? ConvertToExpressionTree(passedArg.Children[0])
                     : Expression.Constant(BslSkippedParameterValue.Instance));
         }
@@ -1414,7 +1414,7 @@ private List<Expression> PrepareCallArguments(BslSyntaxNode argList, ParameterIn
             }
 
             var parameters = argList.Children.Select(passedArg =>
-                passedArg.Children.Count > 0
+                passedArg.Children.Count != 0
                     ? ConvertToExpressionTree(passedArg.Children[0])
                     : null).ToArray();
 
@@ -1523,7 +1523,7 @@ protected override void VisitNewObjectCreation(NewObjectNode node)
             if (node.ConstructorArguments != default)
             {
                 parameters = node.ConstructorArguments.Children.Select(passedArg => 
-                    passedArg.Children.Count > 0 ? 
+                    passedArg.Children.Count != 0 ? 
                         ConvertToExpressionTree(passedArg.Children[0]) :
                         Expression.Default(typeof(BslValue))).ToArray();
             }

src/OneScript.Native/Compiler/StatementBlocksWriter.cs

@@ -18,7 +18,7 @@ public class StatementBlocksWriter
 
         public void EnterBlock(JumpInformationRecord newJumpStates)
         {
-            var current = _blocks.Count > 0 ? GetCurrentBlock() : null;
+            var current = _blocks.Count != 0 ? GetCurrentBlock() : null;
             if (current != null)
             {
                 newJumpStates.MethodReturn ??= current.MethodReturn;

src/OneScript.StandardLibrary/Collections/Indexes/CollectionIndex.cs

@@ -42,7 +42,7 @@ public CollectionIndex(IIndexCollectionSource source, IEnumerable<IValue> fields
 
         internal bool CanBeUsedFor(IEnumerable<IValue> searchFields)
         {
-            return _fields.Count > 0 && _fields.All(f => searchFields.Contains(f));
+            return _fields.Count != 0 && _fields.All(f => searchFields.Contains(f));
         }
 
         private CollectionIndexKey IndexKey(PropertyNameIndexAccessor source)

src/OneScript.StandardLibrary/CustomLineFeedStreamReader.cs

@@ -56,7 +56,7 @@ public int Read ()
                 _buffer.Dequeue ();
                 UpdateCharQueue ();
 
-                if (_buffer.Count > 0 && _buffer.Peek () == '\n') {
+                if (_buffer.Count != 0 && _buffer.Peek () == '\n') {
                     _buffer.Dequeue ();
                     UpdateCharQueue ();
                 }

src/OneScript.StandardLibrary/Tasks/BackgroundTasksManager.cs

@@ -120,7 +120,7 @@ public void WaitCompletionOfTasks()
                 var failedTasks = _tasks.Where(x => x.State == TaskStateEnum.CompletedWithErrors)
                     .ToList();
 
-                if (failedTasks.Any())
+                if (failedTasks.Count != 0)
                 {
                     throw new ParametrizedRuntimeException(
                         Locale.NStr("ru = 'Задания завершились с ошибками';en = 'Tasks are completed with errors'"),

src/ScriptEngine/Compiler/ModuleDumpWriter.cs

@@ -129,6 +129,13 @@ private void WriteImage(TextWriter output, StackRuntimeModule module)
                 output.WriteLine(
                     $"{i,-3}:type: {item.SystemType.Alias}, val: {item}");
             }
+            output.WriteLine(".identifiers");
+            for (int i = 0; i < module.Identifiers.Count; i++)
+            {
+                var item = module.Identifiers[i];
+                output.WriteLine(
+                    $"{i,-3}: {item}");
+            }
             output.WriteLine(".code");
             for (int i = 0; i < module.Code.Count; i++)
             {