fez-lisp 1.0.51 → 1.0.52

package/index.js

@@ -1,8 +1,8 @@
-import { evaluate } from './src/interpreter.js'
+import { evaluate } from './src/evaluator.js'
 import { LISP, AST } from './src/parser.js'
 import { fez, tree } from './src/utils.js'
 import std from './lib/baked/std.js'
-import { keywords } from './src/tokeniser.js'
-import { WORD, APPLY, ATOM, VALUE, TYPE } from './src/enums.js'
+import { keywords } from './src/interpreter.js'
+import { WORD, APPLY, ATOM, VALUE, TYPE } from './src/keywords.js'
 const types = { WORD, APPLY, ATOM, VALUE, TYPE }
 export { fez, keywords, evaluate, std, types, tree, LISP, AST }

package/package.json

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

package/src/compiler.js

@@ -6,7 +6,7 @@ import {
   TYPE,
   VALUE,
   WORD
-} from './enums.js'
+} from './keywords.js'
 import { leaf, isLeaf } from './parser.js'
 import { deepRename, lispToJavaScriptVariableName } from './utils.js'
 const Helpers = {

package/src/evaluator.js

@@ -0,0 +1,43 @@
+import { APPLY, ATOM, KEYWORDS, TYPE, VALUE, WORD } from './keywords.js'
+import { isLeaf } from './parser.js'
+import { keywords } from './interpreter.js'
+import { stringifyArgs } from './utils.js'
+
+export const evaluate = (exp, env) => {
+  const [first, ...rest] = isLeaf(exp) ? [exp] : exp
+  if (first == undefined) return []
+  switch (first[TYPE]) {
+    case WORD: {
+      const word = env[first[VALUE]]
+      if (word == undefined)
+        throw new ReferenceError(`Undefined variable ${first[VALUE]}`)
+      return word
+    }
+    case APPLY:
+      const apply = env[first[VALUE]]
+      if (apply == undefined)
+        throw new ReferenceError(
+          `Undefined (${KEYWORDS.ANONYMOUS_FUNCTION}) ${first[VALUE]}`
+        )
+      if (typeof apply !== 'function')
+        throw new TypeError(
+          `${first[VALUE]} is not a (${KEYWORDS.ANONYMOUS_FUNCTION})`
+        )
+      return apply(rest, env)
+    case ATOM:
+      return first[VALUE]
+    default:
+      throw new ReferenceError(
+        `Attempting to acces Undefined near ${stringifyArgs(exp)}`
+      )
+  }
+}
+export const isAtom = (arg, env) => {
+  if (arg[TYPE] === ATOM) return 1
+  else {
+    const atom = evaluate(arg, env)
+    return +(typeof atom === 'number' || typeof atom === 'string')
+  }
+}
+export const run = (tree, env = {}) =>
+  keywords[KEYWORDS.BLOCK](tree, { ...keywords, ...env })