greybel-interpreter 0.1.2 → 0.1.6

package/dist/context.d.ts

@@ -39,6 +39,9 @@ export declare class Debugger {
     interact(operationContext: OperationContext, item: Operation | Expression): void;
     run(code: string): Promise<void>;
 }
+export interface OperationContextProcessState {
+    exit: boolean;
+}
 export interface OperationContextOptions {
     isProtected?: boolean;
     type?: string;
@@ -46,6 +49,7 @@ export interface OperationContextOptions {
     previous?: OperationContext;
     debugger?: Debugger;
     cps?: CPS;
+    processState?: OperationContextProcessState;
 }
 export declare class OperationContext {
     debugger: Debugger;
@@ -56,6 +60,7 @@ export declare class OperationContext {
     isProtected: boolean;
     memory: Map<string, any>;
     cps: CPS | null;
+    processState: OperationContextProcessState;
     constructor(options: OperationContextOptions);
     valueOf(): Map<string, any>;
     extend(map: Map<string, any>): OperationContext;

package/dist/context.js

@@ -312,6 +312,9 @@ var OperationContext = /** @class */ (function () {
         me.memory = new Map();
         me.debugger = options.debugger || new Debugger();
         me.cps = options.cps;
+        me.processState = options.processState || {
+            exit: false
+        };
     }
     OperationContext.prototype.valueOf = function () {
         return this.scope.valueOf();
@@ -381,7 +384,8 @@ var OperationContext = /** @class */ (function () {
             type: type,
             state: state,
             debugger: me.debugger,
-            cps: me.cps
+            cps: me.cps,
+            processState: me.processState
         });
         if (me.type === ContextType.FUNCTION || me.type === ContextType.GLOBAL) {
             opc.scope.refs.set('locals', opc.scope);

package/dist/custom-types/list.d.ts

@@ -13,7 +13,7 @@ export default class CustomList extends CustomObjectType {
     [Symbol.iterator](): CustomListIterator;
     concat(list: CustomList): CustomList;
     slice: (a: CustomLiteralType, b: CustomLiteralType) => CustomList;
-    toIndex(value: string): number;
+    toIndex(value: string): number | null;
     set(path: any[], value: any): Promise<void>;
     get(path: any[]): Promise<any>;
     getCallable(path: any[]): Promise<Callable>;

package/dist/custom-types/list.js

@@ -126,11 +126,15 @@ var CustomList = /** @class */ (function (_super) {
     CustomList.prototype.toIndex = function (value) {
         var me = this;
         var casted = Number(value);
-        return casted < 0 ? me.value.length + casted : casted;
+        var result = casted < 0 ? me.value.length + casted : casted;
+        if (result < 0) {
+            return null;
+        }
+        return result;
     };
     CustomList.prototype.set = function (path, value) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, last, current, origin;
+            var me, traversalPath, refs, last, current, origin, index, setterIndex;
             return __generator(this, function (_a) {
                 me = this;
                 traversalPath = [].concat(path);
@@ -139,8 +143,9 @@ var CustomList = /** @class */ (function (_super) {
                 current = traversalPath.shift();
                 origin = refs;
                 if (current != null) {
-                    if (current in origin) {
-                        origin = origin[current];
+                    index = me.toIndex(current);
+                    if (origin.hasOwnProperty(index)) {
+                        origin = origin[index];
                         if (origin instanceof custom_type_1.CustomObjectType) {
                             return [2 /*return*/, origin.set(traversalPath.concat([last]), value)];
                         }
@@ -150,11 +155,15 @@ var CustomList = /** @class */ (function (_super) {
                     }
                 }
                 if (origin) {
+                    setterIndex = me.toIndex(last);
+                    if (!origin.hasOwnProperty(setterIndex)) {
+                        throw new Error("Index error (list index ".concat(setterIndex, " out of range)"));
+                    }
                     if (value instanceof function_1.default) {
-                        origin[last] = value.fork(me);
+                        origin[setterIndex] = value.fork(me);
                     }
                     else {
-                        origin[last] = value;
+                        origin[setterIndex] = value;
                     }
                 }
                 else {
@@ -166,7 +175,7 @@ var CustomList = /** @class */ (function (_super) {
     };
     CustomList.prototype.get = function (path) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, currentValue, origin;
+            var me, traversalPath, refs, current, currentValue, origin, index;
             return __generator(this, function (_a) {
                 me = this;
                 if (path.length === 0) {
@@ -178,8 +187,9 @@ var CustomList = /** @class */ (function (_super) {
                 currentValue = current.valueOf();
                 origin = refs;
                 if (currentValue != null) {
-                    if (currentValue in origin) {
-                        origin = origin[currentValue];
+                    index = me.toIndex(current);
+                    if (origin.hasOwnProperty(index)) {
+                        origin = origin[index];
                         if (traversalPath.length > 0 && origin instanceof custom_type_1.CustomObjectType) {
                             return [2 /*return*/, origin.get(traversalPath)];
                         }
@@ -200,7 +210,7 @@ var CustomList = /** @class */ (function (_super) {
     };
     CustomList.prototype.getCallable = function (path) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, origin, context;
+            var me, traversalPath, refs, current, origin, context, index;
             return __generator(this, function (_a) {
                 me = this;
                 traversalPath = [].concat(path);
@@ -208,9 +218,10 @@ var CustomList = /** @class */ (function (_super) {
                 current = traversalPath.shift();
                 origin = refs;
                 if (current != null) {
-                    if (current in origin) {
+                    index = me.toIndex(current);
+                    if (origin.hasOwnProperty(index)) {
                         context = origin;
-                        origin = origin[current];
+                        origin = origin[index];
                         if (origin instanceof custom_type_1.CustomObjectType) {
                             return [2 /*return*/, origin.getCallable(traversalPath)];
                         }

package/dist/expressions/logical-and-binary.js

@@ -71,7 +71,10 @@ var multiplyString = function (a, b) {
 exports.multiplyString = multiplyString;
 exports.OPERATIONS = (_a = {},
     _a[greybel_core_1.Operator.Plus] = function (a, b) {
-        if ((0, typer_1.isCustomList)(a) || (0, typer_1.isCustomList)(b)) {
+        if ((0, typer_1.isCustomMap)(a) && (0, typer_1.isCustomMap)(b)) {
+            return a.extend(b.value);
+        }
+        else if ((0, typer_1.isCustomList)(a) && (0, typer_1.isCustomList)(b)) {
             return a.concat(b);
         }
         var aVal = (0, typer_1.isCustomString)(a) ? (a.valueOf() || '') : (0, exports.toPrimitive)(a);
@@ -140,7 +143,7 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
             return value.get(operationContext);
         };
         var evaluate = function (node) { return __awaiter(_this, void 0, void 0, function () {
-            var left, right, _a;
+            var left, right, _a, result;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -156,7 +159,8 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                         return [4 /*yield*/, resolve(node.right)];
                     case 3:
                         right = _b.sent();
-                        return [2 /*return*/, (0, typer_1.cast)(exports.OPERATIONS[node.operator](left, right))];
+                        result = exports.OPERATIONS[node.operator](left, right);
+                        return [2 /*return*/, (0, typer_1.cast)(Number.isNaN(result) ? null : result)];
                     case 4: return [4 /*yield*/, resolve(node.left)];
                     case 5:
                         left = _b.sent();

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { default as BinaryNegatedExpression } from './expressions/binary-negated
 export { default as ArgumentOperation } from './operations/argument';
 export { default as WhileOperation } from './operations/while';
 export { default as ForOperation } from './operations/for';
+export { default as FunctionOperation } from './operations/function';
 export { default as ReturnOperation } from './operations/return';
 export { default as NewOperation } from './operations/new';
 export { default as NotOperation } from './operations/not';
@@ -33,3 +34,4 @@ export * from './types/expression';
 export * from './types/custom-type';
 export { default as CPS, CPSMap, CPSMapContext, CPSMapType } from './cps';
 export { default as Interpreter, InterpreterOptions } from './interpreter';
+export { isCustomValue, isCustomMap, isCustomList, isCustomString, isCustomNumber, cast as toCustomValue } from './typer';

package/dist/index.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Interpreter = exports.CPSMap = exports.CPS = exports.CustomList = exports.CustomMap = exports.CustomNil = exports.CustomString = exports.CustomNumber = exports.CustomBoolean = exports.DebuggerOperation = exports.TopOperation = exports.BodyOperation = exports.BreakOperation = exports.ContinueOperation = exports.ElseOperation = exports.ElseIfOperation = exports.IfOperation = exports.IfStatementOperation = exports.NotOperation = exports.NewOperation = exports.ReturnOperation = exports.ForOperation = exports.WhileOperation = exports.ArgumentOperation = exports.BinaryNegatedExpression = exports.PathExpression = exports.MapExpression = exports.LogicalAndBinaryExpression = exports.ListExpression = exports.CallExpression = exports.AssignExpression = void 0;
+exports.toCustomValue = exports.isCustomNumber = exports.isCustomString = exports.isCustomList = exports.isCustomMap = exports.isCustomValue = exports.Interpreter = exports.CPSMap = exports.CPS = exports.CustomList = exports.CustomMap = exports.CustomNil = exports.CustomString = exports.CustomNumber = exports.CustomBoolean = exports.DebuggerOperation = exports.TopOperation = exports.BodyOperation = exports.BreakOperation = exports.ContinueOperation = exports.ElseOperation = exports.ElseIfOperation = exports.IfOperation = exports.IfStatementOperation = exports.NotOperation = exports.NewOperation = exports.ReturnOperation = exports.FunctionOperation = exports.ForOperation = exports.WhileOperation = exports.ArgumentOperation = exports.BinaryNegatedExpression = exports.PathExpression = exports.MapExpression = exports.LogicalAndBinaryExpression = exports.ListExpression = exports.CallExpression = exports.AssignExpression = void 0;
 var assign_1 = require("./expressions/assign");
 Object.defineProperty(exports, "AssignExpression", { enumerable: true, get: function () { return __importDefault(assign_1).default; } });
 var call_1 = require("./expressions/call");
@@ -34,6 +34,8 @@ var while_1 = require("./operations/while");
 Object.defineProperty(exports, "WhileOperation", { enumerable: true, get: function () { return __importDefault(while_1).default; } });
 var for_1 = require("./operations/for");
 Object.defineProperty(exports, "ForOperation", { enumerable: true, get: function () { return __importDefault(for_1).default; } });
+var function_1 = require("./operations/function");
+Object.defineProperty(exports, "FunctionOperation", { enumerable: true, get: function () { return __importDefault(function_1).default; } });
 var return_1 = require("./operations/return");
 Object.defineProperty(exports, "ReturnOperation", { enumerable: true, get: function () { return __importDefault(return_1).default; } });
 var new_1 = require("./operations/new");
@@ -80,3 +82,10 @@ Object.defineProperty(exports, "CPS", { enumerable: true, get: function () { ret
 Object.defineProperty(exports, "CPSMap", { enumerable: true, get: function () { return cps_1.CPSMap; } });
 var interpreter_1 = require("./interpreter");
 Object.defineProperty(exports, "Interpreter", { enumerable: true, get: function () { return __importDefault(interpreter_1).default; } });
+var typer_1 = require("./typer");
+Object.defineProperty(exports, "isCustomValue", { enumerable: true, get: function () { return typer_1.isCustomValue; } });
+Object.defineProperty(exports, "isCustomMap", { enumerable: true, get: function () { return typer_1.isCustomMap; } });
+Object.defineProperty(exports, "isCustomList", { enumerable: true, get: function () { return typer_1.isCustomList; } });
+Object.defineProperty(exports, "isCustomString", { enumerable: true, get: function () { return typer_1.isCustomString; } });
+Object.defineProperty(exports, "isCustomNumber", { enumerable: true, get: function () { return typer_1.isCustomNumber; } });
+Object.defineProperty(exports, "toCustomValue", { enumerable: true, get: function () { return typer_1.cast; } });

package/dist/interpreter.d.ts

@@ -1,4 +1,4 @@
-import { Debugger } from './context';
+import { OperationContext, Debugger } from './context';
 import { ResourceHandler } from './resource';
 export interface InterpreterOptions {
     target?: string;
@@ -15,6 +15,8 @@ export default class Interpreter {
     params: any[];
     resourceHandler: ResourceHandler;
     debugger: Debugger;
+    context: OperationContext | null;
     constructor(options: InterpreterOptions);
     digest(): Promise<any>;
+    exit(): void;
 }

package/dist/interpreter.js

@@ -17,6 +17,7 @@ var Interpreter = /** @class */ (function () {
         me.debugger = options.debugger || new context_1.Debugger();
         me.api = options.api || new Map();
         me.params = options.params || [];
+        me.context = null;
         if (options.target) {
             me.target = options.target;
             me.code = me.resourceHandler.get(options.target);
@@ -44,12 +45,20 @@ var Interpreter = /** @class */ (function () {
         });
         mainContext.extend(me.api);
         mainContext.scope.refs.set('params', (0, typer_1.cast)(me.params));
+        me.context = mainContext;
         return topOperation.run(mainContext)
             .catch(function (err) {
             console.error(err);
             throw err;
         });
     };
+    Interpreter.prototype.exit = function () {
+        var me = this;
+        if (me.context == null) {
+            throw new Error('Unexpected exit signal.');
+        }
+        me.context.processState.exit = true;
+    };
     return Interpreter;
 }());
 exports.default = Interpreter;

package/dist/operations/body.js

@@ -117,7 +117,7 @@ var BodyOperation = /** @class */ (function (_super) {
                         _d.sent();
                         _d.label = 8;
                     case 8:
-                        if (isEOL())
+                        if (isEOL() || operationContext.processState.exit)
                             return [3 /*break*/, 10];
                         _d.label = 9;
                     case 9:

package/dist/typer.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -84,12 +73,19 @@ var cast = function (value) {
             value = value.map(exports.cast);
             return new list_1.default(value);
         }
-        value = Object.entries(value).reduce(function (result, _a) {
-            var _b;
-            var _c = __read(_a, 2), key = _c[0], item = _c[1];
-            return __assign(__assign({}, result), (_b = {}, _b[key] = (0, exports.cast)(item), _b));
-        }, {});
-        return new map_1.default(value);
+        var result_1 = new Map();
+        if (value instanceof Map) {
+            value.forEach(function (item, key) {
+                result_1.set(key, (0, exports.cast)(item));
+            });
+        }
+        else {
+            Object.entries(value).forEach(function (_a) {
+                var _b = __read(_a, 2), key = _b[0], item = _b[1];
+                result_1.set(key, (0, exports.cast)(item));
+            });
+        }
+        return new map_1.default(result_1);
     }
     else if (type === 'function') {
         return value;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.1.2",
+    "version": "0.1.6",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",

package/test.src

@@ -1,5 +0,0 @@
-test = "hallo"
-
-import_code("/some/file":"./testA")
-
-print("xxx")

package/test.ts

@@ -1,62 +0,0 @@
-// @ts-nocheck
-
-import { Interpreter, Debugger, OperationContext, Operation, Expression } from './src';
-
-const path = require('path');
-const readline = require('readline');
-
-const api = {
-	print: function(customValue) {
-		console.log(customValue.valueOf());
-	}
-};
-
-class TestDebugger extends Debugger {
-	debug(...args) {
-		console.warn(...args);
-	}
-
-	interact(operationContext: OperationContext, item: Operation | Expression) {
-		const me = this;
-		const ask = () => {
-			const rl = readline.createInterface({
-				input: process.stdin,
-				output: process.stdout
-			});
-
-			rl.question(`Line: ${item.ast.line} - next, exit or execute code\n> `, function (value) {
-				setImmediate(async () => {
-					rl.close();
-
-					if (value == 'next') {
-						me.next();
-						return;
-					} else if (value == 'exit') {
-						me.setBreakpoint(false);
-						return;
-					}
-
-					await me.run(value);
-					ask();
-				});
-			});
-		}
-
-		me.lastContext = operationContext;
-		ask();
-	}
-}
-
-const interpreter = new Interpreter({
-	target: path.resolve(__dirname, 'test.src'),
-	api,
-	debugger: new TestDebugger()
-});
-
-(async function() {
-	try {
-		await interpreter.digest();
-	} catch (err) {
-		console.error(err);
-	}
-})();

package/testA.src

@@ -1,4 +0,0 @@
-debugger
-foo = "mooo"
-print("adadad")
-print(foo)