fez-lisp 1.0.33 → 1.0.34

package/package.json

@@ -2,7 +2,7 @@
   "name": "fez-lisp",
   "description": "Lisp interpreted & compiled to JavaScript",
   "author": "AT290690",
-  "version": "1.0.33",
+  "version": "1.0.34",
   "type": "module",
   "main": "index.js",
   "keywords": [
@@ -18,7 +18,8 @@
   },
   "prettier": {
     "semi": false,
-    "singleQuote": true
+    "singleQuote": true,
+    "trailingComma": "none"
   },
   "scripts": {
     "build": "node ./lib/builder.js",

package/src/compiler.js

@@ -5,7 +5,7 @@ import {
   KEYWORDS,
   TYPE,
   VALUE,
-  WORD,
+  WORD
 } from './enums.js'
 import { leaf, isLeaf } from './parser.js'
 import { deepRename, lispToJavaScriptVariableName } from './utils.js'
@@ -85,7 +85,7 @@ return result
        default:
          return 0
       }
-    }`,
+    }`
 }
 const semiColumnEdgeCases = new Set([
   ';)',
@@ -105,7 +105,7 @@ const semiColumnEdgeCases = new Set([
   ';?',
   ',,',
   ';;',
-  ';]',
+  ';]'
 ])
 
 const parse = (Arguments, Drill) => Arguments.map((x) => compile(x, Drill))

package/src/enums.js

@@ -79,5 +79,5 @@ export const KEYWORDS = {
   CLEAR_CONSOLE: 'clear!',
   SET_ARRAY: 'array:set!',
 
-  DOC: 'fez-manual',
+  DOC: 'fez-manual'
 }

package/src/plain/tokeniser.js

@@ -114,7 +114,7 @@ const keywords = {
       for (let i = 0; i < props.length; ++i) {
         Object.defineProperty(localEnv, params[i][VALUE], {
           value: evaluate(props[i], scope),
-          writable: true,
+          writable: true
         })
       }
       return evaluate(body, localEnv)
@@ -177,7 +177,7 @@ const keywords = {
     name = word[VALUE]
     Object.defineProperty(env, name, {
       value: evaluate(args[1], env),
-      writable: false,
+      writable: false
     })
     return env[name]
   },
@@ -269,7 +269,7 @@ const keywords = {
       for (let i = 0; i < props.length; ++i) {
         Object.defineProperty(localEnv, params[i][VALUE], {
           value: evaluate(props[i], scope),
-          writable: true,
+          writable: true
         })
       }
       return evaluate(body, localEnv)
@@ -295,7 +295,6 @@ const keywords = {
           ? console.log(
               '\x1b[31m',
               `${describe} Failed:\n`,
-
               `${rest[0]} => ${stringify(rest[1])} != ${stringify(rest[2])}`,
               '\n',
               '\x1b[0m'
@@ -341,7 +340,7 @@ const keywords = {
   [KEYWORDS.CLEAR_CONSOLE]: (args) => {
     console.clear()
     return 0
-  },
+  }
 }
 keywords[KEYWORDS.NOT_COMPILED_BLOCK] = keywords[KEYWORDS.BLOCK]
 keywords[KEYWORDS.DOC] = (args, env) => {

package/src/tokeniser.js

@@ -6,7 +6,7 @@ import {
   isEqual,
   isEqualTypes,
   isForbiddenVariableName,
-  stringifyArgs,
+  stringifyArgs
 } from './utils.js'
 
 const keywords = {
@@ -405,7 +405,7 @@ const keywords = {
       for (let i = 0; i < props.length; ++i) {
         Object.defineProperty(localEnv, params[i][VALUE], {
           value: evaluate(props[i], scope),
-          writable: true,
+          writable: true
         })
       }
       return evaluate(body, localEnv)
@@ -631,7 +631,7 @@ const keywords = {
     name = word[VALUE]
     Object.defineProperty(env, name, {
       value: evaluate(args[1], env),
-      writable: false,
+      writable: false
     })
     return env[name]
   },
@@ -931,7 +931,7 @@ const keywords = {
       for (let i = 0; i < props.length; ++i) {
         Object.defineProperty(localEnv, params[i][VALUE], {
           value: evaluate(props[i], scope),
-          writable: true,
+          writable: true
         })
       }
       return evaluate(body, localEnv)
@@ -966,13 +966,22 @@ const keywords = {
   [KEYWORDS.TEST_BED]: (args, env) => {
     let tests = []
     try {
+      if (
+        args.some(
+          ([[type, car]]) => !(type === APPLY && car === KEYWORDS.TEST_CASE)
+        )
+      )
+        throw new TypeError(
+          `Arguments of (${KEYWORDS.TEST_BED}) must be (${
+            KEYWORDS.TEST_CASE
+          }) (${KEYWORDS.TEST_BED} ${stringifyArgs(args)})`
+        )
       tests = args.map((x) => evaluate(x, env))
       tests.forEach(([state, describe, ...rest]) =>
         !state
           ? console.log(
               '\x1b[31m',
               `${describe} Failed:\n`,
-
               `${rest[0]} => ${stringify(rest[1])} != ${stringify(rest[2])}`,
               '\n',
               '\x1b[0m'
@@ -1090,7 +1099,7 @@ const keywords = {
       )
     console.clear()
     return 0
-  },
+  }
 }
 keywords[KEYWORDS.NOT_COMPILED_BLOCK] = keywords[KEYWORDS.BLOCK]
 keywords[KEYWORDS.DOC] = (args, env) => {

package/src/utils.js

@@ -8,7 +8,8 @@ export const logError = (error) => console.log('\x1b[31m', error, '\x1b[0m')
 export const logSuccess = (output) => console.log(output, '\x1b[0m')
 export const removeNoCode = (source) =>
   source
-    .replace(/;.+/g, '')
+    // .replace(/;.+/g, '')
+    .replace(/;(?=(?:(?:[^"]*"){2})*[^"]*$).+/g, '')
     .replace(/[\s\s]+(?=[^"]*(?:"[^"]*"[^"]*)*$)/g, ' ')
     .trim()
 export const isBalancedParenthesis = (sourceCode) => {