force-lang 0.0.13 → 0.1.0

package/src/force-lang.js

@@ -1,39 +1,43 @@
-//const repl = require('repl');
-const log = require('bunny-logger');
-const NativeLib = require('./native_lib');
-const eval = require('./eval');
-const loadfile = require('./load-file');
-const env = require('./env');
+// const repl = require('repl');
+import log from 'bunny-logger';
+import NativeLib from './native_lib.js';
+import evalx from './eval.js';
+import loadfile from './load-file.js';
+import env from './env.js';
 
 class Force {
+  constructor() {
+    env.set('os:cwd', { _type: 'TC_STR', _datum: process.cwd() }, 'TC_VAR');
+    env.set('os:argv', { _type: 'TC_JSON', _datum: process.argv }, 'TC_VAR');
+    env.set('os:__dirname', { _type: 'TC_STR', _datum: import.meta.dirname }, 'TC_VAR');
+    env.set('os:bin', { _type: 'TC_STR', _datum: '' }, 'TC_VAR');
+  }
 
-	constructor(){
-		env.set('os:cwd',{_type: 'TC_STR', _datum: process.cwd()}, 'TC_VAR');
-		env.set('os:argv',{_type: 'TC_JSON', _datum: process.argv}, 'TC_VAR');
-		env.set('os:__dirname',{_type: 'TC_STR', _datum: __dirname}, 'TC_VAR');
-		env.set('os:bin',{_type: 'TC_STR', _datum: ''}, 'TC_VAR');
-	}
+  async load_lib() {
+    await evalx.load_lib();
+  }
 
-	async load_lib(){
-		await eval.load_lib();
-	}
-	load_lib_sync(){
-		eval.load_lib();
-	}
-	async eval_file(filename){
-		env.set('os:bin',{_type: 'TC_STR', _datum: filename}, 'TC_VAR');
-		eval.eval(await loadfile.load(filename), filename);
-	}
-	eval_file_sync(filename){
-		env.set('os:bin',{_type: 'TC_STR', _datum: filename}, 'TC_VAR');
-		eval.eval(loadfile.loadsync(filename), filename);
-	}
-	exec(script){
-		eval.eval(script, '<stdin>');
-	}
-	populate_repl(){
-		NativeLib.populate_repl();
-	}
-};
+  load_lib_sync() {
+    evalx.load_lib();
+  }
 
-module.exports = new Force();
+  async eval_file(filename) {
+    env.set('os:bin', { _type: 'TC_STR', _datum: filename }, 'TC_VAR');
+    await evalx.eval(await loadfile.load(filename), filename);
+  }
+
+  // 	deprecated ...
+  // 	eval_file_sync(filename){
+  // 		env.set('os:bin',{_type: 'TC_STR', _datum: filename}, 'TC_VAR');
+  // 		evalx.eval(loadfile.loadsync(filename), filename);
+  // 	}
+  async exec(script) {
+    await evalx.eval(script, '<stdin>');
+  }
+
+  populate_repl() {
+    NativeLib.populate_repl();
+  }
+}
+
+export default new Force();

package/src/lib.j

@@ -16,6 +16,9 @@
 : ddup
 	over over ;
 
+: nop
+  noop ;
+
 : ndrop2
   dup is_num if
   'no number on TOS' throw else
@@ -41,3 +44,11 @@
 
 : j:decode
 	j:parse ;
+
+: a:nth \ (a n -- o)
+	0 begin ddup > while >r >r a:tail r> r> 1 + repeat ddrop a:shift ;
+
+: s:chomp \ ( s -- s )
+	"" "\n$" rx:replace ;
+
+\ a:find notes \ [11,22,33] ( 22 = ) ( >r dup a:len begin dup 0 > while 1 -  ddup a:nth dup r> dup >r !! T = if nop else "T" . dup . then drop repeat "f" . r> drop drop drop ) !!

package/src/load-file.js

@@ -1,65 +1,65 @@
-const {promisify} = require('util');
-const fs = require('fs');
-const log = require('bunny-logger');
-const path = require('path');
-const env = require('./env');
+import { promisify } from 'util';
+import fs from 'fs';
+import log from 'bunny-logger';
+import path from 'path';
+import env from './env.js';
 
 const fs_readFile = promisify(fs.readFile);
 
-module.exports = {
-	load: async filename => {
-		var x;
-		try{
-			x = await fs_readFile(filename, 'utf8');
-		}catch(e){
-			throw(`error loading ${filename} file`);
-			//log.error(`error loading ${filename} file`);
-			//process.exit(1);
-		}
-		return x;
-	},
-	loadsync: filename => {
-		var x;
-		try {
-			x = fs.readFileSync(filename, 'utf8');
-		}catch(e){
-			throw(`error loading ${filename} file`);
-			//log.error(`error loading ${filename} file`);
-			//process.exit(1);
-		}
-		return x;
-	},
-	writesync: (filename, data) => {
-		try {
-			fs.writeFileSync(filename, data);
-		}catch(e){
-			throw(`error writing to ${filename} file`);
-			//log.error(`error loading ${filename} file`);
-			//process.exit(1);
-		}
-	},
-	appendsync: (filename, data) => {
-		try {
-			fs.appendFileSync(filename, data);
-		}catch(e){
-			throw(`error writing to ${filename} file`);
-			//log.error(`error loading ${filename} file`);
-			//process.exit(1);
-		}
-	},
-	existssync: filename => {
-		try {
-			return fs.existsSync(filename);
-		}catch(e){
-			throw(`error writing to ${filename} file`);
-			//log.error(`error loading ${filename} file`);
-			//process.exit(1);
-		}
-	},
-	resolve_path: filename => {
-		const bin = env.lookup('os:bin')._datum._datum;
-		let xpath = (bin=='')? path.resolve(bin) : path.dirname(path.resolve(bin));
-		xpath= path.join(xpath, filename);
-		return xpath;
-	}
-}
+export default {
+  load: async filename => {
+    let x;
+    try {
+      x = await fs_readFile(filename, 'utf8');
+    } catch (e) {
+      throw `error loading ${filename} file`;
+      // log.error(`error loading ${filename} file`);
+      // process.exit(1);
+    }
+    return x;
+  },
+  loadsync: filename => {
+    let x;
+    try {
+      x = fs.readFileSync(filename, 'utf8');
+    } catch (e) {
+      throw `error loading ${filename} file`;
+      // log.error(`error loading ${filename} file`);
+      // process.exit(1);
+    }
+    return x;
+  },
+  writesync: (filename, data) => {
+    try {
+      fs.writeFileSync(filename, data);
+    } catch (e) {
+      throw `error writing to ${filename} file`;
+      // log.error(`error loading ${filename} file`);
+      // process.exit(1);
+    }
+  },
+  appendsync: (filename, data) => {
+    try {
+      fs.appendFileSync(filename, data);
+    } catch (e) {
+      throw `error writing to ${filename} file`;
+      // log.error(`error loading ${filename} file`);
+      // process.exit(1);
+    }
+  },
+  existssync: filename => {
+    try {
+      return fs.existsSync(filename);
+    } catch (e) {
+      throw `error writing to ${filename} file`;
+      // log.error(`error loading ${filename} file`);
+      // process.exit(1);
+    }
+  },
+  resolve_path: filename => {
+    const bin = env.lookup('os:bin')._datum._datum;
+    let xpath = bin == '' ? path.resolve(bin) : path.dirname(path.resolve(bin));
+    xpath = filename.startsWith('/') ? filename : path.join(xpath, filename);
+    return xpath;
+  },
+};