greybel-interpreter 5.0.1 → 5.0.3

package/dist/bytecode-generator/expression.js

@@ -327,13 +327,6 @@ class BytecodeExpressionGenerator {
                     if (item.init instanceof miniscript_core_1.ASTLiteral) {
                         defaultValue = (0, utils_1.generateCustomValueFromASTLiteral)(item.init);
                     }
-                    else if (item.init instanceof miniscript_core_1.ASTUnaryExpression &&
-                        item.init.argument instanceof miniscript_core_1.ASTLiteral) {
-                        defaultValue = (0, utils_1.generateCustomValueFromASTLiteral)(item.init.argument);
-                        if (item.init.operator === miniscript_core_1.Operator.Minus) {
-                            defaultValue = new number_1.CustomNumber(-defaultValue.toNumber());
-                        }
-                    }
                     args.push({
                         name: new string_1.CustomString(item.variable.name),
                         defaultValue

package/dist/bytecode-generator/utils.js

@@ -8,12 +8,20 @@ const number_1 = require("../types/number");
 const string_1 = require("../types/string");
 function generateCustomValueFromASTLiteral(node) {
     switch (node.type) {
-        case miniscript_core_1.ASTType.BooleanLiteral:
-            return new boolean_1.CustomBoolean(node.value);
+        case miniscript_core_1.ASTType.BooleanLiteral: {
+            const booleanLiteralNode = node;
+            return new boolean_1.CustomBoolean(booleanLiteralNode.negated
+                ? -booleanLiteralNode.value
+                : booleanLiteralNode.value);
+        }
         case miniscript_core_1.ASTType.StringLiteral:
             return new string_1.CustomString(node.value);
-        case miniscript_core_1.ASTType.NumericLiteral:
-            return new number_1.CustomNumber(node.value);
+        case miniscript_core_1.ASTType.NumericLiteral: {
+            const numericLiteralNode = node;
+            return new number_1.CustomNumber(numericLiteralNode.negated
+                ? -numericLiteralNode.value
+                : numericLiteralNode.value);
+        }
         case miniscript_core_1.ASTType.NilLiteral:
             return default_1.DefaultType.Void;
         default:

package/dist/types/boolean.d.ts

@@ -1,6 +1,6 @@
 import { CustomNumber } from './number';
 export declare class CustomBoolean extends CustomNumber {
-    constructor(value: boolean);
+    constructor(value: boolean | number);
     getCustomType(): string;
     toJSON(): string;
     toString(): string;

package/dist/vm/evaluation.js

@@ -212,9 +212,7 @@ function evalLessThan(a, b) {
         if (b instanceof number_1.CustomNumber)
             return new boolean_1.CustomBoolean(a.toNumber() < b.toNumber());
     }
-    else if (a instanceof string_1.CustomString) {
-        if (b instanceof nil_1.CustomNil)
-            b = new string_1.CustomString('');
+    else if (a instanceof string_1.CustomString && b instanceof string_1.CustomString) {
         return new boolean_1.CustomBoolean(a.toString() < b.toString());
     }
     return default_1.DefaultType.Void;
@@ -227,9 +225,7 @@ function evalLessThanOrEqual(a, b) {
         if (b instanceof number_1.CustomNumber)
             return new boolean_1.CustomBoolean(a.toNumber() <= b.toNumber());
     }
-    else if (a instanceof string_1.CustomString) {
-        if (b instanceof nil_1.CustomNil)
-            b = new string_1.CustomString('');
+    else if (a instanceof string_1.CustomString && b instanceof string_1.CustomString) {
         return new boolean_1.CustomBoolean(a.toString() <= b.toString());
     }
     return default_1.DefaultType.Void;
@@ -242,9 +238,7 @@ function evalGreaterThan(a, b) {
         if (b instanceof number_1.CustomNumber)
             return new boolean_1.CustomBoolean(a.toNumber() > b.toNumber());
     }
-    else if (a instanceof string_1.CustomString) {
-        if (b instanceof nil_1.CustomNil)
-            b = new string_1.CustomString('');
+    else if (a instanceof string_1.CustomString && b instanceof string_1.CustomString) {
         return new boolean_1.CustomBoolean(a.toString() > b.toString());
     }
     return default_1.DefaultType.Void;
@@ -258,8 +252,6 @@ function evalGreaterThanOrEqual(a, b) {
             return new boolean_1.CustomBoolean(a.toNumber() >= b.toNumber());
     }
     else if (a instanceof string_1.CustomString && b instanceof string_1.CustomString) {
-        if (b instanceof nil_1.CustomNil)
-            b = new string_1.CustomString('');
         return new boolean_1.CustomBoolean(a.toString() >= b.toString());
     }
     return default_1.DefaultType.Void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greybel-interpreter",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "description": "Interpreter",
   "main": "dist/index",
   "typings": "dist/index",
@@ -49,7 +49,7 @@
     "typescript": "^5.0.4"
   },
   "dependencies": {
-    "greybel-core": "~2.0.1",
+    "greybel-core": "~2.0.3",
     "hyperid": "^3.2.0",
     "non-blocking-schedule": "^0.1.0"
   },