fez-lisp 1.2.36 → 1.2.38

package/package.json

@@ -2,7 +2,7 @@
   "name": "fez-lisp",
   "description": "Lisp interpreted & compiled to JavaScript",
   "author": "AT290690",
-  "version": "1.2.36",
+  "version": "1.2.38",
   "type": "module",
   "main": "index.js",
   "keywords": [

package/src/compiler.js

@@ -143,8 +143,6 @@ const compile = (tree, Drill) => {
   const token = first[VALUE]
   if (first[TYPE] === APPLY) {
     switch (token) {
-      case KEYWORDS.ASSERT:
-        return '0'
       case KEYWORDS.BLOCK: {
         if (Arguments.length > 1) {
           return `(${Arguments.map((x) =>

package/src/interpreter.js

@@ -1,13 +1,4 @@
-import {
-  TYPE,
-  VALUE,
-  WORD,
-  KEYWORDS,
-  FALSE,
-  TRUE,
-  TYPES,
-  APPLY
-} from './keywords.js'
+import { TYPE, VALUE, WORD, KEYWORDS, FALSE, TRUE, TYPES } from './keywords.js'
 import { evaluate } from './evaluator.js'
 import { isForbiddenVariableName, stringifyArgs } from './utils.js'
 const keywords = {
@@ -827,48 +818,6 @@ const keywords = {
         }) but got (${expression}) (${KEYWORDS.THROW} ${stringifyArgs(args)})`
       )
     throw new Error(expression.map((x) => String.fromCharCode(x)).join(''))
-  },
-
-  [KEYWORDS.ASSERT]: (args, env) => {
-    if (args.length < 2)
-      throw new RangeError(
-        `Invalid number of arguments for (${
-          KEYWORDS.ASSERT
-        }), expected (> 2 required) but got ${args.length} (${
-          KEYWORDS.ASSERT
-        } ${stringifyArgs(args)})`
-      )
-    if (args.length % 2 !== 0)
-      throw new RangeError(
-        `Invalid number of arguments for (${
-          KEYWORDS.ASSERT
-        }), expected even number of arguments but got ${args.length} (${
-          KEYWORDS.ASSERT
-        } ${stringifyArgs(args)})`
-      )
-    for (let i = 0; i < args.length; i += 2) {
-      const condition = evaluate(args[i], env)
-      if (condition !== FALSE && condition !== TRUE)
-        throw new TypeError(
-          `Condition of (${
-            KEYWORDS.ASSERT
-          }) must be ${TRUE} or ${FALSE} but got (${
-            KEYWORDS.ASSERT
-          } ${stringifyArgs(args)})`
-        )
-      if (condition) {
-        const error = args[i + 1]
-        if (error[0][TYPE] === APPLY && error[0][VALUE] === KEYWORDS.THROW)
-          return evaluate(error, env)
-        else
-          throw new TypeError(
-            `Concequence of (${KEYWORDS.ASSERT}) must be (${
-              KEYWORDS.THROW
-            }) but got (${KEYWORDS.ASSERT} ${stringifyArgs(args)})`
-          )
-      }
-    }
-    return 0
   }
 }
 

package/src/keywords.js

@@ -50,7 +50,6 @@ export const KEYWORDS = {
   CLEAR_CONSOLE: 'clear!',
 
   THROW: 'throw',
-  ASSERT: 'assert',
 
   // Syntactic suggars
   PIPE: '|>',

package/src/utils.js

@@ -7,7 +7,8 @@ export const logError = (error) =>
   console.log('\x1b[31m', `\n${error}\n`, '\x1b[0m')
 export const logSuccess = (output) => console.log(output, '\x1b[0m')
 export const replaceStrings = (source) => {
-  const quotes = source.match(/"(.*?)"/g)
+  // const quotes = source.match(/"(.*?)"/g)
+  const quotes = source.match(/"(?:.*?\n)*?.*?"/g)
   // TODO handle escaping
   if (quotes)
     for (const q of quotes)