fez-lisp 1.5.3 → 1.5.5

package/package.json

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

package/src/compiler.js

@@ -7,7 +7,6 @@ import {
   VALUE,
   WORD
 } from './keywords.js'
-import { OPTIMIZATIONS } from './macros.js'
 import { leaf, isLeaf, AST } from './parser.js'
 const deepRename = (name, newName, tree) => {
   if (!isLeaf(tree))
@@ -70,8 +69,6 @@ const keywordToHelper = (name) => {
       return '__bit_lshift'
     case KEYWORDS.BITWISE_RIGHT_SHIFT:
       return '__bit_rshift'
-    case KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT:
-      return '__bit_urshift'
     default:
       return name
   }
@@ -104,7 +101,6 @@ const Helpers = {
   __bit_not: '__bit_not=(a)=>~a',
   __bit_lshift: '__bit_lshift=(a,b)=>a<<b',
   __bit_rshift: '__bit_rshift=(a,b)=>a>>b',
-  __bit_urshift: '__bit_urshift=(a,b)=>a>>>b',
   array: 'array=(...args)=>args',
   not: 'not=(a)=>+!a',
   and: `and=(a, b)=>+(a&&b)`,
@@ -177,50 +173,6 @@ const comp = (tree, Drill) => {
       }
       case KEYWORDS.DEFINE_VARIABLE: {
         const n = tail[0][VALUE]
-        // const prefix = n.split(':')[0]
-        // if (prefix === OPTIMIZATIONS.RECURSION) {
-        //   const name = lispToJavaScriptVariableName(n)
-        //   const newName = `${OPTIMIZATIONS.RECURSION}_${performance
-        //     .now()
-        //     .toString()
-        //     .replace('.', 7)}`
-        //   Drill.Variables.add(name)
-        //   Drill.Variables.add(newName)
-        //   Drill.Helpers.add('__tco')
-        //   const functionArgs = tail.at(-1).slice(1)
-        //   const body = functionArgs.pop()
-        //   const FunctionDrill = { Variables: new Set(), Helpers: Drill.Helpers }
-        //   deepRename(n, `()=>${newName}`, body)
-        //   const evaluatedBody = comp(body, FunctionDrill)
-        //   const vars = FunctionDrill.Variables.size
-        //     ? `var ${[...FunctionDrill.Variables].join(',')};`
-        //     : ''
-        //   return `(${name}=(__tco(${newName}=(${parseArgs(
-        //     functionArgs,
-        //     Drill
-        //   )})=>{${vars}return ${evaluatedBody.toString().trim()}})));`
-        // } else
-
-        // if (prefix === OPTIMIZATIONS.CACHE) {
-        //   // memoization here
-        //   const name = lispToJavaScriptVariableName(n)
-        //   const newName = name.substring(OPTIMIZATIONS.CACHE.length + 1)
-        //   Drill.Variables.add(name)
-        //   const functionArgs = tail.at(-1).slice(1)
-        //   const body = functionArgs.pop()
-        //   deepRename(n, newName, body)
-        //   const FunctionDrill = { Variables: new Set(), Helpers: Drill.Helpers }
-        //   const evaluatedBody = comp(body, FunctionDrill)
-        //   const vars = FunctionDrill.Variables.size
-        //     ? `var ${[...FunctionDrill.Variables].join(',')};`
-        //     : ''
-        //   return `(${name}=function(){var __${newName}_map = new Map();var ${newName}=(function(${parseArgs(
-        //     functionArgs,
-        //     Drill
-        //   )}){${vars};var __key=[...arguments].join(',');if(__${newName}_map.has(__key)){return __${newName}_map.get(__key)}else{var __res = ${evaluatedBody
-        //     .toString()
-        //     .trim()};__${newName}_map.set(__key, __res);return __res}});return ${newName}(...arguments)});`
-        // }
         const name = lispToJavaScriptVariableName(n)
         Drill.Variables.add(name)
         return `${name}=${comp(tail[1], Drill)};`
@@ -289,12 +241,8 @@ const comp = (tree, Drill) => {
       case KEYWORDS.BITWISE_XOR:
       case KEYWORDS.BITWISE_LEFT_SHIFT:
       case KEYWORDS.BITWISE_RIGHT_SHIFT:
-      case KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT:
-        return `(${parseArgs(tail, Drill, token)});`
       case KEYWORDS.REMAINDER_OF_DIVISION:
         return `(${comp(tail[0], Drill)}%${comp(tail[1], Drill)});`
-      case KEYWORDS.BIT_TYPE:
-        return `(${comp(tail[0], Drill)}>>>0).toString(2)`
       case KEYWORDS.BITWISE_NOT:
         return `~(${comp(tail[0], Drill)})`
       case KEYWORDS.NOT:

package/src/interpreter.js

@@ -339,39 +339,6 @@ export const keywords = {
       )
     return a >> b
   },
-  [KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT]: (args, env) => {
-    if (args.length !== 2)
-      throw new RangeError(
-        `Invalid number of arguments to (${
-          KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT
-        }) (= 2 required)\n\n(${
-          KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT
-        } ${stringifyArgs(args)})`
-      )
-    const a = evaluate(args[0], env)
-    if (typeof a !== 'number')
-      throw new TypeError(
-        `First arguments of (${
-          KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT
-        }) must be a (${RUNTIME_TYPES.NUMBER}) but ${LISP.source(
-          args[0]
-        )} is not\n\n(${KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT} ${stringifyArgs(
-          args
-        )})`
-      )
-    const b = evaluate(args[1], env)
-    if (typeof b !== 'number')
-      throw new TypeError(
-        `Second arguments of (${
-          KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT
-        }) must be a (${RUNTIME_TYPES.NUMBER}) but ${LISP.source(
-          args[1]
-        )} is not\n\n(${KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT} ${stringifyArgs(
-          args
-        )})`
-      )
-    return a >>> b
-  },
   [KEYWORDS.CREATE_ARRAY]: (args, env) => {
     return args.length ? args.map((x) => evaluate(x, env)) : []
   },
@@ -400,7 +367,7 @@ export const keywords = {
       throw new TypeError(
         `Second argument of (${
           KEYWORDS.GET_ARRAY
-        }) must be a positive (32 bit ${
+        }) must be a positive (interger ${
           RUNTIME_TYPES.NUMBER
         }) (= i ${index})\n\n(${KEYWORDS.GET_ARRAY} ${stringifyArgs(args)})`
       )

package/src/keywords.js

@@ -23,7 +23,6 @@ export const KEYWORDS = {
   BITWISE_XOR: '^',
   BITWISE_LEFT_SHIFT: '<<',
   BITWISE_RIGHT_SHIFT: '>>',
-  BITWISE_UNSIGNED_RIGHT_SHIFT: '>>>',
   GET_ARRAY: 'get',
   BLOCK: 'do',
   ANONYMOUS_FUNCTION: 'lambda',