curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-03-16 07:56:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

fixing my stupid mistake

Browse Source
This commit is contained in:
minjaesong
2020-06-10 14:53:26 +09:00
parent faa6f9182d
commit 655f955fc5
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
assets/tbas/basic.js
View File

@@ -35,8 +35,8 @@ var reLineNum = /^[0-9]+ +[^0-9]/;
//var reBin = /^(0[Bb][01_]+)$/; //var reBin = /^(0[Bb][01_]+)$/;
// must match partial // 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 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}/g; var reOps = /\^|\*|\/|\+|\-|[<>=]{1,2}/;
var reNum = /[0-9]+/; var reNum = /[0-9]+/;
var tbasexit = false; var tbasexit = false;
@@ -210,7 +210,7 @@ basicFunctions._tokenise = function(lnum, cmd) {
} }
else if ("number" == mode) { else if ("number" == mode) {
if (basicFunctions._isNumber(charCode)) { if (basicFunctions._isNumber(charCode)) {
tokens.push(sb); sb = "" + char; states.push(mode); sb += char;
} }
else if (basicFunctions._isNumberSep(charCode)) { else if (basicFunctions._isNumberSep(charCode)) {
tokens.push(sb); sb = "" + char; states.push(mode); tokens.push(sb); sb = "" + char; states.push(mode);
@@ -252,7 +252,7 @@ basicFunctions._tokenise = function(lnum, cmd) {
} }
else if ("number2" == mode) { else if ("number2" == mode) {
if (basicFunctions._isNumber(charCode)) { if (basicFunctions._isNumber(charCode)) {
tokens.push(sb); sb = "" + char; states.push("number"); sb += char;
} }
else if (0x22 == charCode) { else if (0x22 == charCode) {
tokens.push(sb); sb = ""; states.push("number"); tokens.push(sb); sb = ""; states.push("number");
@@ -281,7 +281,7 @@ basicFunctions._tokenise = function(lnum, cmd) {
} }
else if ("operator" == mode) { else if ("operator" == mode) {
if (basicFunctions._isSecondOp(charCode)) { if (basicFunctions._isSecondOp(charCode)) {
tokens.push(sb); sb = "" + char; states.push(mode); sb += char;
mode = "operator2"; mode = "operator2";
} }
else if (basicFunctions._isFirstOp(charCode)) { 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 (_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 != 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 k;
var headWord = tokens[0].toLowerCase(); var headWord = tokens[0].toLowerCase();

2
src/net/torvald/tsvm/VMJSR223Delegate.kt
View File

@@ -18,7 +18,7 @@ class VMJSR223Delegate(val vm: VM) {
vm.getPrintStream().write(s.toByteArray()) vm.getPrintStream().write(s.toByteArray())
} }
fun println(s: String) { fun println(s: String) {
//System.out.println("[Nashorn] $s") System.out.println("[Nashorn] $s")
vm.getPrintStream().write((s + '\n').toByteArray()) vm.getPrintStream().write((s + '\n').toByteArray())
} }
fun println() = print('\n') fun println() = print('\n')