fez-lisp 1.6.42 → 1.6.44

package/package.json

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

package/src/types.js

@@ -1083,8 +1083,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }
@@ -1093,8 +1093,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }
@@ -1114,8 +1114,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
 
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
@@ -1125,8 +1125,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }
@@ -1146,8 +1146,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }
@@ -1156,8 +1156,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }
@@ -1177,8 +1177,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }
@@ -1187,8 +1187,8 @@ export const SPECIAL_FORM_TYPES = {
           [STATS]: {
             retried: Infinity,
             [SIGNATURE]: PLACEHOLDER,
-            [TYPE_PROP]: [ATOM],
-            [RETURNS]: [ATOM],
+            [TYPE_PROP]: [ATOM, SPECIAL_NUMBER],
+            [RETURNS]: [ATOM, SPECIAL_NUMBER],
             [ARGUMENTS]: [],
             [ARG_COUNT]: 0
           }

package/src/utils.js

@@ -30,6 +30,14 @@ import { debugStackToString, startDebug, debug } from './debugger.js'
 export const logError = (error) =>
   console.log('\x1b[31m', `\n${error}\n`, '\x1b[0m')
 export const logSuccess = (output) => console.log('\x1b[32m', output, '\x1b[0m')
+export const logType = (type) => {
+  console.log('\n\x1b[34m')
+  console.log(type, '\n\x1b[0m')
+}
+export const logResult = (result) => {
+  console.log('\x1b[34m')
+  console.log(result, '\n\x1b[0m')
+}
 export const wrapInBracesString = (exp) => `(${stringifyArgs(exp)})`
 export const logExp = function (exp, ...args) {
   console.log(wrapInBracesString(exp), ...args)
@@ -365,12 +373,59 @@ export const isInputVariable = (x) =>
   x[1][TYPE] === WORD &&
   x[1][VALUE] === 'INPUT'
 
+export const init = () => {
+  import('fs').then(({ writeFileSync }) => {
+    writeFileSync('main.lisp', '')
+    writeFileSync('types.lisp', '')
+    writeFileSync(
+      'main.js',
+      `import { compile, enhance, parse, LISP, UTILS } from 'fez-lisp'
+    import { readFileSync } from 'fs'
+    export const dev = (source, types) => {
+      try {
+        const parsed = parse(source)
+        const { evaluated, type, error } = UTILS.debug(
+          parsed,
+          true,
+          types ? types : undefined
+        )
+        if (error == null) {
+          if (type) {
+            UTILS.logType(type)
+          }
+          UTILS.logResult(LISP.serialise(evaluated))
+        } else UTILS.logError(error.message)
+      } catch (error) {
+        UTILS.logError(error.message)
+      }
+    }
+    export const comp = (source) =>
+      UTILS.logResult(
+        LISP.serialise(new Function('return ' + compile(enhance(parse(source))))())
+      )
+    const file = readFileSync('./main.lisp', 'utf-8')
+    switch (process.argv[2]) {
+      case 'comp':
+        comp(file)
+        break
+      case 'dev':
+        dev(file, readFileSync('./types.lisp', 'utf-8'))
+        break
+    }
+    `
+    )
+  })
+}
+
 export const UTILS = {
+  init,
   debug,
   startDebug,
   debugStackToString,
   handleUnbalancedQuotes,
   handleUnbalancedParens,
+  logType,
+  logResult,
   logError,
   logSuccess,
   formatErrorWithCallstack,