fez-lisp 1.6.58 → 1.6.59

package/package.json

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

package/src/types.js

@@ -1539,3 +1539,12 @@ export const filteredDefinedTypes = (program, lib, libT) => {
 export const definedTypes = (T) => fromSourceToType(T)
 export const withStdDefinedTypes = (ast) =>
   withCtxTypes(definedTypes(filteredDefinedTypes(ast, std, stdT)))
+
+export const extractTypes = (source) => {
+  let types
+  const src = source.replaceAll(/\(the.+\)/g, (match, token) => {
+    types = match
+    return ''
+  })
+  return [src, types]
+}

package/src/utils.js

@@ -21,6 +21,7 @@ import { type, typeCheck, withScope } from './check.js'
 import stdT from '../lib/baked/std-T.js'
 import {
   definedTypes,
+  extractTypes,
   filteredDefinedTypes,
   formatAstTypes,
   withCtxTypes
@@ -380,8 +381,8 @@ export const init = () => {
     console.log('Added directory src in root')
     writeFileSync('./src/main.lisp', '')
     console.log('Added file main.lisp in src')
-    writeFileSync('./src/types.lisp', '')
-    console.log('Added file types.lisp in src')
+    // writeFileSync('./src/types.lisp', '')
+    // console.log('Added file types.lisp in src')
     writeFileSync(
       'index.js',
       `import { compile, enhance, parse, LISP, UTILS } from "fez-lisp";
@@ -406,16 +407,17 @@ export const dev = (source, types) => {
 };
 export const comp = (source) => compile(enhance(parse(source)));
 const file = readFileSync("./src/main.lisp", "utf-8");
+const [src, typ] = UTILS.extractTypes(file);
 switch (process.argv[2]) {
   case "comp":
     writeFileSync(
       "./src/main.js",
-      "var _ = " + comp(file) + "; console.log(_)"
+      "var _ = " + comp(src) + "; console.log(_)"
     );
     break;
   case "dev":
   default:
-    dev(file, readFileSync("./src/types.lisp", "utf-8"));
+    dev(src, typ);
     break;
 }
 `
@@ -424,7 +426,7 @@ switch (process.argv[2]) {
     console.log(
       `Done!
 
-Write code in main.lisp and types (if any) in types.lisp
+Write code in main.lisp
 Run node index.js with the following flags:
 - dev (static type check and run time validations)
 - comp (compile Fez to JavaScript file main.js)
@@ -440,6 +442,7 @@ That's it! You are all set!
 }
 
 export const UTILS = {
+  extractTypes,
   init,
   debug,
   startDebug,