gh-195: Make freezing ops use STR.

Closes #195.

Author: python-processing-unit

docs/SPECIFICATION.html

@@ -709,9 +709,9 @@
 
 - `STR SIGNATURE(SYMBOL name)` = MUST return a textual signature for `name`. If `name` denotes a user-defined function, the result MUST use the canonical function-signature form of this specification. For any other visible binding, the result MUST be `TYPE name`.
 
-- `BOOL FREEZE(SYMBOL name)`, `BOOL THAW(SYMBOL name)`, and `BOOL PERMAFREEZE(SYMBOL name)` = MUST modify the mutability state of the binding designated by `name`. `FREEZE` MUST prevent reassignment and deletion until thawed. `PERMAFREEZE` MUST permanently prevent reassignment, deletion, and later thawing. `THAW` MUST clear a non-permanent freeze, MUST raise a runtime error when applied to a permanently frozen binding, and MUST otherwise succeed as a no-op when applied to a binding that is not currently frozen. `FREEZE`, `THAW`, and `PERMAFREEZE` MUST each return `FALSE` on success and MUST raise a runtime error if `name` is undefined.
+-- `BOOL FREEZE(STR name)`, `BOOL THAW(STR name)`, and `BOOL PERMAFREEZE(SYMBOL name)` = MUST modify the mutability state of the binding designated by `name`. `FREEZE` MUST prevent reassignment and deletion until thawed. `PERMAFREEZE` MUST permanently prevent reassignment, deletion, and later thawing. `THAW` MUST clear a non-permanent freeze, MUST raise a runtime error when applied to a permanently frozen binding, and MUST otherwise succeed as a no-op when applied to a binding that is not currently frozen. `FREEZE`, `THAW`, and `PERMAFREEZE` MUST each return `FALSE` on success and MUST raise a runtime error if `name` is undefined.
 
-- `BOOL FROZEN(SYMBOL name)` and `BOOL PERMAFROZEN(SYMBOL name)` = MUST report the freeze state of `name`. `FROZEN` MUST return `TRUE` for any frozen or permanently frozen binding and `FALSE` otherwise. `PERMAFROZEN` MUST return `TRUE` only for permanently frozen bindings and `FALSE` otherwise. If `name` is undefined, both operators MUST return `FALSE`.
+-- `BOOL FROZEN(STR name)` and `BOOL PERMAFROZEN(SYMBOL name)` = MUST report the freeze state of `name`. `FROZEN` MUST return `TRUE` for any frozen or permanently frozen binding and `FALSE` otherwise. `PERMAFROZEN` MUST return `TRUE` only for permanently frozen bindings and `FALSE` otherwise. If `name` is undefined, both operators MUST return `FALSE`.
 
 ---
 

src/builtins.c

@@ -8530,11 +8530,12 @@ static Value builtin_del(Interpreter *interp, Value *args, int argc, Expr **arg_
 }
 
 static Value builtin_freeze(Interpreter *interp, Value *args, int argc, Expr **arg_nodes, Env *env, int line, int col) {
-    (void)args;
-    if (argc != 1 || arg_nodes[0]->type != EXPR_IDENT) {
-        RUNTIME_ERROR(interp, "FREEZE expects an identifier", line, col);
+    (void)arg_nodes;
+    if (argc != 1) {
+        RUNTIME_ERROR(interp, "FREEZE expects 1 argument", line, col);
     }
-    const char *name = arg_nodes[0]->as.ident;
+    EXPECT_STR(args[0], "FREEZE", interp, line, col);
+    const char *name = args[0].as.s ? args[0].as.s : "";
     int r = env_freeze(env, name);
     if (r != 0) {
         char buf[128];
@@ -8545,11 +8546,12 @@ static Value builtin_freeze(Interpreter *interp, Value *args, int argc, Expr **a
 }
 
 static Value builtin_thaw(Interpreter *interp, Value *args, int argc, Expr **arg_nodes, Env *env, int line, int col) {
-    (void)args;
-    if (argc != 1 || arg_nodes[0]->type != EXPR_IDENT) {
-        RUNTIME_ERROR(interp, "THAW expects an identifier", line, col);
+    (void)arg_nodes;
+    if (argc != 1) {
+        RUNTIME_ERROR(interp, "THAW expects 1 argument", line, col);
     }
-    const char *name = arg_nodes[0]->as.ident;
+    EXPECT_STR(args[0], "THAW", interp, line, col);
+    const char *name = args[0].as.s ? args[0].as.s : "";
     int r = env_thaw(env, name);
     if (r == -1) {
         char buf[128];
@@ -8649,11 +8651,12 @@ static Value builtin_export(Interpreter *interp, Value *args, int argc, Expr **a
 }
 
 static Value builtin_frozen(Interpreter *interp, Value *args, int argc, Expr **arg_nodes, Env *env, int line, int col) {
-    (void)args;
-    if (argc != 1 || arg_nodes[0]->type != EXPR_IDENT) {
-        RUNTIME_ERROR(interp, "FROZEN expects an identifier", line, col);
+    (void)arg_nodes;
+    if (argc != 1) {
+        RUNTIME_ERROR(interp, "FROZEN expects 1 argument", line, col);
     }
-    const char *name = arg_nodes[0]->as.ident;
+    EXPECT_STR(args[0], "FROZEN", interp, line, col);
+    const char *name = args[0].as.s ? args[0].as.s : "";
     int st = env_frozen_state(env, name);
     return value_bool(st != 0);
 }

tests/cases/failing/alias-to-frozen.pre

@@ -1,4 +1,4 @@
 INT t = 0d1
-FREEZE(t)
+FREEZE("t")
 
 INT p = @t

tests/cases/passing/async-error-not-caught.pre

@@ -2,7 +2,7 @@ BOOL caught = FALSE
 
 TRY{
     THR worker = ASYNC{
-        FREEZE(not_declared)
+        FREEZE("not_declared")
     }
 } CATCH {
     caught = TRUE
@@ -15,7 +15,7 @@ REFUTE(caught)
 BOOL caught_await = FALSE
 
 THR worker2 = ASYNC{
-    FREEZE(not_declared)
+    FREEZE("not_declared")
 }
 
 TRY{

tests/cases/passing/del-frozen.pre

@@ -1,5 +1,5 @@
 BOOL frozen_symbol = TRUE
-REFUTE(FREEZE(frozen_symbol))
+REFUTE(FREEZE("frozen_symbol"))
 
 BOOL frozen_delete_failed = FALSE
 TRY{
@@ -10,7 +10,7 @@ TRY{
 ASSERT(frozen_delete_failed)
 ASSERT(EXIST("frozen_symbol"))
 
-REFUTE(THAW(frozen_symbol))
+REFUTE(THAW("frozen_symbol"))
 REFUTE(DEL("frozen_symbol"))
 REFUTE(EXIST("frozen_symbol"))
 

tests/cases/passing/freeze.pre

@@ -1,12 +1,12 @@
 BOOL frozen_value = TRUE
 
-REFUTE(FREEZE(frozen_value))
-ASSERT(FROZEN(frozen_value))
+REFUTE(FREEZE("frozen_value"))
+ASSERT(FROZEN("frozen_value"))
 REFUTE(PERMAFROZEN(frozen_value))
 
 BOOL freeze_undefined_failed = FALSE
 TRY{
-    FREEZE(not_declared)
+    FREEZE("not_declared")
 } CATCH {
     freeze_undefined_failed = TRUE
 }
@@ -30,7 +30,7 @@ TRY{
 ASSERT(deletion_failed)
 ASSERT(EXIST("frozen_value"))
 
-REFUTE(THAW(frozen_value))
-REFUTE(FROZEN(frozen_value))
+REFUTE(THAW("frozen_value"))
+REFUTE(FROZEN("frozen_value"))
 frozen_value = FALSE
 ASSERT(EQ(frozen_value, FALSE))

tests/cases/passing/frozen.pre

@@ -1,11 +1,11 @@
 BOOL normal_value = TRUE
-REFUTE(FROZEN(normal_value))
+REFUTE(FROZEN("normal_value"))
 
-REFUTE(FREEZE(normal_value))
-ASSERT(FROZEN(normal_value))
-REFUTE(THAW(normal_value))
-REFUTE(FROZEN(normal_value))
+REFUTE(FREEZE("normal_value"))
+ASSERT(FROZEN("normal_value"))
+REFUTE(THAW("normal_value"))
+REFUTE(FROZEN("normal_value"))
 
 REFUTE(PERMAFREEZE(normal_value))
-ASSERT(FROZEN(normal_value))
+ASSERT(FROZEN("normal_value"))
 ASSERT(PERMAFROZEN(normal_value))

tests/cases/passing/permafreeze.pre

@@ -1,7 +1,7 @@
 BOOL locked_value = TRUE
 
 REFUTE(PERMAFREEZE(locked_value))
-ASSERT(FROZEN(locked_value))
+ASSERT(FROZEN("locked_value"))
 ASSERT(PERMAFROZEN(locked_value))
 
 BOOL permafreeze_undefined_failed = FALSE
@@ -32,7 +32,7 @@ ASSERT(EXIST("locked_value"))
 
 BOOL thaw_failed = FALSE
 TRY{
-    THAW(locked_value)
+    THAW("locked_value")
 } CATCH {
     thaw_failed = TRUE
 }

tests/cases/passing/permafrozen.pre

@@ -3,4 +3,4 @@ REFUTE(PERMAFROZEN(normal_value))
 
 REFUTE(PERMAFREEZE(normal_value))
 ASSERT(PERMAFROZEN(normal_value))
-ASSERT(FROZEN(normal_value))
+ASSERT(FROZEN("normal_value"))

tests/cases/passing/thaw.pre

@@ -1,19 +1,19 @@
 BOOL thaw_value = TRUE
 
-REFUTE(THAW(thaw_value))
+REFUTE(THAW("thaw_value"))
 ASSERT(thaw_value)
 
-REFUTE(FREEZE(thaw_value))
-ASSERT(FROZEN(thaw_value))
-REFUTE(THAW(thaw_value))
-REFUTE(FROZEN(thaw_value))
+REFUTE(FREEZE("thaw_value"))
+ASSERT(FROZEN("thaw_value"))
+REFUTE(THAW("thaw_value"))
+REFUTE(FROZEN("thaw_value"))
 
 thaw_value = FALSE
 ASSERT(EQ(thaw_value, FALSE))
 
 BOOL thaw_undefined_failed = FALSE
 TRY{
-    THAW(not_declared)
+    THAW("not_declared")
 } CATCH {
     thaw_undefined_failed = TRUE
 }