greybel-interpreter 2.2.2 → 2.2.4

package/dist/interpreter.js

@@ -17,6 +17,7 @@ const cps_1 = require("./cps");
 const handler_container_1 = require("./handler-container");
 const noop_1 = require("./operations/noop");
 const default_1 = require("./types/default");
+const function_1 = require("./types/function");
 const list_1 = require("./types/list");
 const map_1 = require("./types/map");
 const number_1 = require("./types/number");
@@ -148,10 +149,12 @@ class Interpreter extends events_1.EventEmitter {
             const numberIntrinsics = map_1.CustomMap.createWithInitialValue(number_1.CustomNumber.intrinsics);
             const listIntrinsics = map_1.CustomMap.createWithInitialValue(list_1.CustomList.intrinsics);
             const mapIntrinsics = map_1.CustomMap.createWithInitialValue(map_1.CustomMap.intrinsics);
+            const funcRefIntrinsics = map_1.CustomMap.createWithInitialValue(function_1.CustomFunction.intrinsics);
             this.apiContext.set(new string_1.CustomString('string'), stringIntrinsics);
             this.apiContext.set(new string_1.CustomString('number'), numberIntrinsics);
             this.apiContext.set(new string_1.CustomString('list'), listIntrinsics);
             this.apiContext.set(new string_1.CustomString('map'), mapIntrinsics);
+            this.apiContext.set(new string_1.CustomString('funcRef'), funcRefIntrinsics);
             this.apiContext.extend(this.api);
             const newParams = new list_1.CustomList(this.params.map((item) => new string_1.CustomString(item)));
             this.globalContext.scope.set(exports.PARAMS_PROPERTY, newParams);

package/dist/operations/evaluate.d.ts

@@ -3,6 +3,7 @@ import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CustomBoolean } from '../types/boolean';
 import { CustomList } from '../types/list';
+import { CustomNumber } from '../types/number';
 import { CustomString } from '../types/string';
 import { CPSVisit, Operation } from './operation';
 export interface ProcessorHandlerFunction {
@@ -17,8 +18,8 @@ export declare const minusString: (a: CustomString, b: CustomValue) => CustomVal
 export declare const multiplyString: (a: CustomString, b: CustomValue) => CustomValue;
 export declare const divideString: (a: CustomString, b: CustomValue) => CustomValue;
 export declare const StringProcessorHandler: ProcessorHandler;
-export declare const multiplyList: (a: CustomList, b: CustomValue) => CustomValue;
-export declare const divideList: (a: CustomList, b: CustomValue) => CustomValue;
+export declare const multiplyList: (a: CustomList, b: CustomNumber) => CustomValue;
+export declare const divideList: (a: CustomList, b: CustomNumber) => CustomValue;
 export declare const ListProcessorHandler: ProcessorHandler;
 export declare const MapProcessorHandler: ProcessorHandler;
 export declare const InterfaceProcessorHandler: ProcessorHandler;

package/dist/operations/evaluate.js

@@ -123,7 +123,7 @@ exports.ListProcessorHandler = {
         if (right instanceof list_1.CustomList) {
             return left.fork().extend(right);
         }
-        return left;
+        return default_1.DefaultType.Void;
     },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof list_1.CustomList) {
@@ -137,15 +137,25 @@ exports.ListProcessorHandler = {
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.Asterik]: (left, right) => (0, exports.multiplyList)(left, right),
-    [greyscript_core_1.Operator.Slash]: (left, right) => (0, exports.divideList)(left, right)
+    [greyscript_core_1.Operator.Asterik]: (left, right) => {
+        if (right instanceof number_1.CustomNumber) {
+            return (0, exports.multiplyList)(left, right);
+        }
+        return default_1.DefaultType.Void;
+    },
+    [greyscript_core_1.Operator.Slash]: (left, right) => {
+        if (right instanceof number_1.CustomNumber) {
+            return (0, exports.divideList)(left, right);
+        }
+        return default_1.DefaultType.Void;
+    }
 };
 exports.MapProcessorHandler = {
     [greyscript_core_1.Operator.Plus]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
             return left.fork().extend(right);
         }
-        return left;
+        return default_1.DefaultType.Void;
     },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
@@ -165,6 +175,12 @@ exports.InterfaceProcessorHandler = {
     [greyscript_core_1.Operator.NotEqual]: (left, right) => new boolean_1.CustomBoolean(left.value !== right.value)
 };
 exports.NilProcessorHandler = {
+    [greyscript_core_1.Operator.Plus]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.Minus]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.Slash]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.Asterik]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.Power]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.PercentSign]: () => default_1.DefaultType.Void,
     [greyscript_core_1.Operator.Equal]: (_a, b) => new boolean_1.CustomBoolean(b instanceof nil_1.CustomNil),
     [greyscript_core_1.Operator.NotEqual]: (_a, b) => new boolean_1.CustomBoolean(!(b instanceof nil_1.CustomNil))
 };
@@ -173,9 +189,8 @@ exports.FunctionProcessorHandler = {
     [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a !== b)
 };
 const handleNumber = (op, a, b) => {
-    if (b instanceof nil_1.CustomNil) {
+    if (b instanceof nil_1.CustomNil)
         b = new number_1.CustomNumber(0);
-    }
     if (op in exports.NumberProcessorHandler && b instanceof number_1.CustomNumber) {
         return exports.NumberProcessorHandler[op](a, b);
     }
@@ -186,6 +201,10 @@ const handleNumber = (op, a, b) => {
 };
 exports.handleNumber = handleNumber;
 const handleString = (op, a, b) => {
+    if (a instanceof nil_1.CustomNil)
+        a = new string_1.CustomString('');
+    if (b instanceof nil_1.CustomNil)
+        b = new string_1.CustomString('');
     if (op in exports.StringProcessorHandler) {
         return exports.StringProcessorHandler[op](a, b);
     }
@@ -196,10 +215,8 @@ const handleString = (op, a, b) => {
 };
 exports.handleString = handleString;
 const handleList = (op, a, b) => {
-    const left = a;
-    const right = b;
     if (op in exports.ListProcessorHandler) {
-        return exports.ListProcessorHandler[op](left, right);
+        return exports.ListProcessorHandler[op](a, b);
     }
     else if (op in exports.GenericProcessorHandler) {
         return exports.GenericProcessorHandler[op](a, b);
@@ -208,10 +225,8 @@ const handleList = (op, a, b) => {
 };
 exports.handleList = handleList;
 const handleMap = (op, a, b) => {
-    const left = a;
-    const right = b;
     if (op in exports.MapProcessorHandler) {
-        return exports.MapProcessorHandler[op](left, right);
+        return exports.MapProcessorHandler[op](a, b);
     }
     else if (op in exports.GenericProcessorHandler) {
         return exports.GenericProcessorHandler[op](a, b);
@@ -220,10 +235,8 @@ const handleMap = (op, a, b) => {
 };
 exports.handleMap = handleMap;
 const handleInterface = (op, a, b) => {
-    const left = a;
-    const right = b;
     if (op in exports.InterfaceProcessorHandler) {
-        return exports.InterfaceProcessorHandler[op](left, right);
+        return exports.InterfaceProcessorHandler[op](a, b);
     }
     else if (op in exports.GenericProcessorHandler) {
         return exports.GenericProcessorHandler[op](a, b);
@@ -267,7 +280,7 @@ const handle = (op, a, b) => {
     }
     if ((a instanceof string_1.CustomString || b instanceof string_1.CustomString) &&
         op === greyscript_core_1.Operator.Plus) {
-        return exports.StringProcessorHandler[op](a, b);
+        return (0, exports.handleString)(op, a, b);
     }
     else if (a instanceof number_1.CustomNumber) {
         return (0, exports.handleNumber)(op, a, b);

package/dist/types/function.d.ts

@@ -1,5 +1,6 @@
 import { OperationContext } from '../context';
 import { Operation } from '../operations/operation';
+import { ObjectValue } from '../utils/object-value';
 import { CustomValue } from './base';
 import { CustomMap } from './map';
 export interface Callback {
@@ -15,6 +16,7 @@ export declare class Argument {
     constructor(name: string, defaultValue?: Operation | CustomValue);
 }
 export declare class CustomFunction extends CustomValue {
+    static readonly intrinsics: ObjectValue;
     readonly scope?: OperationContext;
     readonly name: string;
     readonly value: Callback;

package/dist/types/function.js

@@ -13,6 +13,7 @@ exports.CustomFunction = exports.Argument = exports.SUPER_NAMESPACE = exports.SE
 const context_1 = require("../context");
 const operation_1 = require("../operations/operation");
 const reference_1 = require("../operations/reference");
+const object_value_1 = require("../utils/object-value");
 const base_1 = require("./base");
 const default_1 = require("./default");
 const map_1 = require("./map");
@@ -82,7 +83,7 @@ class CustomFunction extends base_1.CustomValue {
         return true;
     }
     instanceOf(v) {
-        return v instanceof CustomFunction;
+        return v.value === CustomFunction.intrinsics;
     }
     run(self, args, callContext, next) {
         var _a;
@@ -122,4 +123,5 @@ class CustomFunction extends base_1.CustomValue {
         });
     }
 }
+CustomFunction.intrinsics = new object_value_1.ObjectValue();
 exports.CustomFunction = CustomFunction;

package/dist/types/nil.js

@@ -14,7 +14,7 @@ class CustomNil extends base_1.CustomValue {
         return this.toString();
     }
     toString() {
-        return '';
+        return 'null';
     }
     fork() {
         return new CustomNil();

package/package.json

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