greybel-interpreter 4.0.6 → 4.0.8

package/dist/byte-compiler/instruction.d.ts

@@ -46,17 +46,19 @@ export declare enum OpCode {
     FUNCTION_DEFINITION = 40,
     GOTO_A = 41,
     GOTO_A_IF_FALSE = 42,
-    PUSH_ITERATOR = 43,
-    POP_ITERATOR = 44,
-    NEXT = 45,
-    BITWISE_OR = 46,
-    BITWISE_AND = 47,
-    BITWISE_LEFT_SHIFT = 48,
-    BITWISE_RIGHT_SHIFT = 49,
-    BITWISE_UNSIGNED_RIGHT_SHIFT = 50,
-    BREAKPOINT = 51,
-    BREAKPOINT_ENABLE = 52,
-    IMPORT = 53
+    GOTO_A_IF_FALSE_AND_PUSH = 43,
+    GOTO_A_IF_TRUE_AND_PUSH = 44,
+    PUSH_ITERATOR = 45,
+    POP_ITERATOR = 46,
+    NEXT = 47,
+    BITWISE_OR = 48,
+    BITWISE_AND = 49,
+    BITWISE_LEFT_SHIFT = 50,
+    BITWISE_RIGHT_SHIFT = 51,
+    BITWISE_UNSIGNED_RIGHT_SHIFT = 52,
+    BREAKPOINT = 53,
+    BREAKPOINT_ENABLE = 54,
+    IMPORT = 55
 }
 export interface FunctionDefinitionInstructionArgument {
     name: CustomString;
@@ -108,7 +110,7 @@ export interface FunctionDefinitionInstruction extends BaseInstruction {
     ignoreOuter: boolean;
 }
 export interface GotoAInstruction extends BaseInstruction {
-    op: OpCode.GOTO_A | OpCode.GOTO_A_IF_FALSE;
+    op: OpCode.GOTO_A | OpCode.GOTO_A_IF_FALSE | OpCode.GOTO_A_IF_FALSE_AND_PUSH | OpCode.GOTO_A_IF_TRUE_AND_PUSH;
     goto: Instruction;
 }
 export interface NextInstruction extends BaseInstruction {

package/dist/byte-compiler/instruction.js

@@ -46,15 +46,17 @@ var OpCode;
     OpCode[OpCode["FUNCTION_DEFINITION"] = 40] = "FUNCTION_DEFINITION";
     OpCode[OpCode["GOTO_A"] = 41] = "GOTO_A";
     OpCode[OpCode["GOTO_A_IF_FALSE"] = 42] = "GOTO_A_IF_FALSE";
-    OpCode[OpCode["PUSH_ITERATOR"] = 43] = "PUSH_ITERATOR";
-    OpCode[OpCode["POP_ITERATOR"] = 44] = "POP_ITERATOR";
-    OpCode[OpCode["NEXT"] = 45] = "NEXT";
-    OpCode[OpCode["BITWISE_OR"] = 46] = "BITWISE_OR";
-    OpCode[OpCode["BITWISE_AND"] = 47] = "BITWISE_AND";
-    OpCode[OpCode["BITWISE_LEFT_SHIFT"] = 48] = "BITWISE_LEFT_SHIFT";
-    OpCode[OpCode["BITWISE_RIGHT_SHIFT"] = 49] = "BITWISE_RIGHT_SHIFT";
-    OpCode[OpCode["BITWISE_UNSIGNED_RIGHT_SHIFT"] = 50] = "BITWISE_UNSIGNED_RIGHT_SHIFT";
-    OpCode[OpCode["BREAKPOINT"] = 51] = "BREAKPOINT";
-    OpCode[OpCode["BREAKPOINT_ENABLE"] = 52] = "BREAKPOINT_ENABLE";
-    OpCode[OpCode["IMPORT"] = 53] = "IMPORT";
+    OpCode[OpCode["GOTO_A_IF_FALSE_AND_PUSH"] = 43] = "GOTO_A_IF_FALSE_AND_PUSH";
+    OpCode[OpCode["GOTO_A_IF_TRUE_AND_PUSH"] = 44] = "GOTO_A_IF_TRUE_AND_PUSH";
+    OpCode[OpCode["PUSH_ITERATOR"] = 45] = "PUSH_ITERATOR";
+    OpCode[OpCode["POP_ITERATOR"] = 46] = "POP_ITERATOR";
+    OpCode[OpCode["NEXT"] = 47] = "NEXT";
+    OpCode[OpCode["BITWISE_OR"] = 48] = "BITWISE_OR";
+    OpCode[OpCode["BITWISE_AND"] = 49] = "BITWISE_AND";
+    OpCode[OpCode["BITWISE_LEFT_SHIFT"] = 50] = "BITWISE_LEFT_SHIFT";
+    OpCode[OpCode["BITWISE_RIGHT_SHIFT"] = 51] = "BITWISE_RIGHT_SHIFT";
+    OpCode[OpCode["BITWISE_UNSIGNED_RIGHT_SHIFT"] = 52] = "BITWISE_UNSIGNED_RIGHT_SHIFT";
+    OpCode[OpCode["BREAKPOINT"] = 53] = "BREAKPOINT";
+    OpCode[OpCode["BREAKPOINT_ENABLE"] = 54] = "BREAKPOINT_ENABLE";
+    OpCode[OpCode["IMPORT"] = 55] = "IMPORT";
 })(OpCode = exports.OpCode || (exports.OpCode = {}));

package/dist/bytecode-generator.js

@@ -33,6 +33,12 @@ function generateCustomValueFromASTLiteral(node) {
             throw new Error('Unexpected literal type.');
     }
 }
+function unwrap(node) {
+    while (node instanceof miniscript_core_1.ASTParenthesisExpression) {
+        node = node.expression;
+    }
+    return node;
+}
 class BytecodeGenerator {
     constructor(options) {
         var _a;
@@ -333,7 +339,8 @@ class BytecodeGenerator {
     }
     processMemberExpression(node, isInvoke = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (node.base instanceof miniscript_core_1.ASTIdentifier && node.base.name === 'super') {
+            const base = unwrap(node.base);
+            if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
                 this.push({
                     op: instruction_1.OpCode.PUSH,
                     source: this.getSourceLocation(node.identifier),
@@ -346,7 +353,7 @@ class BytecodeGenerator {
                 });
             }
             else {
-                yield this.processSubNode(node.base);
+                yield this.processSubNode(base);
                 if (node.identifier instanceof miniscript_core_1.ASTIdentifier) {
                     yield this.processIdentifier(node.identifier, false, isInvoke);
                 }
@@ -358,16 +365,17 @@ class BytecodeGenerator {
     }
     processIndexExpression(node, isInvoke = true) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (node.base instanceof miniscript_core_1.ASTIdentifier && node.base.name === 'super') {
+            const base = unwrap(node.base);
+            if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
                 yield this.processSubNode(node.index);
                 this.push({
                     op: instruction_1.OpCode.GET_SUPER_PROPERTY,
-                    source: this.getSourceLocation(node),
+                    source: this.getSourceLocation(base),
                     invoke: isInvoke
                 });
             }
             else {
-                yield this.processSubNode(node.base);
+                yield this.processSubNode(base);
                 yield this.processSubNode(node.index);
                 this.push({
                     op: instruction_1.OpCode.GET_PROPERTY,
@@ -453,9 +461,9 @@ class BytecodeGenerator {
     }
     processAssignmentStatement(node) {
         return __awaiter(this, void 0, void 0, function* () {
-            let variable = node.variable;
+            let variable = unwrap(node.variable);
             if (variable instanceof miniscript_core_1.ASTUnaryExpression) {
-                variable = variable.argument;
+                variable = unwrap(variable.argument);
             }
             if (variable instanceof miniscript_core_1.ASTMemberExpression) {
                 yield this.processSubNode(variable.base);
@@ -507,7 +515,25 @@ class BytecodeGenerator {
     }
     processEvaluationExpression(node) {
         return __awaiter(this, void 0, void 0, function* () {
+            const skip = {
+                op: instruction_1.OpCode.NOOP,
+                source: this.getSourceLocation(node)
+            };
             yield this.processSubNode(node.left);
+            if (node.operator === miniscript_core_1.Operator.And) {
+                this.push({
+                    op: instruction_1.OpCode.GOTO_A_IF_FALSE_AND_PUSH,
+                    source: this.getSourceLocation(node),
+                    goto: skip
+                });
+            }
+            else if (node.operator === miniscript_core_1.Operator.Or) {
+                this.push({
+                    op: instruction_1.OpCode.GOTO_A_IF_TRUE_AND_PUSH,
+                    source: this.getSourceLocation(node),
+                    goto: skip
+                });
+            }
             yield this.processSubNode(node.right);
             switch (node.operator) {
                 case miniscript_core_1.Operator.Isa: {
@@ -564,6 +590,7 @@ class BytecodeGenerator {
                         op: instruction_1.OpCode.AND,
                         source: this.getSourceLocation(node)
                     });
+                    this.push(skip);
                     break;
                 }
                 case miniscript_core_1.Operator.Or: {
@@ -571,6 +598,7 @@ class BytecodeGenerator {
                         op: instruction_1.OpCode.OR,
                         source: this.getSourceLocation(node)
                     });
+                    this.push(skip);
                     break;
                 }
                 case miniscript_core_1.Operator.Plus: {
@@ -797,7 +825,7 @@ class BytecodeGenerator {
     }
     processUnaryExpression(node) {
         return __awaiter(this, void 0, void 0, function* () {
-            const arg = node.argument;
+            const arg = unwrap(node.argument);
             switch (node.operator) {
                 case miniscript_core_1.Operator.Reference:
                     if (arg instanceof miniscript_core_1.ASTMemberExpression) {
@@ -847,9 +875,10 @@ class BytecodeGenerator {
                     yield this.processSubNode(arg);
                 }
             });
-            const left = node.base;
+            const left = unwrap(node.base);
             if (left instanceof miniscript_core_1.ASTMemberExpression) {
-                if (left.base instanceof miniscript_core_1.ASTIdentifier && left.base.name === 'super') {
+                const base = unwrap(left.base);
+                if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
                     this.push({
                         op: instruction_1.OpCode.PUSH,
                         source: this.getSourceLocation(left.identifier),
@@ -863,7 +892,7 @@ class BytecodeGenerator {
                     });
                 }
                 else {
-                    yield this.processSubNode(left.base);
+                    yield this.processSubNode(base);
                     this.push({
                         op: instruction_1.OpCode.PUSH,
                         source: this.getSourceLocation(left.identifier),
@@ -878,7 +907,8 @@ class BytecodeGenerator {
                 }
             }
             else if (left instanceof miniscript_core_1.ASTIndexExpression) {
-                if (left.base instanceof miniscript_core_1.ASTIdentifier && left.base.name === 'super') {
+                const base = unwrap(left.base);
+                if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
                     yield this.processSubNode(left.index);
                     yield pushArgs();
                     this.push({
@@ -888,7 +918,7 @@ class BytecodeGenerator {
                     });
                 }
                 else {
-                    yield this.processSubNode(left.base);
+                    yield this.processSubNode(base);
                     yield this.processSubNode(left.index);
                     yield pushArgs();
                     this.push({

package/dist/interpreter.d.ts

@@ -20,7 +20,7 @@ export interface InterpreterOptions {
 }
 export interface InterpreterRunOptions {
     customCode?: string;
-    vmOptions?: VMOptions;
+    vmOptions?: Partial<VMOptions>;
 }
 export declare class Interpreter extends EventEmitter {
     target: string;

package/dist/vm/evaluation.d.ts

@@ -5,6 +5,7 @@ import { CustomMap } from '../types/map';
 import { CustomNil } from '../types/nil';
 import { CustomNumber } from '../types/number';
 import { CustomString } from '../types/string';
+export declare const absClamp01: (d: number) => number;
 export declare function evalAdd(a: CustomValue, b: CustomValue): CustomNil | CustomNumber | CustomString | CustomMap | CustomList;
 export declare function evalSub(a: CustomValue, b: CustomValue): CustomValue | CustomNumber;
 export declare function evalMul(a: CustomValue, b: CustomValue): CustomValue | CustomNumber;

package/dist/vm/evaluation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evalOr = exports.evalAnd = exports.evalPow = exports.evalMod = exports.evalNotEqual = exports.evalEqual = exports.evalGreaterThanOrEqual = exports.evalGreaterThan = exports.evalLessThanOrEqual = exports.evalLessThan = exports.evalBitwiseLeftShift = exports.evalBitwiseUnsignedRightShift = exports.evalBitwiseRightShift = exports.evalBitwiseAnd = exports.evalBitwiseOr = exports.evalDiv = exports.evalMul = exports.evalSub = exports.evalAdd = void 0;
+exports.evalOr = exports.evalAnd = exports.evalPow = exports.evalMod = exports.evalNotEqual = exports.evalEqual = exports.evalGreaterThanOrEqual = exports.evalGreaterThan = exports.evalLessThanOrEqual = exports.evalLessThan = exports.evalBitwiseLeftShift = exports.evalBitwiseUnsignedRightShift = exports.evalBitwiseRightShift = exports.evalBitwiseAnd = exports.evalBitwiseOr = exports.evalDiv = exports.evalMul = exports.evalSub = exports.evalAdd = exports.absClamp01 = void 0;
 const boolean_1 = require("../types/boolean");
 const default_1 = require("../types/default");
 const function_1 = require("../types/function");
@@ -17,6 +17,7 @@ const absClamp01 = (d) => {
         return 1;
     return d;
 };
+exports.absClamp01 = absClamp01;
 function evalAdd(a, b) {
     if (a instanceof string_1.CustomString || b instanceof string_1.CustomString) {
         if (a instanceof nil_1.CustomNil)
@@ -330,12 +331,12 @@ exports.evalPow = evalPow;
 function evalAnd(a, b) {
     const left = Number(a instanceof number_1.CustomNumber ? a.toNumber() : a.toTruthy());
     const right = Number(b instanceof number_1.CustomNumber ? b.toNumber() : b.toTruthy());
-    return new number_1.CustomNumber(absClamp01(left * right));
+    return new number_1.CustomNumber((0, exports.absClamp01)(left * right));
 }
 exports.evalAnd = evalAnd;
 function evalOr(a, b) {
     const left = Number(a instanceof number_1.CustomNumber ? a.toNumber() : a.toTruthy());
     const right = Number(b instanceof number_1.CustomNumber ? b.toNumber() : b.toTruthy());
-    return new number_1.CustomNumber(absClamp01(left + right - left * right));
+    return new number_1.CustomNumber((0, exports.absClamp01)(left + right - left * right));
 }
 exports.evalOr = evalOr;

package/dist/vm.js

@@ -367,6 +367,28 @@ class VM {
                         frame.ip = gotoAInstruction.goto.ip;
                         break;
                     }
+                    case instruction_1.OpCode.GOTO_A_IF_FALSE_AND_PUSH: {
+                        const condition = this.popStack();
+                        const value = condition instanceof number_1.CustomNumber ? (0, evaluation_1.absClamp01)(condition.value) : +condition.toTruthy();
+                        this.pushStack(new number_1.CustomNumber(value));
+                        if (value >= 1) {
+                            break;
+                        }
+                        const gotoAInstruction = instruction;
+                        frame.ip = gotoAInstruction.goto.ip;
+                        break;
+                    }
+                    case instruction_1.OpCode.GOTO_A_IF_TRUE_AND_PUSH: {
+                        const condition = this.popStack();
+                        const value = condition instanceof number_1.CustomNumber ? (0, evaluation_1.absClamp01)(condition.value) : +condition.toTruthy();
+                        this.pushStack(new number_1.CustomNumber(value));
+                        if (value < 1) {
+                            break;
+                        }
+                        const gotoAInstruction = instruction;
+                        frame.ip = gotoAInstruction.goto.ip;
+                        break;
+                    }
                     case instruction_1.OpCode.GOTO_A: {
                         const gotoAInstruction = instruction;
                         frame.ip = gotoAInstruction.goto.ip;

package/package.json

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