From 655f955fc5c109ba74a3c90ce7cdee38e2a5b5f2 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Wed, 10 Jun 2020 14:53:26 +0900
Subject: [PATCH] fixing my stupid mistake

---
 assets/tbas/basic.js                     | 15 +++++++++------
 src/net/torvald/tsvm/VMJSR223Delegate.kt |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/assets/tbas/basic.js b/assets/tbas/basic.js
index 4918faf..db8d55d 100644
--- a/assets/tbas/basic.js
+++ b/assets/tbas/basic.js
@@ -35,8 +35,8 @@ var reLineNum = /^[0-9]+ +[^0-9]/;
 //var reBin = /^(0[Bb][01_]+)$/;
 
 // must match partial
-var reNumber = /([0-9]*[.][0-9]+[eE]*[\-+0-9]*[fF]*|[0-9]+[.eEfF][0-9+\-]*[fF]?)|([0-9_]+)|(0[Xx][0-9A-Fa-f_]+)|(0[Bb][01_]+)/g;
-var reOps = /\^|\*|\/|\+|\-|[<>=]{1,2}/g;
+var reNumber = /([0-9]*[.][0-9]+[eE]*[\-+0-9]*[fF]*|[0-9]+[.eEfF][0-9+\-]*[fF]?)|([0-9_]+)|(0[Xx][0-9A-Fa-f_]+)|(0[Bb][01_]+)/;
+var reOps = /\^|\*|\/|\+|\-|[<>=]{1,2}/;
 
 var reNum = /[0-9]+/;
 var tbasexit = false;
@@ -210,7 +210,7 @@ basicFunctions._tokenise = function(lnum, cmd) {
         }
         else if ("number" == mode) {
             if (basicFunctions._isNumber(charCode)) {
-                tokens.push(sb); sb = "" + char; states.push(mode);
+                sb += char;
             }
             else if (basicFunctions._isNumberSep(charCode)) {
                 tokens.push(sb); sb = "" + char; states.push(mode);
@@ -252,7 +252,7 @@ basicFunctions._tokenise = function(lnum, cmd) {
         }
         else if ("number2" == mode) {
             if (basicFunctions._isNumber(charCode)) {
-                tokens.push(sb); sb = "" + char; states.push("number");
+                sb += char;
             }
             else if (0x22 == charCode) {
                 tokens.push(sb); sb = ""; states.push("number");
@@ -281,7 +281,7 @@ basicFunctions._tokenise = function(lnum, cmd) {
         }
         else if ("operator" == mode) {
             if (basicFunctions._isSecondOp(charCode)) {
-                tokens.push(sb); sb = "" + char; states.push(mode);
+                sb += char;
                 mode = "operator2";
             }
             else if (basicFunctions._isFirstOp(charCode)) {
@@ -580,7 +580,10 @@ basicFunctions._parseTokens = function(lnum, tokens, states, recDepth) {
     if (_debugSyntaxAnalysis) println("Parser Ln "+lnum+", Rec "+recDepth+", Tkn: "+tokens.join("/"));
 
     if (tokens.length != states.length) throw "InternalError: size of tokens and states does not match (line: "+lnum+", recursion depth: "+recDepth+")";
-    if (tokens.length == 0) throw "InternalError: empty tokens";
+    if (tokens.length == 0) {
+        if (_debugSyntaxAnalysis) println("*empty tokens*");
+        return new BasicAST();
+    }
 
     var k;
     var headWord = tokens[0].toLowerCase();
diff --git a/src/net/torvald/tsvm/VMJSR223Delegate.kt b/src/net/torvald/tsvm/VMJSR223Delegate.kt
index 895cead..900bda1 100644
--- a/src/net/torvald/tsvm/VMJSR223Delegate.kt
+++ b/src/net/torvald/tsvm/VMJSR223Delegate.kt
@@ -18,7 +18,7 @@ class VMJSR223Delegate(val vm: VM) {
         vm.getPrintStream().write(s.toByteArray())
     }
     fun println(s: String) {
-        //System.out.println("[Nashorn] $s")
+        System.out.println("[Nashorn] $s")
         vm.getPrintStream().write((s + '\n').toByteArray())
     }
     fun println() = print('\n')