greybel-interpreter 0.6.6 → 0.7.0

package/dist/cps.js

@@ -243,6 +243,7 @@ var CPSMap = function (visit, context) {
         'FeatureEnvarExpression': function (_item) {
             throw new Error('Not supported');
         },
+        'InvalidCodeExpression': function (_item) { },
         'IfShortcutStatement': function (item) {
             return __awaiter(this, void 0, void 0, function () {
                 var op, _a, _b, clausesItem, _c, _d, e_4_1;
@@ -685,7 +686,9 @@ var CPSMap = function (visit, context) {
                         case 2:
                             code = _a.sent();
                             context.currentTarget = target;
-                            chunk = new import_1.default(item, target, code).prepare(visit);
+                            return [4 /*yield*/, (new import_1.default(item, target, code).prepare(visit))];
+                        case 3:
+                            chunk = _a.sent();
                             context.currentTarget = context.target;
                             return [2 /*return*/, chunk];
                     }
@@ -708,7 +711,9 @@ var CPSMap = function (visit, context) {
                         case 2:
                             code = _a.sent();
                             context.currentTarget = target;
-                            chunk = new include_1.default(item, target, code).prepare(visit);
+                            return [4 /*yield*/, (new include_1.default(item, target, code).prepare(visit))];
+                        case 3:
+                            chunk = _a.sent();
                             context.currentTarget = context.target;
                             return [2 /*return*/, chunk];
                     }
@@ -731,7 +736,9 @@ var CPSMap = function (visit, context) {
                         case 2:
                             code = _a.sent();
                             context.currentTarget = target;
-                            chunk = new include_1.default(item, target, code).prepare(visit);
+                            return [4 /*yield*/, (new include_1.default(item, target, code).prepare(visit))];
+                        case 3:
+                            chunk = _a.sent();
                             context.currentTarget = context.target;
                             return [2 /*return*/, chunk];
                     }
@@ -842,12 +849,12 @@ var CPS = /** @class */ (function () {
                             return [2 /*return*/, ''];
                         if (o.type == null) {
                             console.error('Error ast type:', o);
-                            throw new Error('Unexpected as type');
+                            throw new Error("Current CPS iteration item does not have a type.");
                         }
                         fn = me.cpsMap[o.type];
                         if (fn == null) {
                             console.error('Error ast:', o);
-                            throw new Error('Type does not exist ' + o.type);
+                            throw new Error("".concat(o.type, " is not a supported AST type."));
                         }
                         return [4 /*yield*/, fn.call(me, o)];
                     case 1:

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

@@ -1,15 +1,11 @@
 import { CustomObjectType, Callable } from '../types/custom-type';
-export interface CustomMapIterableItem {
-    key: string;
-    value: any;
-}
-export declare class CustomMapIterator implements Iterator<CustomMapIterableItem> {
-    value: any;
+export declare class CustomMapIterator implements Iterator<CustomMap> {
+    value: Map<string, any>;
     index: number;
-    constructor(value: any);
-    next(): IteratorResult<CustomMapIterableItem>;
+    constructor(value: Map<string, any>);
+    next(): IteratorResult<CustomMap>;
 }
-export default class CustomMap extends CustomObjectType implements Iterable<CustomMapIterableItem> {
+export default class CustomMap extends CustomObjectType implements Iterable<CustomMap> {
     static intrinsics: Map<string, Function>;
     value: Map<string, any>;
     isInstance: boolean;

package/dist/custom-types/map.js

@@ -44,6 +44,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomMapIterator = void 0;
+var nil_1 = __importDefault(require("./nil"));
 var custom_type_1 = require("../types/custom-type");
 var operation_1 = require("../types/operation");
 var string_1 = __importDefault(require("./string"));
@@ -55,19 +56,19 @@ var CustomMapIterator = /** @class */ (function () {
     }
     CustomMapIterator.prototype.next = function () {
         var me = this;
-        var keys = Object.keys(me.value);
+        var keys = Array.from(me.value.keys());
         if (me.index === keys.length) {
             return {
-                value: null,
+                value: new nil_1.default(),
                 done: true
             };
         }
         var key = keys[me.index++];
         return {
-            value: {
-                key: key,
-                value: me.value[key]
-            },
+            value: new CustomMap(new Map([
+                ['key', new string_1.default(key)],
+                ['value', me.value.get(key)]
+            ])),
             done: false
         };
     };

package/dist/expressions/call.js

@@ -150,21 +150,22 @@ var CallExpression = /** @class */ (function (_super) {
             state: context_1.ContextState.TEMPORARY
         });
         var evaluate = function (node) {
+            var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var args, pathExpr, callable_1, _a, callable, _b;
-                var _c, _d;
-                return __generator(this, function (_e) {
-                    switch (_e.label) {
+                var args, pathExpr, callable_1, _b, callable, _c;
+                var _d, _e;
+                return __generator(this, function (_f) {
+                    switch (_f.label) {
                         case 0:
                             if (node instanceof expression_1.Expression) {
                                 return [2 /*return*/, node.get(opc)];
                             }
                             return [4 /*yield*/, node.resolveArgs(operationContext)];
                         case 1:
-                            args = _e.sent();
+                            args = _f.sent();
                             return [4 /*yield*/, node.path.get(opc, me.expr)];
                         case 2:
-                            pathExpr = _e.sent();
+                            pathExpr = _f.sent();
                             operationContext.debugger.debug('Line', me.ast.start.line, 'CallExpression', 'pathExpr', pathExpr);
                             if (!pathExpr.handle) return [3 /*break*/, 7];
                             if (!((0, typer_1.isCustomMap)(pathExpr.handle) ||
@@ -172,29 +173,29 @@ var CallExpression = /** @class */ (function (_super) {
                                 (0, typer_1.isCustomString)(pathExpr.handle))) return [3 /*break*/, 6];
                             return [4 /*yield*/, pathExpr.handle.getCallable(pathExpr.path)];
                         case 3:
-                            callable_1 = _e.sent();
+                            callable_1 = _f.sent();
                             if (!(callable_1.origin instanceof operation_1.Operation)) return [3 /*break*/, 4];
                             opc.setMemory('args', args);
                             return [2 /*return*/, callable_1.origin.run(opc)];
                         case 4:
                             if (!(callable_1.origin instanceof Function)) return [3 /*break*/, 6];
-                            _a = typer_1.cast;
-                            return [4 /*yield*/, (_c = callable_1.origin).call.apply(_c, __spreadArray([pathExpr.handle], __read(args), false))];
-                        case 5: return [2 /*return*/, _a.apply(void 0, [_e.sent()])];
+                            _b = typer_1.cast;
+                            return [4 /*yield*/, (_d = callable_1.origin).call.apply(_d, __spreadArray([pathExpr.handle], __read(args), false))];
+                        case 5: return [2 /*return*/, _b.apply(void 0, [_f.sent()])];
                         case 6:
-                            operationContext.debugger.raise('Unexpected handle call', me, pathExpr);
-                            _e.label = 7;
+                            operationContext.debugger.raise("Cannot call ".concat((_a = pathExpr.path) === null || _a === void 0 ? void 0 : _a.join('.'), ". Doesn't seem to be a function."), me, pathExpr);
+                            _f.label = 7;
                         case 7: return [4 /*yield*/, opc.getCallable(pathExpr.path)];
                         case 8:
-                            callable = _e.sent();
+                            callable = _f.sent();
                             opc.setMemory('args', args);
                             if (!(callable.origin instanceof operation_1.Operation)) return [3 /*break*/, 9];
                             return [2 /*return*/, callable.origin.run(opc)];
                         case 9:
                             if (!(callable.origin instanceof Function)) return [3 /*break*/, 11];
-                            _b = typer_1.cast;
-                            return [4 /*yield*/, (_d = callable.origin).call.apply(_d, __spreadArray([callable.context], __read(args), false))];
-                        case 10: return [2 /*return*/, _b.apply(void 0, [_e.sent()])];
+                            _c = typer_1.cast;
+                            return [4 /*yield*/, (_e = callable.origin).call.apply(_e, __spreadArray([callable.context], __read(args), false))];
+                        case 10: return [2 /*return*/, _c.apply(void 0, [_f.sent()])];
                         case 11: return [2 /*return*/, (0, typer_1.cast)(callable.origin)];
                     }
                 });

package/dist/expressions/list.js

@@ -56,6 +56,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressionSegment = void 0;
 var expression_1 = require("../types/expression");
+var operation_1 = require("../types/operation");
 var list_1 = __importDefault(require("../custom-types/list"));
 var typer_1 = require("../typer");
 var ExpressionSegment = /** @class */ (function () {
@@ -98,30 +99,37 @@ var ListExpression = /** @class */ (function (_super) {
         var me = this;
         var evaluate = function (node) {
             return __awaiter(this, void 0, void 0, function () {
-                var traverselPath, list, current, _a, _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var traverselPath, list, current, _a, _b, _c, _d;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
                         case 0:
                             traverselPath = [].concat(node);
                             list = [];
-                            _c.label = 1;
+                            _e.label = 1;
                         case 1:
-                            if (!(current = traverselPath.shift())) return [3 /*break*/, 6];
+                            if (!(current = traverselPath.shift())) return [3 /*break*/, 8];
                             if (!(0, typer_1.isCustomValue)(current)) return [3 /*break*/, 2];
                             list.push(current);
-                            return [3 /*break*/, 5];
+                            return [3 /*break*/, 7];
                         case 2:
                             if (!(current instanceof expression_1.Expression)) return [3 /*break*/, 4];
                             _b = (_a = list).push;
                             return [4 /*yield*/, current.get(operationContext)];
                         case 3:
-                            _b.apply(_a, [_c.sent()]);
-                            return [3 /*break*/, 5];
+                            _b.apply(_a, [_e.sent()]);
+                            return [3 /*break*/, 7];
                         case 4:
-                            operationContext.debugger.raise('Unexpected handle', me, current);
-                            _c.label = 5;
-                        case 5: return [3 /*break*/, 1];
-                        case 6: return [2 /*return*/, new list_1.default(list)];
+                            if (!(current.value instanceof operation_1.Operation)) return [3 /*break*/, 6];
+                            _d = (_c = list).push;
+                            return [4 /*yield*/, current.value.get(operationContext)];
+                        case 5:
+                            _d.apply(_c, [_e.sent()]);
+                            return [3 /*break*/, 7];
+                        case 6:
+                            operationContext.debugger.raise('Unexpected value in list.', me, current.value);
+                            _e.label = 7;
+                        case 7: return [3 /*break*/, 1];
+                        case 8: return [2 /*return*/, new list_1.default(list)];
                     }
                 });
             });

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

@@ -167,7 +167,7 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                                         if (!(node instanceof LogicalAndBinaryExpression)) return [3 /*break*/, 8];
                                         expr = node.expr;
                                         if (!exports.OPERATIONS[expr.operator]) {
-                                            operationContext.debugger.raise('Unexpected expression type', me, expr);
+                                            operationContext.debugger.raise("Unexpected operator in condition. ".concat(expr.operator, " is not supported."), me, expr);
                                         }
                                         _a = expr.type;
                                         switch (_a) {

package/dist/expressions/map.js

@@ -164,7 +164,7 @@ var MapExpression = /** @class */ (function (_super) {
                             value = _b.sent();
                             return [3 /*break*/, 8];
                         case 7:
-                            operationContext.debugger.raise('Unexpected value', me, current.value);
+                            operationContext.debugger.raise('Unexpected value in map.', me, current.value);
                             _b.label = 8;
                         case 8:
                             // @ts-ignore: Key is always a literal

package/dist/expressions/path.js

@@ -190,10 +190,11 @@ var PathExpression = /** @class */ (function (_super) {
         });
     };
     PathExpression.prototype.get = function (operationContext, parentExpr) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var me, evaluate, resultExpr, context, value_1, _a, value, callable, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var me, evaluate, resultExpr, context, value_1, _b, value, callable, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         me = this;
                         evaluate = function (node) {
@@ -231,7 +232,7 @@ var PathExpression = /** @class */ (function (_super) {
                                                 handle = functionContext.context;
                                             }
                                             else {
-                                                operationContext.debugger.raise('Unexpected self', me, current);
+                                                operationContext.debugger.raise('Unexpected self. Function does not appear to be bound to any context.', me, current);
                                             }
                                             return [3 /*break*/, 11];
                                         case 7:
@@ -267,7 +268,7 @@ var PathExpression = /** @class */ (function (_super) {
                                             traversedPath.push(value.toString());
                                             return [3 /*break*/, 16];
                                         case 15:
-                                            operationContext.debugger.raise('Unexpected index', me, current);
+                                            operationContext.debugger.raise("Unexpected index with value ".concat(current === null || current === void 0 ? void 0 : current.toString(), " in path ").concat(traversedPath === null || traversedPath === void 0 ? void 0 : traversedPath.join('.'), " found."), me, current);
                                             _b.label = 16;
                                         case 16:
                                             if (!(handle && !parentExpr)) return [3 /*break*/, 18];
@@ -290,7 +291,7 @@ var PathExpression = /** @class */ (function (_super) {
                                             _b.label = 21;
                                         case 21:
                                             if (!(0, typer_1.isCustomList)(handle) && !(0, typer_1.isCustomString)(handle)) {
-                                                operationContext.debugger.raise('Invalid type for slice', me, handle);
+                                                operationContext.debugger.raise("Unexpected slice attempt. ".concat(handle === null || handle === void 0 ? void 0 : handle.toString(), " does not seem to support slicing."), me, handle);
                                             }
                                             left = current.left;
                                             if (!(0, typer_1.isCustomValue)(left)) return [3 /*break*/, 22];
@@ -317,7 +318,7 @@ var PathExpression = /** @class */ (function (_super) {
                                             handle = handle.slice(left, right);
                                             return [3 /*break*/, 29];
                                         case 28:
-                                            operationContext.debugger.raise('Unexpected handle', me, current);
+                                            operationContext.debugger.raise("Unexpected object in ".concat(traversedPath === null || traversedPath === void 0 ? void 0 : traversedPath.join('.'), ". Doesn't seem to be a function."), me, current);
                                             _b.label = 29;
                                         case 29:
                                             position++;
@@ -333,7 +334,7 @@ var PathExpression = /** @class */ (function (_super) {
                         operationContext.debugger.debug('Line', me.ast.start.line, 'PathExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1:
-                        resultExpr = _c.sent();
+                        resultExpr = _d.sent();
                         if (!!parentExpr) return [3 /*break*/, 14];
                         if (!resultExpr.handle) return [3 /*break*/, 8];
                         if (!(resultExpr.path.length === 0)) return [3 /*break*/, 2];
@@ -345,33 +346,33 @@ var PathExpression = /** @class */ (function (_super) {
                         context = resultExpr.handle;
                         return [4 /*yield*/, context.get(resultExpr.path)];
                     case 3:
-                        value_1 = _c.sent();
+                        value_1 = _d.sent();
                         if (!(value_1 instanceof operation_1.Operation)) return [3 /*break*/, 4];
                         return [2 /*return*/, value_1.run(operationContext)];
                     case 4:
                         if (!(value_1 instanceof Function)) return [3 /*break*/, 6];
-                        _a = typer_1.cast;
+                        _b = typer_1.cast;
                         return [4 /*yield*/, value_1.call(context)];
-                    case 5: return [2 /*return*/, _a.apply(void 0, [_c.sent()])];
+                    case 5: return [2 /*return*/, _b.apply(void 0, [_d.sent()])];
                     case 6: return [2 /*return*/, value_1];
                     case 7:
-                        operationContext.debugger.raise('Unexpected handle get', me, resultExpr);
-                        _c.label = 8;
+                        operationContext.debugger.raise("Cannot call ".concat((_a = resultExpr.path) === null || _a === void 0 ? void 0 : _a.join('.'), ". Doesn't seem to be a function."), me, resultExpr);
+                        _d.label = 8;
                     case 8: return [4 /*yield*/, operationContext.get(resultExpr.path)];
                     case 9:
-                        value = _c.sent();
+                        value = _d.sent();
                         if (!(value instanceof Function)) return [3 /*break*/, 12];
                         return [4 /*yield*/, operationContext.getCallable(resultExpr.path)];
                     case 10:
-                        callable = _c.sent();
-                        _b = typer_1.cast;
+                        callable = _d.sent();
+                        _c = typer_1.cast;
                         return [4 /*yield*/, callable.origin.call(callable.context)];
-                    case 11: return [2 /*return*/, _b.apply(void 0, [_c.sent()])];
+                    case 11: return [2 /*return*/, _c.apply(void 0, [_d.sent()])];
                     case 12:
                         if (value instanceof operation_1.Operation) {
                             return [2 /*return*/, value.run(operationContext)];
                         }
-                        _c.label = 13;
+                        _d.label = 13;
                     case 13: return [2 /*return*/, value];
                     case 14: return [2 /*return*/, resultExpr];
                 }

package/dist/operations/for.js

@@ -116,7 +116,7 @@ var ForOperation = /** @class */ (function (_super) {
                         _b.sent();
                         if (loopContext.isContinue)
                             return [3 /*break*/, 7];
-                        if (loopContext.isBreak)
+                        if (loopContext.isBreak || operationContext.isExit())
                             return [3 /*break*/, 8];
                         _b.label = 7;
                     case 7:

package/dist/operations/function.d.ts

@@ -8,10 +8,12 @@ export interface FunctionOperationOptions {
     body: BodyOperation;
 }
 export default class FunctionOperation extends FunctionOperationBase {
+    static incrementalId: number;
     args: ArgumentOperation;
     body: BodyOperation;
     context: any;
-    id: string;
+    id: number;
+    static generateId(): number;
     constructor(ast: ASTBase, options: FunctionOperationOptions);
     getType(): string;
     fork(context: any): FunctionOperation;

package/dist/operations/function.js

@@ -52,7 +52,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var operation_1 = require("../types/operation");
-var uuid_1 = require("uuid");
 var context_1 = require("../context");
 var typer_1 = require("../typer");
 var FunctionOperation = /** @class */ (function (_super) {
@@ -61,12 +60,15 @@ var FunctionOperation = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         var me = _this;
         me.ast = ast;
-        me.id = (0, uuid_1.v4)();
+        me.id = FunctionOperation.generateId();
         me.args = options.args;
         me.body = options.body;
         me.context = null;
         return _this;
     }
+    FunctionOperation.generateId = function () {
+        return FunctionOperation.incrementalId++;
+    };
     FunctionOperation.prototype.getType = function () {
         return 'function';
     };
@@ -137,6 +139,7 @@ var FunctionOperation = /** @class */ (function (_super) {
             });
         });
     };
+    FunctionOperation.incrementalId = 0;
     return FunctionOperation;
 }(operation_1.FunctionOperationBase));
 exports.default = FunctionOperation;

package/dist/operations/if-statement.js

@@ -122,7 +122,7 @@ var IfStatementOperation = /** @class */ (function (_super) {
                                             }
                                             _a.label = 5;
                                         case 5:
-                                            operationContext.debugger.raise('Unexpected condition', me, item);
+                                            operationContext.debugger.raise("Unexpected object in condition ".concat(item === null || item === void 0 ? void 0 : item.toString(), "."), me, item);
                                             return [2 /*return*/];
                                     }
                                 });
@@ -143,7 +143,7 @@ var IfStatementOperation = /** @class */ (function (_super) {
                         _b.sent();
                         return [3 /*break*/, 10];
                     case 8:
-                        operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
+                        operationContext.debugger.raise("Unexpected operation in if statement ".concat(clause === null || clause === void 0 ? void 0 : clause.toString(), "."), me, clause);
                         _b.label = 9;
                     case 9:
                         clauses_1_1 = clauses_1.next();

package/dist/operations/new.js

@@ -64,10 +64,11 @@ var NewOperation = /** @class */ (function (_super) {
         return _this;
     }
     NewOperation.prototype.get = function (operationContext) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var me, arg;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         me = this;
                         if (!(0, typer_1.isCustomValue)(me.arg)) return [3 /*break*/, 1];
@@ -77,14 +78,14 @@ var NewOperation = /** @class */ (function (_super) {
                         if (!(me.arg instanceof expression_1.Expression)) return [3 /*break*/, 3];
                         return [4 /*yield*/, me.arg.get(operationContext)];
                     case 2:
-                        arg = _a.sent();
+                        arg = _b.sent();
                         return [3 /*break*/, 4];
                     case 3:
-                        operationContext.debugger.raise('Unexpected reference', me, me.arg);
-                        _a.label = 4;
+                        operationContext.debugger.raise("Unexpected object used in new unary ".concat((_a = me.arg) === null || _a === void 0 ? void 0 : _a.toString(), "."), me, me.arg);
+                        _b.label = 4;
                     case 4:
                         if (!(0, typer_1.isCustomMap)(arg)) {
-                            operationContext.debugger.raise('Unexpected type for new operator', me, arg);
+                            operationContext.debugger.raise('Only maps can be initiated.', me, arg);
                         }
                         return [2 /*return*/, arg.createInstance()];
                 }

package/dist/operations/not.js

@@ -64,27 +64,28 @@ var NotOperation = /** @class */ (function (_super) {
         return _this;
     }
     NotOperation.prototype.get = function (operationContext) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var me, arg;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         me = this;
                         if (!(0, typer_1.isCustomValue)(me.arg)) return [3 /*break*/, 1];
                         arg = me.arg.toTruthy();
                         return [3 /*break*/, 4];
                     case 1:
-                        if (!(me.arg instanceof expression_1.Expression)) return [3 /*break*/, 3];
+                        if (!(me.arg instanceof expression_1.Expression || me.arg instanceof operation_1.Operation)) return [3 /*break*/, 3];
                         return [4 /*yield*/, me.arg.get(operationContext)];
                     case 2:
-                        arg = _a.sent();
+                        arg = _b.sent();
                         if ((0, typer_1.isCustomValue)(arg)) {
                             arg = arg.toTruthy();
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        operationContext.debugger.raise('Unexpected not operation', me, me.arg);
-                        _a.label = 4;
+                        operationContext.debugger.raise("Unexpected object used in not unary ".concat((_a = me.arg) === null || _a === void 0 ? void 0 : _a.toString(), "."), me, me.arg);
+                        _b.label = 4;
                     case 4: return [2 /*return*/, (0, typer_1.cast)(!arg)];
                 }
             });

package/dist/operations/reference.js

@@ -65,10 +65,11 @@ var ReferenceOperation = /** @class */ (function (_super) {
         return _this;
     }
     ReferenceOperation.prototype.get = function (operationContext) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var me, arg;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         me = this;
                         if (!(0, typer_1.isCustomValue)(me.arg)) return [3 /*break*/, 1];
@@ -77,11 +78,11 @@ var ReferenceOperation = /** @class */ (function (_super) {
                         if (!(me.arg instanceof expression_1.Expression)) return [3 /*break*/, 3];
                         return [4 /*yield*/, me.arg.get(operationContext, me)];
                     case 2:
-                        arg = _a.sent();
+                        arg = _c.sent();
                         return [3 /*break*/, 4];
                     case 3:
-                        operationContext.debugger.raise('Unexpected reference', me, me.arg);
-                        _a.label = 4;
+                        operationContext.debugger.raise("Unexpected reference ".concat((_a = me.arg) === null || _a === void 0 ? void 0 : _a.toString(), "."), me, me.arg);
+                        _c.label = 4;
                     case 4:
                         if ((0, typer_1.isCustomValue)(arg)) {
                             return [2 /*return*/, arg];
@@ -90,7 +91,7 @@ var ReferenceOperation = /** @class */ (function (_super) {
                             if (arg.handle instanceof custom_type_1.CustomObjectType) {
                                 return [2 /*return*/, arg.handle.get(arg.path)];
                             }
-                            operationContext.debugger.raise('Unexpected handle in reference statement', me, arg.handle);
+                            operationContext.debugger.raise("Unexpected object as reference ".concat((_b = arg.handle) === null || _b === void 0 ? void 0 : _b.toString(), "."), me, arg.handle);
                         }
                         return [2 /*return*/, operationContext.get(arg.path)];
                 }

package/dist/operations/while.js

@@ -120,7 +120,7 @@ var WhileOperation = /** @class */ (function (_super) {
                         _a.sent();
                         if (loopContext.isContinue)
                             return [3 /*break*/, 1];
-                        if (loopContext.isBreak)
+                        if (loopContext.isBreak || operationContext.isExit())
                             return [3 /*break*/, 4];
                         return [3 /*break*/, 1];
                     case 4: return [2 /*return*/];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.6.6",
+    "version": "0.7.0",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -35,8 +35,7 @@
     },
     "dependencies": {
         "greybel-core": "^0.2.5",
-        "greyscript-core": "^0.2.6",
-        "uuid": "^8.3.2"
+        "greyscript-core": "^0.2.6"
     },
     "keywords": [
         "greyscript",