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

basic:fixing some bugs on the parser

Browse Source
This commit is contained in:
minjaesong
2020-11-15 00:39:29 +09:00
parent 4ba004b9b7
commit 723c31b93e
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
assets/tbas/basic.js
View File

@@ -477,6 +477,7 @@ bStatus.builtin = {
"FOR" : function(lnum, args) { "FOR" : function(lnum, args) {
throw TODO(); throw TODO();
// use bStatus.forStack // use bStatus.forStack
bStatus.forStack.push(lnum);
}, },
"NEXT" : function(lnum, args) { "NEXT" : function(lnum, args) {
throw TODO(); throw TODO();
@@ -500,6 +501,9 @@ bF._is1o = function(code) {
bF._is2o = function(code) { bF._is2o = function(code) {
return (code >= 0x3C && code <= 0x3E); return (code >= 0x3C && code <= 0x3E);
}; };
bF._isUnary = function(code) {
return (code == 0x2B) || (code == 0x2D) || (code == 0x21);
}
bF._isParenOpen = function(code) { bF._isParenOpen = function(code) {
return (code == 0x28 || code == 0x5B); return (code == 0x28 || code == 0x5B);
}; };
@@ -514,27 +518,24 @@ bF._isSep = function(code) {
}; };
bF._opPrc = { bF._opPrc = {
// function call in itself has highest precedence // function call in itself has highest precedence
"^":0, "^":1,
// precedence of 1 are unary plus/minus which are pre-parenthesized
"*":2,"/":2, "*":2,"/":2,
"MOD":3, "MOD":3,
"+":4,"-":4, "+":4,"-":4,
//";":5, //";":5,
"<<":6,">>":6, "<<":6,">>":6,
"==":7,"<>":7,"><":7,"<":7,">":7,"<=":7,"=<":7,">=":7,"=>":7, "<":7,">":7,"<=":7,"=<":7,">=":7,"=>":7,
"==":8,"<>":8,"><":8,
"BAND":8, "BAND":8,
"BXOR":9, "BXOR":9,
"BOR":10, "BOR":10,
"AND":11, "AND":11,
"OR":12, "OR":12,
"=":13 "TO":13,"STEP":13,
}; "=":999
bF._isUnaryOp = function(word) {
return 5 == bF._opPrc[word];
};
bF._isOperatorWord = function(word) {
return (bF._opPrc[word] !== undefined) // force the return type to be a boolean
}; };
bF._opRh = {"^":1,"=":1};
bF._opUni = {"+":1,"-":1};
bF._keywords = { bF._keywords = {
}; };
@@ -663,6 +664,9 @@ bF._tokenise = function(lnum, cmd) {
sb += char; sb += char;
mode = "operator2"; mode = "operator2";
} }
else if (bF._isUnary(charCode)) {
tokens.push(sb); sb = "" + char; states.push(mode);
}
else if (bF._is1o(charCode)) { else if (bF._is1o(charCode)) {
throw lang.syntaxfehler(lnum, lang.badOperatorFormat); throw lang.syntaxfehler(lnum, lang.badOperatorFormat);
} }
@@ -992,7 +996,7 @@ for input "DEFUN sinc(x) = sin(x) / x"
"quote" == state || "number" == state || "bool" == state || "literal" == state; "quote" == state || "number" == state || "bool" == state || "literal" == state;
} }
var _debugSyntaxAnalysis = false; var _debugSyntaxAnalysis = true;
if (_debugSyntaxAnalysis) println("@@ SYNTAX ANALYSIS @@"); if (_debugSyntaxAnalysis) println("@@ SYNTAX ANALYSIS @@");
@@ -1007,9 +1011,9 @@ for input "DEFUN sinc(x) = sin(x) / x"
return retTreeHead; return retTreeHead;
} }
var k; let k;
var headWord = tokens[0].toLowerCase(); let headWord = tokens[0].toLowerCase();
var treeHead = new BasicAST(); let treeHead = new BasicAST();
treeHead.depth = recDepth; treeHead.depth = recDepth;
treeHead.lnum = lnum; treeHead.lnum = lnum;
@@ -1119,7 +1123,7 @@ for input "DEFUN sinc(x) = sin(x) / x"
// if there is no paren or paren does NOT start index 1 // if there is no paren or paren does NOT start index 1
// e.g. negative three should NOT require to be written as "-(3)" // e.g. negative three should NOT require to be written as "-(3)"
if ((parenStart > 1 || parenStart == -1) && (operatorPos != 1 && operatorPos != 0) && states[0] != "operator") { if ((parenStart > 1 || parenStart == -1) && (operatorPos != 1 && operatorPos != 0) && states[0] == "literal" && states[1] != "operator") {
// make a paren! // make a paren!
tokens = [].concat(tokens[0], "(", tokens.slice(1, tokens.length), ")"); tokens = [].concat(tokens[0], "(", tokens.slice(1, tokens.length), ")");
states = [].concat(states[0], "paren", states.slice(1, states.length), "paren"); states = [].concat(states[0], "paren", states.slice(1, states.length), "paren");
@@ -1344,7 +1348,7 @@ bF._executeSyntaxTree = function(lnum, syntaxTree, recDepth) {
}; };
// @returns: line number for the next command, normally (lnum + 1); if GOTO or GOSUB was met, returns its line number // @returns: line number for the next command, normally (lnum + 1); if GOTO or GOSUB was met, returns its line number
bF._interpretLine = function(lnum, cmd) { bF._interpretLine = function(lnum, cmd) {
var _debugprintHighestLevel = false; var _debugprintHighestLevel = true;
// TOKENISE // TOKENISE
var tokenisedObject = bF._tokenise(lnum, cmd); var tokenisedObject = bF._tokenise(lnum, cmd);