Add of LargeStringAllocationObserver

Add of ExecuteObserver Add of CreateObjectObserver
airbus-cert · May 17, 2024 · c2ac709 · c2ac709
1 parent 922d302
commit c2ac709
Show file tree

Hide file tree

Showing 34 changed files with 189 additions and 97 deletions.
diff --git a/Sources/vbSparkle.Console/Program.cs b/Sources/vbSparkle.Console/Program.cs
@@ -43,10 +43,7 @@ static void Main(string[] args)
 
         private static void InitializeConsoleHeader()
         {
-            Console.ForegroundColor = Color.WhiteSmoke;
             string version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
-            Console.ResetColor();
-            Console.ReplaceAllColorsWithDefaults();
             Console.Title = "vbSparkle " + version;
 
             Console.WriteLine(

diff --git a/Sources/vbSparkle.Console/vbSparkle.CLI.csproj b/Sources/vbSparkle.Console/vbSparkle.CLI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <StartupObject>vbSparkle.CLI.Program</StartupObject>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <Authors>Sylvain Bruyere, Airbus CERT</Authors>

diff --git a/Sources/vbSparkle/EvaluationObjects/DComplexStringExpression.cs b/Sources/vbSparkle/EvaluationObjects/DComplexStringExpression.cs
@@ -3,20 +3,21 @@
 using System.Text;
 using MathNet.Symbolics;
 using vbSparkle;
+using vbSparkle.Options;
 
 namespace vbSparkle.EvaluationObjects
 {
     internal class DComplexStringExpression
         : DExpression, IStringExpression
     {
+
         public List<DExpression> ConcatExpressions { get; set; } = new List<DExpression>();
 
         public override bool HasSideEffet { get; set; } = false;
         public override bool IsValuable { get; set; } = true;
 
         public DComplexStringExpression()
         {
-
         }
 
         public DComplexStringExpression(DExpression leftExp)
@@ -80,7 +81,9 @@ public void Concat(DExpression expression)
 
             if (curRightExp is DSimpleStringExpression && expression.IsValuable)
             {
-                ConcatExpressions[ConcatExpressions.Count - 1] = new DSimpleStringExpression(curRightExp.ToValueString() + expression.ToValueString(), Encoding.Unicode);
+                var options = (curRightExp as DSimpleStringExpression).Options;
+
+                ConcatExpressions[ConcatExpressions.Count - 1] = new DSimpleStringExpression(curRightExp.ToValueString() + expression.ToValueString(), Encoding.Unicode, options);
                 //((DSimpleStringExpression)curRightExp).SetValue(curRightExp.ToValueString() + expression.ToValueString()); <= this was causing side effect
                 return;
             }

diff --git a/Sources/vbSparkle/EvaluationObjects/DStringExpression.cs b/Sources/vbSparkle/EvaluationObjects/DStringExpression.cs
@@ -2,28 +2,41 @@
 using System.Text;
 using MathNet.Symbolics;
 using vbSparkle;
+using vbSparkle.Options;
 
 namespace vbSparkle.EvaluationObjects
 {
 
     internal class DSimpleStringExpression 
         : DExpression, IStringExpression
     {
+        internal EvaluatorOptions Options { get; set; } = null;
         string var;
 
         public override bool HasSideEffet { get => false; set => throw new NotImplementedException(); }
 
         public override bool IsValuable { get => true; set => throw new NotImplementedException(); }
         public Encoding Encoding { get; set; }
 
-        public DSimpleStringExpression(string value, Encoding encoding)
+        public DSimpleStringExpression(string value, Encoding encoding, EvaluatorOptions options)
         {
+            if (options == null)
+                (0).ToString();
+
+            Options = options;
             var = value;
             Encoding = encoding;
         }
 
         public override string ToExpressionString()
         {
+            if (Options != null &&
+                Options.LargeStringAllocationObserver != null &&
+                Options.LargeStringAllocationObserver.MinSize < var.Length)
+            {
+                Options.LargeStringAllocationObserver.LargeStringAllocated.Add(var.Replace("\"\"","\""));
+            }
+
             return VbUtils.StrValToExp(var);
         }
 

diff --git a/Sources/vbSparkle/LanguageStatements/CallStatements/VB_ICS_B_ProcedureCall.cs b/Sources/vbSparkle/LanguageStatements/CallStatements/VB_ICS_B_ProcedureCall.cs
@@ -38,6 +38,14 @@ public VbIdentifiedObject IdentifiedObject
 
         public override DExpression Prettify(bool partialEvaluation = false)
         {
+            var identifiedObject = IdentifiedObject;
+
+            if (identifiedObject is VbNativeFunction)
+            {
+                var funcArgs = CallArgs.ToArray();
+                return (identifiedObject as VbNativeFunction).TryEvaluate(funcArgs);
+            }
+
             if (CallArgs.Any())
                 return new DCodeBlock($"{IdentifiedObject.Name} {string.Join(", ", CallArgs.Select(v => v.Exp(partialEvaluation)))}");
             else

diff --git a/Sources/vbSparkle/LanguageStatements/Functions/VBMethod.cs b/Sources/vbSparkle/LanguageStatements/Functions/VBMethod.cs
@@ -97,7 +97,7 @@ public VB_StrReverse(IVBScopeObject context)
             : base(context, "StrReverse")
         {
         }
-        
+
         public override DExpression Evaluate(params DExpression[] args)
         {
             DExpression arg1 = args.FirstOrDefault();
@@ -106,12 +106,39 @@ public override DExpression Evaluate(params DExpression[] args)
 
             if (!Converter.TryGetStringValue(arg1, out strArg))
                 return DefaultExpression(args);
-            
+
             string str = new string(strArg.ToCharArray().Reverse().ToArray());
 
-            return new DSimpleStringExpression(str, Encoding.Unicode);
+            return new DSimpleStringExpression(str, Encoding.Unicode, Context.Options);
         }
+    }
+
+    public class VB_Execute
+    : VbNativeFunction
+    {
+        public VB_Execute(IVBScopeObject context)
+            : base(context, "Execute")
+        {
+        }
+
+        public override DExpression Evaluate(params DExpression[] args)
+        {
+            DExpression arg1 = args.FirstOrDefault();
 
+            string strArg;
+
+            if (!Converter.TryGetStringValue(arg1, out strArg))
+            {
+                return DefaultExpression(args);
+            }
+
+            if (Context?.Options?.ExecuteObserver != null)
+            {
+                Context.Options.ExecuteObserver.VBScriptExecuted.Add(strArg.Replace("\"\"", "\""));
+            }
+
+            return DefaultExpression(args);
+        }
     }
 
     public class VB_Replace
@@ -159,7 +186,7 @@ public override DExpression Evaluate(params DExpression[] args)
 
             string str = findStr.Equals(replStr) ? expStr : expStr.Replace(findStr, replStr);
 
-            return new DSimpleStringExpression(str, Encoding.Unicode);
+            return new DSimpleStringExpression(str, Encoding.Unicode, Context.Options);
         }
 
     }
@@ -195,7 +222,7 @@ public override DExpression Evaluate(params DExpression[] args)
                 return DefaultExpression(args);
 
             string str = strArg.Trim(' ');
-            return new DSimpleStringExpression(str, Encoding.Unicode);
+            return new DSimpleStringExpression(str, Encoding.Unicode, Context.Options);
         }
 
     }
@@ -233,7 +260,7 @@ public override DExpression Evaluate(params DExpression[] args)
 
             string value = new string(' ', count);
 
-            return new DSimpleStringExpression(value, Encoding.Unicode);
+            return new DSimpleStringExpression(value, Encoding.Unicode, Context.Options);
         }
 
     }
@@ -265,7 +292,7 @@ public override DExpression Evaluate(params DExpression[] args)
 
             //string value = Char.ConvertFromUtf32((int)ascii); //(byte) (UInt32)Math.Round(ascii) & 0x0000FFFF);
 
-            return new DSimpleStringExpression(value, Encoding.Unicode);
+            return new DSimpleStringExpression(value, Encoding.Unicode, Context.Options);
         }
 
     }
@@ -305,7 +332,7 @@ public override DExpression Evaluate(params DExpression[] args)
             //string value = Encoding.ASCII.GetString(test);
             string value = new string(new char[] { VbUtils.Chr(ascii) });
 
-            return new DSimpleStringExpression(value, Encoding.Unicode);
+            return new DSimpleStringExpression(value, Encoding.Unicode, Context.Options);
         }
     }
 
@@ -342,7 +369,7 @@ public override DExpression Evaluate(params DExpression[] args)
 
             string value = new string(new char[]{ VbUtils.Chr(ascii) }); 
 
-            return new DSimpleStringExpression(value, Encoding.Unicode);
+            return new DSimpleStringExpression(value, Encoding.Unicode, Context.Options);
         }
 
     }
@@ -735,7 +762,7 @@ public override DExpression Evaluate(params DExpression[] args)
 
             string hexStr = $"{input:X}";
 
-            return new DSimpleStringExpression(hexStr, null);
+            return new DSimpleStringExpression(hexStr, null, Context.Options);
         }
     }
 

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VBLiteral.cs b/Sources/vbSparkle/LanguageStatements/Literals/VBLiteral.cs
@@ -3,6 +3,7 @@
     public abstract class VBLiteral
     {
         public DExpression Value { get; set; }
+        public IVBScopeObject Context { get; set; }
 
         public abstract string Prettify();
     }
@@ -12,9 +13,10 @@ public class VBLiteral<T> : VBLiteral
     {
         public T Object { get; set; }
 
-        public VBLiteral(T @object)
+        public VBLiteral(IVBScopeObject context, T @object)
         {
             Object = @object;
+            Context = context;
             Value = new DCodeBlock(@object?.GetText());
         }
 

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtBoolean.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtBoolean.cs
@@ -6,8 +6,8 @@ namespace vbSparkle
 {
     public class VbLtBoolean : VBLiteral<LtBooleanContext>
     {
-        public VbLtBoolean(LtBooleanContext @object)
-            : base(@object)
+        public VbLtBoolean(IVBScopeObject context, LtBooleanContext @object)
+            : base(context, @object)
         {
             string quoted = @object.GetText();
             if (quoted.Equals("True", StringComparison.InvariantCultureIgnoreCase))

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtColor.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtColor.cs
@@ -5,8 +5,8 @@ namespace vbSparkle
 {
     public class VbLtColor : VBLiteral<LtColorContext>
     {
-        public VbLtColor(LtColorContext @object)
-            : base(@object)
+        public VbLtColor(IVBScopeObject context, LtColorContext @object)
+            : base(context, @object)
         {
             string quoted = @object.GetText();
             Value = new DMathExpression<Int32>( Convert.ToInt32(quoted.Substring(2).Replace("&",""), 16));

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtDateTime.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtDateTime.cs
@@ -6,8 +6,8 @@ namespace vbSparkle
 {
     public class VbLtDateTime : VBLiteral<LtDateContext>
     {
-        public VbLtDateTime(LtDateContext @object)
-            : base(@object)
+        public VbLtDateTime(IVBScopeObject context, LtDateContext @object)
+            : base(context, @object)
         {
             string date = @object.GetText();
             date = date.Substring(1, date.Length - 2);

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtDouble.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtDouble.cs
@@ -4,8 +4,8 @@ namespace vbSparkle
 {
     public class VbLtDouble : VBLiteral<LtDoubleContext>
     {
-        public VbLtDouble(LtDoubleContext @object)
-            : base(@object)
+        public VbLtDouble(IVBScopeObject context, LtDoubleContext @object)
+            : base(context, @object)
         {
             string quoted = @object.GetText();
             Value = new DMathExpression<double>(double.Parse(quoted));

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtFileNumber.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtFileNumber.cs
@@ -5,8 +5,8 @@ namespace vbSparkle
 {
     public class VbLtFileNumber : VBLiteral<LtFilenumberContext>
     {
-        public VbLtFileNumber(LtFilenumberContext @object)
-            : base(@object)
+        public VbLtFileNumber(IVBScopeObject context, LtFilenumberContext @object)
+            : base(context, @object)
         {
             string quoted = @object.GetText();
             Value = new DMathExpression<Int32>(int.Parse(quoted.Replace("#", "")));

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtInteger.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtInteger.cs
@@ -5,8 +5,8 @@ namespace vbSparkle
 {
     public class VbLtInteger : VBLiteral<LtIntegerContext>
     {
-        public VbLtInteger(LtIntegerContext @object)
-            : base(@object)
+        public VbLtInteger(IVBScopeObject context, LtIntegerContext @object)
+            : base(context, @object)
         {
             string quoted = @object.GetText();
             if (quoted.EndsWith("#"))

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtNothing.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtNothing.cs
@@ -4,8 +4,8 @@ namespace vbSparkle
 {
     public class VbLtNothing : VBLiteral<LtNothingContext>
     {
-        public VbLtNothing(LtNothingContext @object)
-            : base(@object)
+        public VbLtNothing(IVBScopeObject context, LtNothingContext @object)
+            : base(context, @object)
         {
             Value = new DCodeBlock("Nothing");
         }

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtNull.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtNull.cs
@@ -4,8 +4,8 @@ namespace vbSparkle
 {
     public class VbLtNull : VBLiteral<LtNullContext>
     {
-        public VbLtNull(LtNullContext @object)
-            : base(@object)
+        public VbLtNull(IVBScopeObject context, LtNullContext @object)
+            : base(context, @object)
         {
             Value = new DCodeBlock("Null");
         }

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtOctal.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtOctal.cs
@@ -5,8 +5,8 @@ namespace vbSparkle
 {
     public class VbLtOctal : VBLiteral<LtOctalContext>
     {
-        public VbLtOctal(LtOctalContext @object)
-            : base(@object)
+        public VbLtOctal(IVBScopeObject context, LtOctalContext @object)
+            : base(context, @object)
         {
             string quoted = @object.GetText();
             Value = new DMathExpression<Int32>(Convert.ToInt32(quoted.Substring(2, quoted.Length - 2), 8));

diff --git a/Sources/vbSparkle/LanguageStatements/Literals/VbLtString.cs b/Sources/vbSparkle/LanguageStatements/Literals/VbLtString.cs
@@ -6,11 +6,11 @@ namespace vbSparkle
 {
     public class VbLtString : VBLiteral<LtStringContext>
     {
-        public VbLtString(LtStringContext @object) 
-            : base(@object)
+        public VbLtString(IVBScopeObject context, LtStringContext @object) 
+            : base(context, @object)
         {
             string quoted = @object.GetText();
-            Value = new DSimpleStringExpression(quoted.Substring(1, quoted.Length -2), Encoding.Unicode);
+            Value = new DSimpleStringExpression(quoted.Substring(1, quoted.Length -2), Encoding.Unicode, context.Options);
         }
 
         public override string Prettify()