greybel-interpreter 0.1.3 → 0.1.7

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/string.js

@@ -120,7 +120,7 @@ var CustomString = /** @class */ (function (_super) {
         return me.value.length === 0 ? null : me.value;
     };
     CustomString.prototype.toString = function () {
-        return "\"".concat(this.value.toString(), "\"");
+        return this.value;
     };
     CustomString.prototype.fork = function () {
         return new CustomString(this.value);

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/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.3",
+    "version": "0.1.7",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",