Merge pull request #245 from stevehalliwell/remove-freeze

Remove freeze opcode, now a stdlib func
stevehalliwell · Mar 21, 2024 · 499ec80 · 499ec80
2 parents 7e3557e + badb107
commit 499ec80
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 84 deletions.
diff --git a/ulox/ulox.core.tests/ClassTests.cs b/ulox/ulox.core.tests/ClassTests.cs
@@ -1739,5 +1739,48 @@ class CoffeeMaker {
 
             Assert.AreEqual("Enjoy your cup of coffee and chicory", testEngine.InterpreterResult);
         }
+
+        [Test]
+        public void InstanceFromClass_WhenFrozenAndNonExistingFieldWritten_ShouldPreventChangeAndLog()
+        {
+            testEngine.Run(@"
+class Foo
+{
+}
+
+var inst = Foo();
+inst.a = 10;");
+
+            StringAssert.StartsWith("Attempted to create a new ", testEngine.InterpreterResult);
+        }
+
+        [Test]
+        public void InstanceFromClass_WhenHasInitAndInitChainAndNonExistingFieldWritten_ShouldPreventChangeAndLog()
+        {
+            testEngine.Run(@"
+class Foo
+{
+    var b = 2;
+    init(){this.c = 3;}
+}
+
+var inst = Foo();
+inst.a = 10;");
+
+            StringAssert.StartsWith("Attempted to create a new ", testEngine.InterpreterResult);
+        }
+
+        [Test]
+        public void Class_WhenFrozenAndNonExistingFieldWritten_ShouldPreventChangeAndLog()
+        {
+            testEngine.Run(@"
+class Foo
+{
+}
+
+Foo.a = 10;");
+
+            StringAssert.StartsWith("Attempted to create a new ", testEngine.InterpreterResult);
+        }
     }
 }
diff --git a/ulox/ulox.core.tests/FreezeTests.cs b/ulox/ulox.core.tests/FreezeTests.cs
@@ -4,50 +4,6 @@ namespace ULox.Core.Tests
 {
     public class FreezeTests : EngineTestBase
     {
-        [Test]
-        public void InstanceFromClass_WhenFrozenAndNonExistingFieldWritten_ShouldPreventChangeAndLog()
-        {
-            testEngine.Run(@"
-class Foo
-{
-}
-
-var inst = Foo();
-inst.a = 10;");
-
-            StringAssert.StartsWith("Attempted to create a new ", testEngine.InterpreterResult);
-        }
-
-        [Test]
-        public void InstanceFromClass_WhenHasInitAndInitChainAndNonExistingFieldWritten_ShouldPreventChangeAndLog()
-        {
-            testEngine.Run(@"
-class Foo
-{
-    var b = 2;
-    init(){this.c = 3;}
-}
-
-var inst = Foo();
-inst.a = 10;");
-
-            StringAssert.StartsWith("Attempted to create a new ", testEngine.InterpreterResult);
-        }
-
-        [Test]
-        public void Class_WhenFrozenAndNonExistingFieldWritten_ShouldPreventChangeAndLog()
-        {
-            testEngine.Run(@"
-class Foo
-{
-}
-
-freeze Foo;
-Foo.a = 10;");
-
-            StringAssert.StartsWith("Attempted to create a new ", testEngine.InterpreterResult);
-        }
-
         [Test]
         public void Instance_WhenUnfrozen_ShouldActAsDynamic()
         {
@@ -63,15 +19,27 @@ class Pair {}
             Assert.AreEqual("3", testEngine.InterpreterResult);
         }
 
-
         [Test]
         public void Freeze_WhenNumber_ShouldFail()
         {
             testEngine.Run(@"
 var foo = 7;
-freeze foo;");
+Freeze(foo);");
 
             StringAssert.StartsWith("Freeze attempted on unsupported type 'Double'", testEngine.InterpreterResult);
         }
+
+        [Test]
+        public void Freeze_WhenDynamic_ShouldBeIsFrozen()
+        {
+            testEngine.Run(@"
+var foo = {=};
+print(IsFrozen(foo));
+Freeze(foo);
+print(IsFrozen(foo));
+");
+
+            Assert.AreEqual("FalseTrue", testEngine.InterpreterResult);
+        }
     }
 }
diff --git a/ulox/ulox.core.tests/uloxs/Samples/15-Freeze.ulox b/ulox/ulox.core.tests/uloxs/Samples/15-Freeze.ulox
@@ -15,7 +15,7 @@ print(IsFrozen(dynInst));
 
 dynInst.a = 10;
 
-freeze dynInst;
+Freeze(dynInst);
 print(IsFrozen(dynInst));
 
 

diff --git a/ulox/ulox.core.tests/uloxs/Tests/Freeze.ulox b/ulox/ulox.core.tests/uloxs/Tests/Freeze.ulox
@@ -38,4 +38,13 @@ testset FreezeTests
 
         Assert.AreEqual(expected, result);
     }
+
+    test FreezeDynamic
+    {
+        var inst = {=};
+
+        Freeze(inst);
+
+        expect IsFrozen(inst);
+    }
 }
diff --git a/ulox/ulox.core/Package/Runtime/Compiler/Compiler.cs b/ulox/ulox.core/Package/Runtime/Compiler/Compiler.cs
@@ -56,7 +56,6 @@ private void Setup()
                 (TokenType.OPEN_BRACE, CompilerStatements.BlockStatement),
                 (TokenType.THROW, CompilerStatements.ThrowStatement),
                 (TokenType.END_STATEMENT, CompilerStatements.NoOpStatement),
-                (TokenType.FREEZE, CompilerStatements.FreezeStatement),
                 (TokenType.EXPECT, CompilerStatements.ExpectStatement),
                 (TokenType.MATCH, CompilerStatements.MatchStatement),
                 (TokenType.LABEL, CompilerStatements.LabelStatement),

diff --git a/ulox/ulox.core/Package/Runtime/Compiler/CompilerStatements.cs b/ulox/ulox.core/Package/Runtime/Compiler/CompilerStatements.cs
@@ -108,13 +108,6 @@ public static void NoOpStatement(Compiler compiler)
         {
         }
 
-        public static void FreezeStatement(Compiler compiler)
-        {
-            compiler.Expression();
-            compiler.EmitPacket(new ByteCodePacket(OpCode.FREEZE));
-            compiler.ConsumeEndStatement();
-        }
-
         //todo expects be desugar
         //could be come if (!(exp)) throw "Expects failed, '{msg}'"
         //problem is we don't know what an exp or statement is yet, tokens would need to either be ast or know similar for

diff --git a/ulox/ulox.core/Package/Runtime/Compiler/Compilettes/EnumTypeDeclarationCompliette.cs b/ulox/ulox.core/Package/Runtime/Compiler/Compilettes/EnumTypeDeclarationCompliette.cs
@@ -2,6 +2,7 @@
 
 namespace ULox
 {
+    //todo can enums also be made entirely at compile time? or become sugar on a readonly dynamic?
     public sealed class EnumTypeDeclarationCompliette : TypeCompilette
     {
         private enum Mode

diff --git a/ulox/ulox.core/Package/Runtime/Engine/VM.cs b/ulox/ulox.core/Package/Runtime/Engine/VM.cs
@@ -447,10 +447,6 @@ public InterpreterResult Run()
                     TestRunner.DoTestOpCode(this, chunk, packet.testOpDetails);
                     break;
 
-                case OpCode.FREEZE:
-                    DoFreezeOp();
-                    break;
-
                 case OpCode.NATIVE_TYPE:
                     DoNativeTypeOp(chunk, packet.NativeType);
                     break;
@@ -1045,26 +1041,6 @@ private void DuplicateStackValuesNew(int startAt, int count)
             }
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void DoFreezeOp()
-        {
-            var instVal = Pop();
-            switch (instVal.type)
-            {
-            case ValueType.Instance:
-                instVal.val.asInstance.Freeze();
-                break;
-
-            case ValueType.UserType:
-                instVal.val.asClass.Freeze();
-                break;
-
-            default:
-                ThrowRuntimeException($"Freeze attempted on unsupported type '{instVal.type}'");
-                break;
-            }
-        }
-
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void DoGetPropertyOp(Chunk chunk, byte constantIndex, Value targetVal)
         {

diff --git a/ulox/ulox.core/Package/Runtime/Enums/OpCode.cs b/ulox/ulox.core/Package/Runtime/Enums/OpCode.cs
@@ -51,8 +51,6 @@ public enum OpCode : byte
         SET_FIELD,
         INVOKE,
 
-        FREEZE, //could collapse with READ_ONLY
-
         TEST,
 
         BUILD,

diff --git a/ulox/ulox.core/Package/Runtime/Enums/TokenType.cs b/ulox/ulox.core/Package/Runtime/Enums/TokenType.cs
@@ -69,8 +69,6 @@ public enum TokenType
         STATIC,
         INIT,
 
-        FREEZE,
-
         MIXIN,
 
         TEST_SET,

diff --git a/ulox/ulox.core/Package/Runtime/Library/StdLibrary.cs b/ulox/ulox.core/Package/Runtime/Library/StdLibrary.cs
@@ -28,6 +28,7 @@ public Table GetBindings()
                 (nameof(str), Value.New(str, 1, 1)),
                 (nameof(IsFrozen), Value.New(IsFrozen, 1, 1)),
                 (nameof(Unfreeze), Value.New(Unfreeze, 1, 1)),
+                (nameof(Freeze), Value.New(Freeze, 1, 1)),
                 (nameof(GenerateStackDump), Value.New(GenerateStackDump, 1, 0)),
                 (nameof(GenerateGlobalsDump), Value.New(GenerateGlobalsDump, 1, 0))
                                             );
@@ -220,6 +221,27 @@ public static NativeCallResult Unfreeze(Vm vm)
             return NativeCallResult.SuccessfulExpression;
         }
 
+        public static NativeCallResult Freeze(Vm vm)
+        {
+            var instVal = vm.GetArg(1);
+            switch (instVal.type)
+            {
+            case ValueType.Instance:
+                instVal.val.asInstance.Freeze();
+                break;
+
+            case ValueType.UserType:
+                instVal.val.asClass.Freeze();
+                break;
+
+            default:
+                vm.ThrowRuntimeException($"Freeze attempted on unsupported type '{instVal.type}'");
+                break;
+            }
+
+            return NativeCallResult.SuccessfulExpression;
+        }
+
         public static NativeCallResult str(Vm vm)
         {
             var v = vm.GetArg(1);

diff --git a/ulox/ulox.core/Package/Runtime/Scanner/Scanner.cs b/ulox/ulox.core/Package/Runtime/Scanner/Scanner.cs
@@ -65,7 +65,6 @@ private void Setup()
                 ("static", TokenType.STATIC),
                 ("init", TokenType.INIT),
                 ("cname", TokenType.CONTEXT_NAME_CLASS),
-                ("freeze", TokenType.FREEZE),
 
                 ("typeof", TokenType.TYPEOF),