greybel-interpreter 4.0.12 → 4.0.13

package/dist/bytecode-generator.d.ts

@@ -30,7 +30,7 @@ export declare class BytecodeGenerator {
     protected getInternalLocation(): SourceLocation;
     protected pushContext(): void;
     protected popContext(): BytecodeGeneratorContext;
-    protected getLastJumpoint(): [Instruction, Instruction];
+    protected getLastJumpPoint(): [Instruction, Instruction];
     protected pushJumppoint(start: Instruction, end: Instruction): void;
     protected popJumppoint(): [Instruction, Instruction];
     protected push(item: Instruction): void;

package/dist/bytecode-generator.js

@@ -98,8 +98,11 @@ class BytecodeGenerator {
     popContext() {
         return this.context.pop();
     }
-    getLastJumpoint() {
+    getLastJumpPoint() {
         const jumpPoints = this.context.peek().jumpPoints;
+        if (jumpPoints.length === 0) {
+            return null;
+        }
         return jumpPoints[jumpPoints.length - 1];
     }
     pushJumppoint(start, end) {
@@ -705,7 +708,10 @@ class BytecodeGenerator {
     }
     processBreak(node) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [_, end] = this.getLastJumpoint();
+            const jumpPoint = this.getLastJumpPoint();
+            if (jumpPoint === null)
+                return;
+            const [_, end] = jumpPoint;
             this.push({
                 op: instruction_1.OpCode.GOTO_A,
                 source: this.getSourceLocation(node),
@@ -715,7 +721,10 @@ class BytecodeGenerator {
     }
     processContinue(node) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [start] = this.getLastJumpoint();
+            const jumpPoint = this.getLastJumpPoint();
+            if (jumpPoint === null)
+                return;
+            const [start] = jumpPoint;
             this.push({
                 op: instruction_1.OpCode.GOTO_A,
                 source: this.getSourceLocation(node),
@@ -1001,6 +1010,7 @@ class BytecodeGenerator {
                 op: instruction_1.OpCode.POP_ITERATOR,
                 source: this.getSourceLocation(node.iterator)
             };
+            this.pushJumppoint(start, end);
             this.push({
                 op: instruction_1.OpCode.GET_LOCALS,
                 source: this.getSourceLocation(node)
@@ -1039,6 +1049,7 @@ class BytecodeGenerator {
                 goto: start
             });
             this.push(end);
+            this.popJumppoint();
         });
     }
     processEnvarExpression(node) {

package/package.json

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