@forthic/interp 0.1.0 → 0.3.0

package/dist/esm/forthic/global_module/map_word.d.ts

@@ -15,7 +15,9 @@ export declare class MapWord {
     push_error?: boolean;
     with_key?: boolean;
     cur_index: number;
-    result: any[];
+    result: any[] | {
+        [key: string]: any;
+    };
     errors: any[];
     is_debugging: boolean;
     processing_item: boolean;

package/dist/esm/forthic/global_module/map_word.js

@@ -34,7 +34,10 @@ class MapWord {
         this.result = [];
         this.errors = [];
         if (this.num_interps > 1) {
-            const group_size = Math.ceil(items.length / this.num_interps);
+            interp.stack_push(items);
+            await interp.run("LENGTH");
+            const num_items = interp.stack_pop();
+            const group_size = Math.ceil(num_items / this.num_interps);
             interp.stack_push(items);
             interp.stack_push(group_size);
             await interp.run("GROUPS-OF");
@@ -49,13 +52,20 @@ class MapWord {
             }
             const run_results = await Promise.all(interp_runs);
             // Gather results
-            let result = [];
+            const is_array = items instanceof Array;
+            let array_result = [];
+            let object_result = {};
             let errors = [];
             for (const res of run_results) {
-                result = [...result, ...res[0]];
+                if (is_array) {
+                    array_result = [...array_result, ...res[0]];
+                }
+                else {
+                    object_result = { ...object_result, ...res[0] };
+                }
                 errors = [...errors, ...res[1]];
             }
-            this.result = result;
+            this.result = is_array ? array_result : object_result;
             this.errors = errors;
         }
         else {
@@ -83,7 +93,7 @@ class MapWord {
                 let error = null;
                 try {
                     // If this runs successfully, it would have pushed the result onto the stack
-                    await interp.run(forthic, forthic_location);
+                    await interp.run(forthic, { reference_location: forthic_location });
                 }
                 catch (e) {
                     // Since this didn't run successfully, push null onto the stack
@@ -93,7 +103,7 @@ class MapWord {
                 errors.push(error);
             }
             else {
-                await interp.run(forthic, forthic_location);
+                await interp.run(forthic, { reference_location: forthic_location });
             }
             return interp.stack_pop();
         }

package/dist/esm/forthic/global_module/map_word.js.map

@@ -1 +1 @@
-{"version":3,"file":"map_word.js","sourceRoot":"","sources":["../../../../src/forthic/global_module/map_word.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"map_word.js","sourceRoot":"","sources":["../../../../src/forthic/global_module/map_word.ts"],"names":[],"mappings":"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"}

package/dist/esm/forthic/global_module.d.ts

@@ -1,5 +1,5 @@
 import { Module, Word } from "./module";
-import type { Interpreter } from "./interpreter";
+import { type Interpreter } from "./interpreter";
 export declare class GlobalModule extends Module {
     module_id: string;
     literal_handlers: Array<(value: any) => any>;
@@ -163,5 +163,6 @@ export declare class GlobalModule extends Module {
     word_JSON_to(interp: Interpreter): void;
     word_LOAD_SCREEN(interp: Interpreter): Promise<void>;
     word_dot_s(interp: Interpreter): void;
+    word_dot_S(interp: Interpreter): void;
     word_minus(interp: Interpreter): void;
 }

package/dist/esm/forthic/global_module.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GlobalModule = void 0;
 const module_1 = require("./module");
-const ForthicError_1 = require("./ForthicError");
 const utils_1 = require("./utils");
 const map_word_1 = require("./global_module/map_word");
 const tokenizer_1 = require("./tokenizer");
+const errors_1 = require("./errors");
 const DLE = String.fromCharCode(16); // ASCII char for "Data Link Escape" used as an untypeable quote
 class GlobalModule extends module_1.Module {
     constructor(interp) {
@@ -119,6 +119,7 @@ class GlobalModule extends module_1.Module {
         this.add_module_word("JSON>", this.word_JSON_to);
         this.add_module_word("LOAD-SCREEN", this.word_LOAD_SCREEN);
         this.add_module_word(".s", this.word_dot_s);
+        this.add_module_word(".S", this.word_dot_S);
         // --------------------
         // Date/time words
         this.add_module_word("AM", this.word_AM);
@@ -291,7 +292,7 @@ class GlobalModule extends module_1.Module {
         const module = interp.cur_module();
         varnames.forEach((v) => {
             if (v.match(/__.*/)) {
-                throw new ForthicError_1.ForthicError("global_module-696", `word_VARIABLES: variable names cannot begin with '__': '${JSON.stringify(v)}'`, "This is a reserved variable naming convention");
+                throw new errors_1.InvalidVariableNameError(v, "Variable names cannot begin with '__'", interp.get_string_location());
             }
             module.add_variable(v);
         });
@@ -319,7 +320,7 @@ class GlobalModule extends module_1.Module {
         const string = interp.stack_pop();
         const string_location = interp.get_string_location();
         if (string)
-            await interp.run(string, string_location);
+            await interp.run(string, { reference_location: string_location });
     }
     // ( names -- )
     word_EXPORT(interp) {
@@ -573,7 +574,7 @@ class GlobalModule extends module_1.Module {
             if (flags.with_key)
                 interp.stack_push(key);
             interp.stack_push(value);
-            await interp.run(forthic, string_location);
+            await interp.run(forthic, { reference_location: string_location });
             const group = interp.stack_pop();
             if (!result[group])
                 result[group] = [];
@@ -630,7 +631,7 @@ class GlobalModule extends module_1.Module {
         for (let i = 0; i < items.length; i++) {
             const item = items[i];
             interp.stack_push(item);
-            await interp.run(forthic, string_location);
+            await interp.run(forthic, { reference_location: string_location });
             const keys = interp.stack_pop();
             keys.forEach((k) => {
                 const lowercased_key = k.toLowerCase();
@@ -669,7 +670,7 @@ class GlobalModule extends module_1.Module {
                 if (flags.push_error)
                     errors.push(await execute_returning_error(interp, forthic, string_location));
                 else
-                    await interp.run(forthic, string_location);
+                    await interp.run(forthic, { reference_location: string_location });
             }
         }
         else {
@@ -683,7 +684,7 @@ class GlobalModule extends module_1.Module {
                 if (flags.push_error)
                     errors.push(await execute_returning_error(interp, forthic, string_location));
                 else
-                    await interp.run(forthic, string_location);
+                    await interp.run(forthic, { reference_location: string_location });
             }
         }
         if (flags.push_error)
@@ -752,7 +753,7 @@ class GlobalModule extends module_1.Module {
                     value2 = container2[i];
                 interp.stack_push(container1[i]);
                 interp.stack_push(value2);
-                await interp.run(forthic, string_location);
+                await interp.run(forthic, { reference_location: string_location });
                 const res = interp.stack_pop();
                 result.push(res);
             }
@@ -764,7 +765,7 @@ class GlobalModule extends module_1.Module {
                 const k = keys[i];
                 interp.stack_push(container1[k]);
                 interp.stack_push(container2[k]);
-                await interp.run(forthic, string_location);
+                await interp.run(forthic, { reference_location: string_location });
                 const res = interp.stack_pop();
                 result[k] = res;
             }
@@ -836,7 +837,7 @@ class GlobalModule extends module_1.Module {
             const item = array[index];
             if (!start_found) {
                 interp.stack_push(item);
-                await interp.run(fstart, fstart_string_location);
+                await interp.run(fstart, { reference_location: fstart_string_location });
                 start_found = interp.stack_pop();
                 if (start_found) {
                     start_index = index;
@@ -844,7 +845,7 @@ class GlobalModule extends module_1.Module {
             }
             if (start_found && !end_found) {
                 interp.stack_push(item);
-                await interp.run(fend, fend_string_location);
+                await interp.run(fend, { reference_location: fend_string_location });
                 end_found = interp.stack_pop();
                 if (end_found) {
                     end_index = index;
@@ -1029,7 +1030,7 @@ class GlobalModule extends module_1.Module {
                 if (flags.with_key)
                     interp.stack_push(i);
                 interp.stack_push(item);
-                await interp.run(forthic, string_location);
+                await interp.run(forthic, { reference_location: string_location });
                 const should_select = interp.stack_pop();
                 if (should_select)
                     result.push(item);
@@ -1044,7 +1045,7 @@ class GlobalModule extends module_1.Module {
                 if (flags.with_key)
                     interp.stack_push(k);
                 interp.stack_push(v);
-                await interp.run(forthic, string_location);
+                await interp.run(forthic, { reference_location: string_location });
                 const should_select = interp.stack_pop();
                 if (should_select)
                     result[k] = v;
@@ -1199,7 +1200,7 @@ class GlobalModule extends module_1.Module {
                 for (let i = 0; i < vals.length; i++) {
                     const val = vals[i];
                     interp.stack_push(val);
-                    await interp.run(forthic, flag_string_position);
+                    await interp.run(forthic, { reference_location: flag_string_position });
                     const aug_val = interp.stack_pop();
                     res.push([val, aug_val]);
                 }
@@ -1417,7 +1418,7 @@ class GlobalModule extends module_1.Module {
             interp.stack_push(initial);
             container.forEach(async (item) => {
                 interp.stack_push(item);
-                await interp.run(forthic, string_location);
+                await interp.run(forthic, { reference_location: string_location });
             });
             result = interp.stack_pop();
         }
@@ -1426,7 +1427,7 @@ class GlobalModule extends module_1.Module {
             Object.keys(container).forEach(async (k) => {
                 const v = container[k];
                 interp.stack_push(v);
-                await interp.run(forthic, string_location);
+                await interp.run(forthic, { reference_location: string_location });
             });
             result = interp.stack_pop();
         }
@@ -2138,7 +2139,7 @@ class GlobalModule extends module_1.Module {
         }
         for (const item of items) {
             interp.stack_push(item);
-            await interp.run(fvalue, string_location);
+            await interp.run(fvalue, { reference_location: string_location });
             const value = interp.stack_pop();
             let bucket = "BEFORE";
             for (const range_start of start_ranges) {
@@ -2298,7 +2299,7 @@ class GlobalModule extends module_1.Module {
         const string_location = interp.get_string_location();
         let value = interp.stack_pop();
         if (value === undefined || value === null || value === "") {
-            await interp.run(default_forthic, string_location);
+            await interp.run(default_forthic, { reference_location: string_location });
             value = interp.stack_pop();
         }
         interp.stack_push(value);
@@ -2325,7 +2326,7 @@ class GlobalModule extends module_1.Module {
             // Store item so we can push it back later
             const item = interp.stack_pop();
             interp.stack_push(item);
-            await interp.run(forthic, string_location);
+            await interp.run(forthic, { reference_location: string_location });
             const res = interp.stack_pop();
             // Push original item and result
             interp.stack_push(item);
@@ -2371,12 +2372,24 @@ class GlobalModule extends module_1.Module {
         const screen_forthic = interp.get_screen_forthic(name);
         const location = new tokenizer_1.CodeLocation({ screen_name: name });
         // await interp.run(screen_forthic, location);
-        await interp.run(screen_forthic, location);
+        await interp.run(screen_forthic, { reference_location: location });
     }
     // ( -- )
     word_dot_s(interp) {
-        const stack = interp.stack;
-        console.log(stack);
+        const stack = interp.get_stack();
+        if (stack.length > 0) {
+            console.log(stack[stack.length - 1]);
+        }
+        else {
+            console.log("<STACK EMPTY>");
+        }
+        throw new errors_1.IntentionalStopError(".s");
+    }
+    // ( -- )
+    word_dot_S(interp) {
+        const stack = interp.get_stack();
+        console.log(JSON.stringify(stack, null, 2));
+        throw new errors_1.IntentionalStopError(".S");
     }
     // ( a b -- a - b )
     word_minus(interp) {
@@ -2402,7 +2415,7 @@ function drill_for_value(record, fields) {
 async function execute_returning_error(interp, forthic, string_location) {
     let result = null;
     try {
-        await interp.run(forthic, string_location);
+        await interp.run(forthic, { reference_location: string_location });
     }
     catch (e) {
         result = e;