greybel-interpreter 4.0.13 → 4.0.15

package/dist/bytecode-generator.js

@@ -375,7 +375,7 @@ class BytecodeGenerator {
                 yield this.processSubNode(node.index);
                 this.push({
                     op: instruction_1.OpCode.GET_SUPER_PROPERTY,
-                    source: this.getSourceLocation(base),
+                    source: this.getSourceLocation(node.index),
                     invoke: isInvoke
                 });
             }
@@ -898,7 +898,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_SUPER_PROPERTY,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(node.base),
                         length: node.arguments.length
                     });
                 }
@@ -912,7 +912,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_WITH_CONTEXT,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(left.identifier),
                         length: node.arguments.length
                     });
                 }
@@ -924,7 +924,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_SUPER_PROPERTY,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(left.index),
                         length: node.arguments.length
                     });
                 }
@@ -934,7 +934,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_WITH_CONTEXT,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(left.index),
                         length: node.arguments.length
                     });
                 }
@@ -944,7 +944,7 @@ class BytecodeGenerator {
                 yield pushArgs();
                 this.push({
                     op: instruction_1.OpCode.CALL,
-                    source: this.getSourceLocation(node),
+                    source: this.getSourceLocation(left),
                     length: node.arguments.length
                 });
             }
@@ -953,7 +953,7 @@ class BytecodeGenerator {
                 yield pushArgs();
                 this.push({
                     op: instruction_1.OpCode.CALL,
-                    source: this.getSourceLocation(node),
+                    source: this.getSourceLocation(left),
                     length: node.arguments.length
                 });
             }

package/dist/context.js

@@ -137,7 +137,7 @@ class OperationContext {
             this.set(new string_1.CustomString('super'), this.super);
     }
     getCurrentInstruction() {
-        return this.code[this.ip - 1];
+        return this.code[this.ip];
     }
     fork(options) {
         return new OperationContext({

package/dist/utils/error.d.ts

@@ -1,6 +1,9 @@
 import { ASTRange } from 'miniscript-core';
 import { Instruction } from '../byte-compiler/instruction';
 interface RuntimeVM {
+    getFrame(): {
+        getCurrentInstruction: () => Instruction;
+    };
     getStacktrace?: () => Instruction[];
     target: string;
 }

package/dist/utils/error.js

@@ -5,7 +5,7 @@ class RuntimeError extends Error {
     constructor(message, vm, source) {
         var _a;
         super(message);
-        this.target = vm === null || vm === void 0 ? void 0 : vm.target;
+        this.target = vm === null || vm === void 0 ? void 0 : vm.getFrame().getCurrentInstruction().source.path;
         this.stackTrace = (_a = vm === null || vm === void 0 ? void 0 : vm.getStacktrace()) !== null && _a !== void 0 ? _a : [];
         this.stack = this.createTrace();
         this.source = source;

package/dist/vm/evaluation.js

@@ -305,7 +305,7 @@ function evalNotEqual(a, b) {
     else if (a instanceof nil_1.CustomNil) {
         return new boolean_1.CustomBoolean(!(b instanceof nil_1.CustomNil));
     }
-    return default_1.DefaultType.False;
+    return default_1.DefaultType.True;
 }
 exports.evalNotEqual = evalNotEqual;
 function evalMod(a, b) {

package/dist/vm.js

@@ -144,6 +144,7 @@ class VM {
         return this.stack[--this.sp];
     }
     createFrame(options) {
+        this.getFrame().ip--;
         const ctx = this.getFrame().fork({
             code: options.code,
             type: context_1.ContextType.Function,
@@ -155,7 +156,9 @@ class VM {
         return ctx;
     }
     popFrame() {
-        return this.frames.pop();
+        const frame = this.frames.pop();
+        this.getFrame().ip++;
+        return frame;
     }
     exec() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -176,7 +179,7 @@ class VM {
                 const instruction = frame.code[frame.ip++];
                 switch (instruction.op) {
                     case instruction_1.OpCode.NOOP: {
-                        continue;
+                        break;
                     }
                     case instruction_1.OpCode.PUSH: {
                         const pushInstruction = instruction;

package/package.json

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