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

basic: syntax tree of UNARYMINUS with number will be converted to -number

Browse Source
This commit is contained in:
minjaesong
2020-12-17 21:13:10 +09:00
parent efde387d73
commit e280e4f4c7
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
assets/basic.js
View File

@@ -779,7 +779,7 @@ if no arg text were given (e.g. "10 NEXT"), args will have zero length
if (args[args.length - 1] !== undefined && args[args.length - 1].troType != "null") println(); if (args[args.length - 1] !== undefined && args[args.length - 1].troType != "null") println();
}, },
"POKE" : function(lnum, stmtnum, args) { "POKE" : function(lnum, stmtnum, args) {
twoArgNum(lnum, args, (lh,rh) => sys.poke(lh, rh)); twoArgNum(lnum, stmtnum, args, (lh,rh) => sys.poke(lh, rh));
}, },
"PEEK" : function(lnum, stmtnum, args) { "PEEK" : function(lnum, stmtnum, args) {
return oneArgNum(lnum, stmtnum, args, (lh) => sys.peek(lh)); return oneArgNum(lnum, stmtnum, args, (lh) => sys.peek(lh));
@@ -814,7 +814,7 @@ if no arg text were given (e.g. "10 NEXT"), args will have zero length
bStatus.vars = initBvars(); bStatus.vars = initBvars();
}, },
"PLOT" : function(lnum, stmtnum, args) { "PLOT" : function(lnum, stmtnum, args) {
threeArgNum(lnum, args, (xpos, ypos, color) => graphics.plotPixel(xpos, ypos, color)); threeArgNum(lnum, stmtnum, args, (xpos, ypos, color) => graphics.plotPixel(xpos, ypos, color));
}, },
"AND" : function(lnum, stmtnum, args) { "AND" : function(lnum, stmtnum, args) {
if (args.length != 2) throw lang.syntaxfehler(lnum, args.length+lang.aG); if (args.length != 2) throw lang.syntaxfehler(lnum, args.length+lang.aG);
@@ -1674,7 +1674,7 @@ bF._parserElaboration = function(lnum, tokens, states) {
} }
}; };
bF._recurseApplyAST = function(tree, action) { bF._recurseApplyAST = function(tree, action) {
if (tree.astLeaves[0] === undefined) if (tree.astLeaves === undefined || tree.astLeaves[0] === undefined)
return action(tree); return action(tree);
else { else {
action(tree); action(tree);
@@ -2684,7 +2684,7 @@ bF._executeSyntaxTree = function(lnum, stmtnum, syntaxTree, recDepth) {
}; };
// @return ARRAY of BasicAST // @return ARRAY of BasicAST
bF._interpretLine = function(lnum, cmd) { bF._interpretLine = function(lnum, cmd) {
var _debugprintHighestLevel = false; let _debugprintHighestLevel = false;
if (cmd.toUpperCase().startsWith("REM")) { if (cmd.toUpperCase().startsWith("REM")) {
if (_debugprintHighestLevel) serial.println(lnum+" "+cmd); if (_debugprintHighestLevel) serial.println(lnum+" "+cmd);
@@ -2692,16 +2692,38 @@ bF._interpretLine = function(lnum, cmd) {
} }
// TOKENISE // TOKENISE
var tokenisedObject = bF._tokenise(lnum, cmd); let tokenisedObject = bF._tokenise(lnum, cmd);
var tokens = tokenisedObject.tokens; let tokens = tokenisedObject.tokens;
var states = tokenisedObject.states; let states = tokenisedObject.states;
// ELABORATION : distinguish numbers and operators from literals // ELABORATION : distinguish numbers and operators from literals
bF._parserElaboration(lnum, tokens, states); bF._parserElaboration(lnum, tokens, states);
// PARSING (SYNTAX ANALYSIS) // PARSING (SYNTAX ANALYSIS)
var syntaxTrees = bF._parseTokens(lnum, tokens, states); let syntaxTrees = bF._parseTokens(lnum, tokens, states);
// syntax tree pruning
// turn UNARYMINUS(num) to -num
syntaxTrees.forEach(syntaxTree => {
bF._recurseApplyAST(syntaxTree, tree => {
if (tree.astValue == "UNARYMINUS" && tree.astType == "op" &&
tree.astLeaves[1] === undefined && tree.astLeaves[0] !== undefined && tree.astLeaves[0].astType == "num"
) {
tree.astValue = -(tree.astLeaves[0].astValue);
tree.astType = JStoBASICtype(tree.astValue);
tree.astLeaves = [];
}
else if (tree.astValue == "UNARYPLUS" && tree.astType == "op" &&
tree.astLeaves[1] === undefined && tree.astLeaves[0] !== undefined && tree.astLeaves[0].astType == "num"
) {
tree.astValue = +(tree.astLeaves[0].astValue);
tree.astType = JStoBASICtype(tree.astValue);
tree.astLeaves = [];
}
});
});
if (_debugprintHighestLevel) { if (_debugprintHighestLevel) {
syntaxTrees.forEach((t,i) => { syntaxTrees.forEach((t,i) => {
serial.println("\nParsed Statement #"+(i+1)); serial.println("\nParsed Statement #"+(i+1));

6
assets/downkeys2.bas Normal file
View File

@@ -0,0 +1,6 @@
10 POKE -40,255
20 FOR K=-41 TO -48 STEP -1
30 PRINT(PEEK(K);" ";)
40 NEXT
50 PRINT
60 GOTO 10