force-lang 0.0.13 → 0.1.0

package/src/stack.js

@@ -1,75 +1,116 @@
-const log = require('bunny-logger');
-const obj_utils = require('./obj_utils');
+import log from 'bunny-logger';
+import obj_utils from './obj_utils.js';
 
-class Stack{
-	constructor(){
-		this._stack=[];
-	}
-	push(e){
-		this._stack.unshift(e);
-	}
-	pop(){
-		return this._stack.shift();
-	}
-	peek(){
-		return this._stack[0];
-	}
-	look_at(i){
-		return this._stack[i];
-	}
-	item_to_str(item){
-		var str = '{';
-		str += item._type;
-		if(item._name) str += ' ' + item._name;
-		try{
-		switch(item._type){
-			case 'TC_NUM':
-			case 'TC_STR':
-			case 'TC_BOOL':
-				str += ' ' + item._datum;
-				break;
-			case 'TC_VAR':
-				if(item._datum._type=='TC_JSON') str += ' ' + obj_utils.stringify(item._datum._datum);
-				else str += ' ' + item._datum._datum;
-				break;
-			case 'TC_JSON':
-				str += ' ' + obj_utils.stringify(item._datum);
-				break;
-			case 'TC_FUNC_JS':
-				str += ' ' + obj_utils.stringify(item._datum);
-				break;
-			case 'TC_LAMBDA_FUNC':
-				str += ' ' //+ JSON.stringify(item._datum._datum);
-				break;
-			case 'TC_ERR':
-				str += ' ' + JSON.stringify(item._datum);
-				break;
-			case 'TC_PROMISE':
-				str += ' ' + item._datum;
-				break;
-			default:
-				break;
-		}
-		}catch(e) {
-			str += ' ... ';
-		}
-		str += '}';
-		return str;
-	}
-	print(){
-		var pos=1;
-		if(this._stack.length == 0){
-			log.info('(empty)');
-			return;
-		}
-		for(var item of this._stack){
-			log.info(`${pos}: ${this.item_to_str(item)}`);
-			pos++;
-		}
-	}
-	print_debug(){
-		log.info(this._stack);
-	}
+class Stack {
+  constructor() {
+    this._stack = [];
+    this._rstack = [];
+  }
+
+  cloneJS(e) {
+    return typeof e === 'object' ? JSON.parse(JSON.stringify(e)) : e;
+  }
+
+  push(e) {
+    this._stack.unshift(e);
+  }
+
+  pop() {
+    return this._stack.shift();
+  }
+
+  rpush(e) {
+    this._rstack.unshift(e);
+  }
+
+  rpop() {
+    return this._rstack.shift();
+  }
+
+  peek() {
+    // 		if(this._stack[0]?._type === 'TC_FUNC_JS') {
+    // 			return this._stack[0];
+    // 		}
+    // 		if(this._stack[0]?._type==='TC_JSON') {
+    // 			return this._stack[0];
+    // 		}
+    // 		//return this.cloneJS(this._stack[0]);
+    return this._stack[0];
+  }
+
+  rpeek() {
+    return this._rstack[0];
+  }
+
+  look_at(i) {
+    // return this.cloneJS(this._stack[i]);
+    return this._stack[i];
+  }
+
+  get_list() {
+    return this._stack;
+  }
+
+  item_to_str(item) {
+    let str = '{';
+    str += item._type;
+    if (item._name) {
+      str += ` ${item._name}`;
+    }
+    try {
+      switch (item._type) {
+        case 'TC_NUM':
+        case 'TC_STR':
+        case 'TC_BOOL':
+          str += ` ${item._datum}`;
+          break;
+        case 'TC_VAR':
+          if (item._datum._type == 'TC_JSON') {
+            str += ` ${obj_utils.stringify(item._datum._datum)}`;
+          } else {
+            str += ` ${item._datum._datum}`;
+          }
+          break;
+        case 'TC_JSON':
+          str += ` ${obj_utils.stringify(item._datum)}`;
+          break;
+        case 'TC_FUNC_JS':
+          str += ` ${obj_utils.stringify(item._datum)}`;
+          break;
+        case 'TC_LAMBDA_FUNC':
+          str += ' '; // + JSON.stringify(item._datum._datum);
+          break;
+        case 'TC_ERR':
+          str += ` ${JSON.stringify(item._datum)}`;
+          break;
+        case 'TC_PROMISE':
+          str += ` ${item._datum}`;
+          break;
+        default:
+          break;
+      }
+    } catch (e) {
+      str += ' ... ';
+    }
+    str += '}';
+    return str;
+  }
+
+  print() {
+    let pos = 1;
+    if (this._stack.length == 0) {
+      log.info('(empty)');
+      return;
+    }
+    for (const item of this._stack) {
+      log.info(`${pos}: ${this.item_to_str(item)}`);
+      pos++;
+    }
+  }
+
+  print_debug() {
+    log.info(this._stack);
+  }
 }
 
-module.exports = Stack;
+export default Stack;

package/src/token-stream.js

@@ -1,11 +1,9 @@
-'use strict';
+import log from 'bunny-logger';
 
-const log = require('bunny-logger');
-
-class TokenStream{
-  constructor(tokens, filename){
-    if(!Array.isArray(tokens)){
-      //return false;
+class TokenStream {
+  constructor(tokens, filename) {
+    if (!Array.isArray(tokens)) {
+      // return false;
       throw new TypeError('tokens must be passed to TokenStream as an array.');
     }
     this._tokens = tokens;
@@ -13,61 +11,69 @@ class TokenStream{
     this._col = 1;
     this._filename = filename;
   }
-  set_filename(name){
+
+  set_filename(name) {
     this._filename = name;
   }
+
   lookahead(index) {
     if (this._tokens.length <= index) {
       return false;
-      //throw new Error('Cannot read past the end of a stream');
+      // throw new Error('Cannot read past the end of a stream');
     }
     return this._tokens[index];
   }
+
   peek() {
     if (this._tokens.length === 0) {
       return false;
-      //throw new Error('Cannot read past the end of a stream');
+      // throw new Error('Cannot read past the end of a stream');
     }
     return this._tokens[0];
   }
+
   advance() {
     if (this._tokens.length === 0) {
       return false;
-      //throw new Error('Cannot read past the end of a stream');
+      // throw new Error('Cannot read past the end of a stream');
     }
     this._col++;
-    try{
-      if(this.peek()=='\n'){
-        this._col=1;
+    try {
+      if (this.peek() == '\n') {
+        this._col = 1;
         this._line++;
       }
-    }catch(e){
-      //eof
+    } catch (e) {
+      // eof
       this._col--;
     }
     return this._tokens.shift();
   }
+
   defer(token) {
     this._col--;
-    try{
-      if(this.peek()=='\n'){
+    try {
+      if (this.peek() == '\n') {
         this._col = 1;
         this._line--;
       }
-    }catch(e){
-
-    }
+    } catch (e) {}
     this._tokens.unshift(token);
   }
-  print(){
-    if(this._filename) log.info(`in file ${this._filename}`);
+
+  print() {
+    if (this._filename) {
+      log.info(`in file ${this._filename}`);
+    }
     log.info(`at line ${this._line} , col ${this._col}`);
   }
-  print_err(){
-    if(this._filename) log.error(`in file ${this._filename}`);
+
+  print_err() {
+    if (this._filename) {
+      log.error(`in file ${this._filename}`);
+    }
     log.error(`at line ${this._line} , col ${this._col}`);
   }
-};
-
-module.exports = TokenStream;
+}
 
+export default TokenStream;

package/tests/pippo.j

@@ -1,4 +1,4 @@
-#!/usr/local/bin/force
+#!/usr/bin/env force
 
 "Hi !!!"
 .

package/tests/test-js-require.js

@@ -1,9 +1,13 @@
-module.exports= {
-	pippo:2,
-	pluto:"pluto",
-	kk:()=>{return 2;},
-	succ:(x)=>{return x+1;},
-	add:(x,y)=>{return x+y;},
-	kk2:function(){ return this.pluto;},
-	alvaro: function(){return "ww";}
-}
+export default {
+  pippo: 2,
+  pluto: 'pluto',
+  kk: () => 2,
+  succ: x => x + 1,
+  add: (x, y) => x + y,
+  kk2() {
+    return this.pluto;
+  },
+  alvaro() {
+    return 'ww';
+  },
+};

package/tests/test.j

@@ -1,4 +1,4 @@
-#!/usr/local/bin/force
+#!/usr/bin/env force
 
 : xx2 33 44 ;
 xx2

package/tests/unit_tests.j

@@ -1,4 +1,4 @@
-#!../src/force -f
+#!/usr/bin/env force
 
 : eq = ;
 

package/.eslintrc.js

@@ -1,60 +0,0 @@
-module.exports = {
-    env: {
-        es6: true,
-        node: true,
-    },
-    extends: ['airbnb-base', 'prettier'],
-    plugins: ['prettier'],
-    rules: {
-        'prettier/prettier': [
-            'error',
-            {
-                printWidth: 120,
-                tabWidth: 2, // reformat to 2 eventually
-                useTabs: false, // default
-                semi: true, // default
-                singleQuote: true,
-                trailingComma: 'all',
-                bracketSpacing: true, // default
-                jsxBracketSameLine: true,
-                arrowParens: 'avoid', // default
-            },
-        ],
-        indent: ['warn', 2],
-        camelcase: [0, { properties: 'never' }],
-        eqeqeq: ['error', 'always'],
-        curly: ['error', 'all'],
-        'no-prototype-builtins': 0, // refactor and enable
-        'consistent-return': 0, // refactor and enable
-        'no-param-reassign': 0, // refactor and enable
-        'no-unsafe-finally': 0, // refactor and enable
-        'no-use-before-define': 0, // refactor and enable
-        'import/no-unresolved': 0, // some linter import errors
-        'no-undef': 0,
-        'class-methods-use-this': 0, // refactor and enable
-        'vue/max-attributes-per-line': [
-            'error',
-            {
-                singleline: 5,
-                multiline: {
-                    max: 5,
-                    allowFirstLine: true,
-                },
-            },
-        ],
-        'max-len': ['warn', 1000], // usage of SVG
-        'no-restricted-syntax': [
-            'error',
-            {
-                selector: 'LabeledStatement',
-                message:
-                    'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.',
-            },
-            {
-                selector: 'WithStatement',
-                message:
-                    '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.',
-            },
-        ],
-    },
-};