fix subchunks not being finalized

vddCore · Nov 14, 2023 · 02f3219 · 02f3219
1 parent ca8685c
commit 02f3219
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 24 deletions.
diff --git a/VirtualMachine/Ceres.Runtime/Ceres.Runtime.csproj b/VirtualMachine/Ceres.Runtime/Ceres.Runtime.csproj
@@ -4,7 +4,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>11.0</LangVersion>
 
-        <Version>0.8.0</Version>
+        <Version>0.9.0</Version>
         <AssemblyName>Ceres.Runtime</AssemblyName>
         <AssemblyTitle>Ceres.Runtime</AssemblyTitle>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/VirtualMachine/Ceres.Runtime/Modules/StringModule.cs b/VirtualMachine/Ceres.Runtime/Modules/StringModule.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Linq;
+using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using Ceres.ExecutionEngine.Collections;
@@ -412,7 +413,7 @@ private static DynamicValue RegexMatch(Fiber _, params DynamicValue[] args)
                     { "value", match.Value },
                     { "starts_at", match.Index },
                     { "length", match.Length },
-                    { "groups", new Table() }
+                    { "groups", new Array(0) }
                 };
 
                 foreach (Group group in match.Groups)
@@ -425,16 +426,31 @@ private static DynamicValue RegexMatch(Fiber _, params DynamicValue[] args)
                         { "length", group.Length }
                     };
 
-                    matchTable["groups"].Table!.Add(
-                        matchTable["groups"].Table!.Length,
-                        groupTable
-                    );
+                    matchTable["groups"].Array!.Push(groupTable);
                 }
 
                 array[i] = matchTable;
             }
 
             return array;
         }
+
+        [RuntimeModuleFunction("md5")]
+        private static DynamicValue Md5(Fiber _, params DynamicValue[] args)
+        {
+            args.ExpectStringAt(0, out var text)
+                .OptionalStringAt(1, "utf-8", out var encoding);
+
+            var bytes = Encoding.GetEncoding(encoding).GetBytes(text);
+            var hash = MD5.HashData(bytes);
+
+            var sb = new StringBuilder();
+            for (var i = 0; i < hash.Length; i++)
+            {
+                sb.Append(hash[i].ToString("x2"));
+            }
+
+            return sb.ToString();
+        }
     }
 }
diff --git a/VirtualMachine/Ceres/Ceres.csproj b/VirtualMachine/Ceres/Ceres.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <LangVersion>11.0</LangVersion>
 
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <AssemblyName>Ceres</AssemblyName>
     <AssemblyTitle>Ceres</AssemblyTitle>
   </PropertyGroup>

diff --git a/VirtualMachine/Ceres/TranslationEngine/Compiler.Expression.Fn.cs b/VirtualMachine/Ceres/TranslationEngine/Compiler.Expression.Fn.cs
@@ -15,6 +15,8 @@ public override void Visit(FnExpression fnExpression)
 
                     Visit(fnExpression.ParameterList);
                     Visit(fnExpression.Statement);
+
+                    FinalizeChunk();
                 });
             });
 

diff --git a/VirtualMachine/Ceres/TranslationEngine/Compiler.Statement.Fn.cs b/VirtualMachine/Ceres/TranslationEngine/Compiler.Statement.Fn.cs
@@ -1,4 +1,3 @@
-using Ceres.ExecutionEngine.Diagnostics;
 using Ceres.TranslationEngine.Diagnostics;
 using EVIL.Grammar.AST.Statements.TopLevel;
 
@@ -20,21 +19,8 @@ public override void Visit(FnStatement fnStatement)
                         Visit(fnStatement.Statement);
                     });
 
-                    if (Chunk.CodeGenerator.TryPeekOpCode(out var opCode))
-                    {
-                        if (opCode == OpCode.RET || opCode == OpCode.TAILINVOKE)
-                        {
-                            foreach (var attr in fnStatement.Attributes)
-                                Visit(attr);
-
-                            return;
-                        }
-                    }
-
-                    /* Either we have no instructions in chunk, or it's not a RET. */
-                    Chunk.CodeGenerator.Emit(OpCode.LDNIL);
-                    Chunk.CodeGenerator.Emit(OpCode.RET);
-
+                    FinalizeChunk();
+                    
                     foreach (var attr in fnStatement.Attributes)
                         Visit(attr);
                 });

diff --git a/VirtualMachine/Ceres/TranslationEngine/Compiler.Statement.Override.cs b/VirtualMachine/Ceres/TranslationEngine/Compiler.Statement.Override.cs
@@ -25,6 +25,8 @@ public override void Visit(OverrideStatement overrideStatement)
 
                     Visit(overrideStatement.ParameterList);
                     Visit(overrideStatement.Statement);
+
+                    FinalizeChunk();
                 });
             });
 

diff --git a/VirtualMachine/Ceres/TranslationEngine/Compiler.Utilities.Emit.cs b/VirtualMachine/Ceres/TranslationEngine/Compiler.Utilities.Emit.cs
@@ -5,6 +5,21 @@ namespace Ceres.TranslationEngine
 {
     public partial class Compiler
     {
+        private void FinalizeChunk()
+        {
+            if (Chunk.CodeGenerator.TryPeekOpCode(out var opCode))
+            {
+                if (opCode == OpCode.RET || opCode == OpCode.TAILINVOKE)
+                {
+                    return;
+                }
+            }
+
+            /* Either we have no instructions in chunk, or it's not a RET. */
+            Chunk.CodeGenerator.Emit(OpCode.LDNIL);
+            Chunk.CodeGenerator.Emit(OpCode.RET);
+        }
+
         private void EmitVarSet(string identifier)
         {
             var symbolInfo = FindSymbolInClosedScopes(identifier);

diff --git a/VirtualMachine/Tests/Ceres.LanguageTests/tests/004_assignment_operators.vil b/VirtualMachine/Tests/Ceres.LanguageTests/tests/004_assignment_operators.vil
@@ -197,7 +197,7 @@ fn chained_coalescing_assignment_table_entry_when_first_is_nil() {
   val a = "string";
   rw val b = nil;
 
-  t.entry ??= (b ??= a);
+  t.entry ??= b ??= a;
 
   assert.equal(b, a);
   assert.equal(t.entry, a);