fix: 🐛 fix compiling, now stdlib sources placed in compiled file

Author: maxbarsukov

src/index.js

@@ -1,13 +1,16 @@
+import UglifyJS from 'uglify-js';
+
 import Parser from './parser/Parser.js';
 import InputStream from './tokenizer/InputStream.js';
 import TokenStream from './tokenizer/TokenStream.js';
 
 import evaluate from './runtime/Evaluator.js';
 import Executor from './runtime/Executor.js';
 
-import makeEnv from './stdlib/StdEnvJS.js';
-import stdEnv from './stdlib/StdEnvYAS.js';
-import makeCompilerEnv from './stdlib/StdCompilerEnv.js';
+import makeEnv from './stdlib/interpreter/StdEnvJS.js';
+import stdEnv from './stdlib/interpreter/StdEnvYAS.js';
+
+import makeCompilerEnv from './stdlib/compiler/StdCompilerEnv.js';
 
 import CompilerJS from './codegen/CompilerJS.js';
 
@@ -27,9 +30,9 @@ export function compile(code) {
   const tokenStream = new TokenStream(inputStream);
   const parser = new Parser(tokenStream);
   const ast = parser.parse();
-  makeCompilerEnv();
   const compiler = new CompilerJS(stdEnv(ast));
-  return compiler.compile();
+  const js = makeCompilerEnv() + compiler.compile();
+  return UglifyJS.minify(js).code;
 }
 
 export function runJS(jsCode) {

src/stdlib/StdCompilerEnv.js

@@ -0,0 +1,58 @@
+export default function makeCompilerEnv() {
+  return `
+global.print = function(...txt) {
+  txt.forEach(i => process.stdout.write(i.toString()));
+};
+
+global.println = function(...txt) {
+  txt.forEach(i => console.log(i));
+};
+
+global.clear = console.clear;
+
+global.time = (callback, func) => {
+  console.log(callback, func);
+  console.time('time');
+  func((ret) => {
+    console.timeEnd('time');
+    callback(ret);
+  });
+};
+
+global.sleep = (callback, delay) => {
+  setTimeout(() => {
+    callback();
+  }, delay);
+};
+
+global.callcc = (callback, fn, ...args) => {
+  fn(callback, (discard, ret) => {
+    callback(ret);
+  }, ...args);
+};
+
+global.halt = (k) => {};
+
+global.pstack = [];
+
+global._goto = function(f) {
+  f((r) => {
+    const h = pstack.pop();
+    h(r);
+  });
+};
+
+global.reset = function(KRESET, th) {
+  pstack.push(KRESET);
+  _goto(th);
+};
+
+global.shift = function(KSHIFT, f) {
+  _goto((KGOTO) => {
+    f(KGOTO, (k1, v) => {
+      pstack.push(k1);
+      KSHIFT(v);
+    });
+  });
+  };`;
+}

src/stdlib/compiler/StdCompilerEnv.js

@@ -1,5 +1,5 @@
-import Environment from '../runtime/Environment.js';
-import Executor from '../runtime/Executor.js';
+import Environment from '../../runtime/Environment.js';
+import Executor from '../../runtime/Executor.js';
 
 export default function makeEnv() {
   const globalEnv = new Environment();
@@ -49,6 +49,7 @@ export default function makeEnv() {
       h(r);
     });
   }
+  globalEnv.def('_goto', _goto);
 
   function reset(KRESET, th) {
     pstack.push(KRESET);
@@ -64,6 +65,7 @@ export default function makeEnv() {
       });
     });
   }
+  globalEnv.def('shift', shift);
 
   return globalEnv;
 }

src/stdlib/StdEnvJS.js src/stdlib/interpreter/StdEnvJS.jssrc/stdlib/StdEnvJS.js renamed to src/stdlib/interpreter/StdEnvJS.js

@@ -1,6 +1,6 @@
-import Parser from '../parser/Parser.js';
-import InputStream from '../tokenizer/InputStream.js';
-import TokenStream from '../tokenizer/TokenStream.js';
+import Parser from '../../parser/Parser.js';
+import InputStream from '../../tokenizer/InputStream.js';
+import TokenStream from '../../tokenizer/TokenStream.js';
 
 export default function stdEnv(ast) {
   const std = `def cons = fn(a, b) -> fn(f) -> f(a, b);