greybel-interpreter 2.2.14 → 2.2.16

package/dist/operations/evaluate.js

@@ -56,7 +56,7 @@ exports.minusString = minusString;
 const multiplyString = (a, b) => {
     const factor = b.toNumber();
     if (factor <= 0) {
-        return new list_1.CustomList();
+        return new string_1.CustomString('');
     }
     let newString = '';
     const max = Math.floor(a.value.length * factor);
@@ -69,7 +69,7 @@ exports.multiplyString = multiplyString;
 const divideString = (a, b) => {
     const factor = 1 / b.toNumber();
     if (factor <= 0) {
-        return new list_1.CustomList();
+        return new string_1.CustomString('');
     }
     let newString = '';
     const max = Math.floor(a.value.length * factor);

package/dist/operations/function.js

@@ -29,31 +29,27 @@ class FunctionOperation extends operation_1.Operation {
         return __awaiter(this, void 0, void 0, function* () {
             const stack = yield Promise.all(this.item.body.map((child) => visit(child)));
             this.block = new block_1.Block(this.item, stack);
-            this.args = [];
-            const defers = this.item.parameters.map((child) => __awaiter(this, void 0, void 0, function* () {
+            this.args = yield Promise.all(this.item.parameters.map((child) => __awaiter(this, void 0, void 0, function* () {
                 switch (child.type) {
                     case greyscript_core_1.ASTType.AssignmentStatement: {
                         const assignStatement = child;
                         const assignKey = assignStatement.variable;
-                        this.args.push({
+                        return {
                             name: assignKey.name,
                             op: yield visit(assignStatement.init)
-                        });
-                        break;
+                        };
                     }
                     case greyscript_core_1.ASTType.Identifier: {
                         const identifierKey = child;
-                        this.args.push({
+                        return {
                             name: identifierKey.name,
                             op: new reference_1.Reference(default_1.DefaultType.Void)
-                        });
-                        break;
+                        };
                     }
                     default:
                         throw new Error('Unexpected operation in arguments.');
                 }
-            }));
-            yield Promise.all(defers);
+            })));
             return this;
         });
     }

package/dist/types/function.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomFunction = exports.Argument = exports.SUPER_NAMESPACE = exports.SELF_NAMESPACE = exports.DEFAULT_FUNCTION_NAME = void 0;
 const context_1 = require("../context");
+const literal_1 = require("../operations/literal");
 const operation_1 = require("../operations/operation");
 const reference_1 = require("../operations/reference");
 const object_value_1 = require("../utils/object-value");
@@ -18,6 +19,7 @@ const base_1 = require("./base");
 const default_1 = require("./default");
 const map_1 = require("./map");
 const nil_1 = require("./nil");
+const string_1 = require("./string");
 exports.DEFAULT_FUNCTION_NAME = 'anonymous';
 exports.SELF_NAMESPACE = 'self';
 exports.SUPER_NAMESPACE = 'super';
@@ -76,7 +78,23 @@ class CustomFunction extends base_1.CustomValue {
         return this.toString();
     }
     toString() {
-        const args = this.argumentDefs.map((item) => item.name);
+        let refs = 1;
+        const args = this.argumentDefs.map((item) => {
+            if (item.defaultValue instanceof literal_1.Literal) {
+                const value = item.defaultValue.value;
+                if (value instanceof nil_1.CustomNil) {
+                    return item.name;
+                }
+                else if (value instanceof string_1.CustomString) {
+                    return `${item.name}="${value.value}"`;
+                }
+                return `${item.name}=${value.value}`;
+            }
+            else if (item.defaultValue.item != null) {
+                return `${item.name}=_${refs++}`;
+            }
+            return item.name;
+        });
         return `FUNCTION(${args.join(', ')})`;
     }
     toTruthy() {

package/package.json

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