fez-lisp 1.3.1 → 1.3.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "fez-lisp",
   "description": "Lisp interpreted & compiled to JavaScript",
   "author": "AT290690",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "type": "module",
   "main": "index.js",
   "keywords": [
@@ -29,6 +29,5 @@
   "license": "MIT",
   "devDependencies": {
     "mocha": "^10.2.0"
-  },
-  "dependencies": {}
+  }
 }

package/src/compiler.js

@@ -5,10 +5,13 @@ import {
   KEYWORDS,
   TYPE,
   VALUE,
-  WORD,
-  SUGGAR
+  WORD
 } from './keywords.js'
 import { leaf, isLeaf, AST } from './parser.js'
+export const OPTIMIZATIONS = {
+  RECURSION: 'recursive',
+  CACHE: 'memoized'
+}
 const deepRename = (name, newName, tree) => {
   if (!isLeaf(tree))
     for (const leaf of tree) {
@@ -58,6 +61,20 @@ const keywordToHelper = (name) => {
       return '__lt'
     case KEYWORDS.LESS_THAN_OR_EQUAL:
       return '__lteq'
+    case KEYWORDS.BITWISE_AND:
+      return '__bit_and'
+    case KEYWORDS.BITWISE_OR:
+      return '__bit_or'
+    case KEYWORDS.BITWISE_XOR:
+      return '__bit_xor'
+    case KEYWORDS.BITWISE_NOT:
+      return '__bit_not'
+    case KEYWORDS.BITWISE_LEFT_SHIFT:
+      return '__bit_lshift'
+    case KEYWORDS.BITWISE_RIGHT_SHIFT:
+      return '__bit_rshift'
+    case KEYWORDS.BITWISE_UNSIGNED_RIGHT_SHIFT:
+      return '__bit_urshift'
     default:
       return name
   }
@@ -78,12 +95,19 @@ const Helpers = {
   __add: `__add=(a,b)=>{return a+b}`,
   __sub: `__sub=function(a,b){return arguments.length===1?-a:a-b}`,
   __mult: `__mult=(a,b)=>{return a*b}`,
-  __div: `__div=function(a,b){return arguments.length===1?1/a:a/b}`,
+  __div: `__div=(a,b)=>{return a/b}`,
   __gteq: '__gteq=(a,b)=>+(a>=b)',
   __gt: '__gt=(a,b)=>+(a>b)',
   __eq: '__eq=(a,b)=>+(a===b)',
   __lteq: '__lteq=(a,b)=>+(a<=b)',
   __lt: '__lt=(a,b)=>+(a<b)',
+  __bit_and: '__bit_and=(a,b)=>a&b',
+  __bit_or: '__bit_or=(a,b)=>a|b',
+  __bit_xor: '__bit_xor=(a,b)=>a^b',
+  __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)`,
@@ -155,9 +179,9 @@ const compile = (tree, Drill) => {
       case KEYWORDS.DEFINE_VARIABLE: {
         const n = Arguments[0][VALUE]
         const prefix = n.split(':')[0]
-        if (prefix === SUGGAR.RECURSION) {
+        if (prefix === OPTIMIZATIONS.RECURSION) {
           const name = lispToJavaScriptVariableName(n)
-          const newName = `${SUGGAR.RECURSION}_${performance
+          const newName = `${OPTIMIZATIONS.RECURSION}_${performance
             .now()
             .toString()
             .replace('.', 7)}`
@@ -178,10 +202,10 @@ const compile = (tree, Drill) => {
           )})=>{${vars}return ${evaluatedBody
             .toString()
             .trim()}}, ${newName})));`
-        } else if (prefix === SUGGAR.CACHE) {
+        } else if (prefix === OPTIMIZATIONS.CACHE) {
           // memoization here
           const name = lispToJavaScriptVariableName(n)
-          const newName = name.substring(SUGGAR.CACHE.length + 1)
+          const newName = name.substring(OPTIMIZATIONS.CACHE.length + 1)
           Drill.Variables.add(name)
           const functionArgs = Arguments.at(-1).slice(1)
           const body = functionArgs.pop()
@@ -262,9 +286,7 @@ const compile = (tree, Drill) => {
       case KEYWORDS.MULTIPLICATION:
         return `(${parseArgs(Arguments, Drill, token)});`
       case KEYWORDS.DIVISION:
-        return Arguments.length === 1
-          ? `(1/${compile(Arguments[0], Drill)});`
-          : `(${parseArgs(Arguments, Drill, token)});`
+        return `(${parseArgs(Arguments, Drill, token)});`
       case KEYWORDS.ADDITION:
         return `(${parseArgs(Arguments, Drill, token)});`
       case KEYWORDS.BITWISE_AND: