gh-190: Make module ops use STR.

Closes #190.

Author: python-processing-unit

docs/SPECIFICATION.html

@@ -851,7 +851,7 @@
 
   Operators registered with the module-restriction flag (for example `PREFIX_EXTENSION_MODULE_RESTRICTED`) MUST be exposed only under the extending module's namespace. Importing that module MUST expose the extension namespace qualifier under the importing module's qualified name. `PREFIX_EXTENSION_ASMODULE` by itself MUST NOT restrict an operator to the extending module's namespace or cause that qualified exposure. Extension side effects outside operator registration (for example process-global hooks or host-side state) remain global.
 
-- `BOOL IMPORT(MODULE name)` or `BOOL IMPORT(MODULE name, SYMBOL alias)` = MUST load the named module, execute it in its own top-level environment on first import, cache that environment, and expose its bindings under the module name or the supplied alias. The implementation MUST search the referring source directory first, then bundled library locations as described in [8.2](#82-extensions-and-extend), [10](#10-standard-library), and the language's module-search rules. Re-importing an already loaded module MUST reuse the cached module namespace rather than re-executing the module.
+- `BOOL IMPORT(STR module)` or `BOOL IMPORT(STR module, STR alias)` = MUST load the named module, execute it in its own top-level environment on first import, cache that environment, and expose its bindings under the module name or the supplied alias. The implementation MUST search the referring source directory first, then bundled library locations as described in [8.2](#82-extensions-and-extend), [10](#10-standard-library), and the language's module-search rules. Re-importing an already loaded module MUST reuse the cached module namespace rather than re-executing the module.
 
   Prefix package namespaces MUST use `..` as the package separator. The canonical form is `package..subpackage..module`. When `IMPORT(pkg)` is used and a package directory named `pkg` exists, the interpreter MUST prefer package resolution and attempt to load `pkg/init.pre`. If that package directory exists but contains no `init.pre`, the import MUST raise a runtime error. When `IMPORT(pkg..mod)` is used, the interpreter MUST resolve to `pkg/mod.pre`. If both a package directory and a same-named module file exist in the same search location, the package MUST take precedence.
 
@@ -861,9 +861,9 @@
 
   Module import MUST NOT implicitly load companion extension pointer files. Runtime extensions for module code MUST be loaded explicitly via `EXTEND` inside the module. On success, `IMPORT` MUST return `FALSE`.
 
-- `BOOL IMPORT_PATH(STR path)` or `BOOL IMPORT_PATH(STR path, SYMBOL alias)` = MUST load a module from an explicit filesystem path and expose it under `alias` or, if omitted, under a basename-derived module name. The argument MUST at minimum accept an absolute path to a `.pre` source file. The module's basename, excluding the `.pre` suffix, MUST be used as the default qualified module name when no alias is supplied. The loaded module MUST otherwise obey the same isolation, caching, and exposure rules as `IMPORT`. Runtime extensions for that module MUST be loaded explicitly via `EXTEND`. On success, `IMPORT_PATH` MUST return `FALSE`.
+- `BOOL IMPORT_PATH(STR path)` or `BOOL IMPORT_PATH(STR path, STR alias)` = MUST load a module from an explicit filesystem path and expose it under `alias` or, if omitted, under a basename-derived module name. The argument MUST at minimum accept an absolute path to a `.pre` source file. The module's basename, excluding the `.pre` suffix, MUST be used as the default qualified module name when no alias is supplied. The loaded module MUST otherwise obey the same isolation, caching, and exposure rules as `IMPORT`. Runtime extensions for that module MUST be loaded explicitly via `EXTEND`. On success, `IMPORT_PATH` MUST return `FALSE`.
 
-- `BOOL EXPORT(SYMBOL symbol, MODULE module)` = MUST copy the caller's current binding for `symbol` into the namespace of the already imported module designated by `module`, making the exported binding available through that module's qualified namespace. `EXPORT` MUST return `FALSE` on success and MUST raise a runtime error if `module` is not currently imported.
+- `BOOL EXPORT(STR symbol, STR module)` = MUST copy the caller's current binding for `symbol` into the namespace of the already imported module designated by `module`, making the exported binding available through that module's qualified namespace. `EXPORT` MUST return `FALSE` on success and MUST raise a runtime error if `module` is not currently imported.
 
 ---
 

lib/std/image/init.pre

@@ -8,7 +8,7 @@ EXTEND(EXTENSION: win32)
 
 EXTEND(EXTENSION: image)
 
-IMPORT(path)
+IMPORT("path")
 
 FUNC TNS LOAD(STR img_path){
     STR ext = path.EXTNAME(img_path)

src/builtins.c

@@ -6955,10 +6955,10 @@ static Value builtin_import_path(Interpreter *interp, Value *args, int argc, Exp
     const char *alias = NULL;
     char *alias_dup = NULL;
     if (argc >= 2) {
-        if (arg_nodes[1]->type != EXPR_IDENT) {
-            RUNTIME_ERROR(interp, "IMPORT_PATH second argument must be an identifier (alias)", line, col);
+        if (args[1].type != VAL_STR) {
+            RUNTIME_ERROR(interp, "IMPORT_PATH second argument must be STR (alias)", line, col);
         }
-        alias = arg_nodes[1]->as.ident;
+        alias = args[1].as.s ? args[1].as.s : "";
     } else {
         // Derive alias from basename of path (strip directories and extension)
         const char *p = inpath + strlen(inpath);
@@ -8514,12 +8514,15 @@ static Value builtin_permafreeze(Interpreter *interp, Value *args, int argc, Exp
 }
 
 static Value builtin_export(Interpreter *interp, Value *args, int argc, Expr **arg_nodes, Env *env, int line, int col) {
-    (void)args;
-    if (argc != 2 || arg_nodes[0]->type != EXPR_IDENT || arg_nodes[1]->type != EXPR_IDENT) {
-        RUNTIME_ERROR(interp, "EXPORT expects two identifiers", line, col);
+    (void)arg_nodes;
+    if (argc != 2) {
+        RUNTIME_ERROR(interp, "EXPORT expects two STR arguments (symbol, module)", line, col);
     }
-    const char *sym = arg_nodes[0]->as.ident;
-    const char *module = arg_nodes[1]->as.ident;
+    if (args[0].type != VAL_STR || args[1].type != VAL_STR) {
+        RUNTIME_ERROR(interp, "EXPORT expects STR symbol and STR module", line, col);
+    }
+    const char *sym = args[0].as.s ? args[0].as.s : "";
+    const char *module = args[1].as.s ? args[1].as.s : "";
 
     // Find the symbol in caller environment
     EnvEntry *entry = env_get_entry(env, sym);
@@ -9974,18 +9977,21 @@ static int module_export_bindings(Interpreter *interp, Env *caller_env, Env *mod
 
 // Stubs for operations requiring TNS/MAP/THD
 static Value builtin_import(Interpreter *interp, Value *args, int argc, Expr **arg_nodes, Env *env, int line, int col) {
-    (void)args;
-    (void)argc;
-    if (argc < 1 || arg_nodes[0]->type != EXPR_IDENT) {
-        RUNTIME_ERROR(interp, "IMPORT expects a module identifier", line, col);
+    (void)arg_nodes;
+    (void)env;
+    if (argc < 1) {
+        RUNTIME_ERROR(interp, "IMPORT expects a module name STR", line, col);
     }
-    const char *modname = arg_nodes[0]->as.ident;
+    if (args[0].type != VAL_STR) {
+        RUNTIME_ERROR(interp, "IMPORT first argument must be STR", line, col);
+    }
+    const char *modname = args[0].as.s ? args[0].as.s : "";
     const char *alias = NULL;
     if (argc >= 2) {
-        if (arg_nodes[1]->type != EXPR_IDENT) {
-            RUNTIME_ERROR(interp, "IMPORT second argument must be an identifier (alias)", line, col);
+        if (args[1].type != VAL_STR) {
+            RUNTIME_ERROR(interp, "IMPORT second argument must be STR (alias)", line, col);
         }
-        alias = arg_nodes[1]->as.ident;
+        alias = args[1].as.s ? args[1].as.s : "";
     } else {
         alias = modname;
     }

src/interpreter.c

@@ -1410,11 +1410,10 @@ Value eval_expr(Interpreter *interp, Expr *expr, Env *env) {
                             // EXTEND(EXTENSION: name) passes the symbolic extension specifier.
                             continue;
                         }
-                        if (((strcmp(func_name, "DEL") == 0 || strcmp(func_name, "EXIST") == 0 ||
-                              strcmp(func_name, "IMPORT") == 0 || strcmp(func_name, "ASSIGN") == 0) &&
-                             i == 0) ||
-                            ((strcmp(func_name, "IMPORT") == 0 || strcmp(func_name, "IMPORT_PATH") == 0) && i == 1)) {
-                            // leave as null placeholder
+                        if ((strcmp(func_name, "DEL") == 0 || strcmp(func_name, "EXIST") == 0 ||
+                             strcmp(func_name, "ASSIGN") == 0) &&
+                            i == 0) {
+                            // leave as null placeholder for identifier-like targets
                             continue;
                         }
                         args[i] = eval_expr(interp, arg_expr, env);

tests/cases/failing/deletefile-arity-two.pre

@@ -1,4 +1,4 @@
-IMPORT(path)
+IMPORT("path")
 
 STR p = path.TEMPFILE("temp.txt")
 WRITEFILE("Prefix", p)

tests/cases/failing/deletefile-nonexistent.pre

@@ -1,3 +1,3 @@
-IMPORT(path)
+IMPORT("path")
 
 DELETEFILE(JOIN(path.script_dir, "/nonexistent.txt"))

tests/cases/failing/existfile-arity-two.pre

@@ -1,3 +1,3 @@
-IMPORT(path)
+IMPORT("path")
 
 EXISTFILE(path.script_dir, "/plain.txt")

tests/cases/failing/export-arity-three.pre

@@ -1,2 +1,2 @@
 INT value = 0d1
-EXPORT(value, helper, extra)
+EXPORT(value, "helper", extra)

tests/cases/failing/export-declared-only-symbol.pre

@@ -1,9 +1,9 @@
-IMPORT(path)
+IMPORT("path")
 
 STR tests_dir = path.BASEPATH(path.BASEPATH(path.script_dir))
 STR helper_path = JOIN(tests_dir, "/helpers/export_target.pre")
 
-REFUTE(IMPORT_PATH(helper_path, helper))
+REFUTE(IMPORT_PATH(helper_path, "helper"))
 
 INT value
-EXPORT(value, helper)
+EXPORT("value", "helper")

tests/cases/failing/export-deleted-symbol.pre

@@ -1,10 +1,10 @@
-IMPORT(path)
+IMPORT("path")
 
 STR tests_dir = path.BASEPATH(path.BASEPATH(path.script_dir))
 STR helper_path = JOIN(tests_dir, "/helpers/export_target.pre")
 
-REFUTE(IMPORT_PATH(helper_path, helper))
+REFUTE(IMPORT_PATH(helper_path, "helper"))
 
 INT value = 0d1
 DEL(value)
-EXPORT(value, helper)
+EXPORT("value", "helper")