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

basic:fixed broken PRINT and some others

Browse Source
This commit is contained in:
minjaesong
2020-11-15 17:40:58 +09:00
parent 7db476d095
commit 552cd6da0e
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
assets/tbas/basic.js
View File

@@ -214,7 +214,7 @@ let parseSigil = function(s) {
else if (s.endsWith("!") || s.endsWith("#")) else if (s.endsWith("!") || s.endsWith("#"))
rettype = "float"; rettype = "float";
return {name:(rettype === undefined) ? s.toUpperCase() : s.substring(0, s.length - 1).toUpperCase(), type:rettype}; return {sgName:(rettype === undefined) ? s.toUpperCase() : s.substring(0, s.length - 1).toUpperCase(), sgType:rettype};
} }
let literalTypes = ["string", "number", "bool", "array"]; let literalTypes = ["string", "number", "bool", "array"];
/* /*
@@ -226,7 +226,7 @@ let resolve = function(variable) {
if (literalTypes.includes(variable.troType)) if (literalTypes.includes(variable.troType))
return variable.troValue; return variable.troValue;
else if (variable.troType == "literal") { else if (variable.troType == "literal") {
var basicVar = bStatus.vars[parseSigil(variable.troValue).name]; var basicVar = bStatus.vars[parseSigil(variable.troValue).sgName];
return (basicVar !== undefined) ? basicVar.bvLiteral : undefined; return (basicVar !== undefined) ? basicVar.bvLiteral : undefined;
} }
else if (variable.troType == "null") else if (variable.troType == "null")
@@ -310,9 +310,9 @@ bStatus.builtin = {
var sigil = parseSigil(args[0].troValue); var sigil = parseSigil(args[0].troValue);
var rh = resolve(args[1]); var rh = resolve(args[1]);
if (rh === undefined) throw lang.refError(lnum, args[1].troValue); if (rh === undefined) throw lang.refError(lnum, args[1].troValue);
var type = sigil.type || JStoBASICtype(rh) var type = sigil.sgType || JStoBASICtype(rh)
bStatus.vars[sigil.name] = new BasicVar(rh, type); bStatus.vars[sigil.sgName] = new BasicVar(rh, type);
}, },
"==" : function(lnum, args) { "==" : function(lnum, args) {
return twoArg(lnum, args, function(lh, rh) { return lh == rh; }); return twoArg(lnum, args, function(lh, rh) { return lh == rh; });
@@ -413,9 +413,7 @@ bStatus.builtin = {
return a; return a;
}, },
"PRINT" : function(lnum, args, seps) { "PRINT" : function(lnum, args, seps) {
serial.printerr("PRINT args = "+args); //serial.println("BASIC func: PRINT -- args="+(args.map(function(it) { return it.troType+" "+it.troValue; })).join(", "));
serial.printerr("PRINT seps = "+seps);
//serial.println("BASIC func: PRINT -- args="+(args.map(function(it) { return it.type+" "+it.value; })).join(", "));
if (args.length == 0) if (args.length == 0)
println(); println();
@@ -431,14 +429,14 @@ bStatus.builtin = {
var rsvArg = resolve(args[llll]) || ""; var rsvArg = resolve(args[llll]) || "";
if (args[llll].type == "number") if (args[llll].troType == "number")
print(" "+rsvArg+" "); print(" "+rsvArg+" ");
else else
print(rsvArg); print(rsvArg);
} }
} }
if (args[args.length - 1].type != "null") println(); if (args[args.length - 1].troType != "null") println();
}, },
"EMIT" : function(lnum, args) { "EMIT" : function(lnum, args) {
if (args.length > 0) { if (args.length > 0) {
@@ -1059,7 +1057,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) serial.println("@@ SYNTAX ANALYSIS @@"); if (_debugSyntaxAnalysis) serial.println("@@ SYNTAX ANALYSIS @@");
@@ -1335,7 +1333,7 @@ bF._gotoCmds = { GOTO:1, GOSUB:1 }; // put nonzero (truthy) value here
* @return syntaxTreeReturnObject if recursion is escaped * @return syntaxTreeReturnObject if recursion is escaped
*/ */
bF._executeSyntaxTree = function(lnum, syntaxTree, recDepth) { bF._executeSyntaxTree = function(lnum, syntaxTree, recDepth) {
var _debugExec = false; var _debugExec = true;
var recWedge = "> ".repeat(recDepth); var recWedge = "> ".repeat(recDepth);
if (_debugExec) serial.println(recWedge+"@@ EXECUTE @@"); if (_debugExec) serial.println(recWedge+"@@ EXECUTE @@");
@@ -1384,7 +1382,7 @@ bF._executeSyntaxTree = function(lnum, syntaxTree, recDepth) {
// func not in builtins (e.g. array access, user-defined function defuns) // func not in builtins (e.g. array access, user-defined function defuns)
if (func === undefined) { if (func === undefined) {
let someVar = bStatus.vars[funcName]; let someVar = bStatus.vars[funcName];
if (someVar.astType != "array") { if (someVar.bvType != "array") {
serial.printerr(lang.syntaxfehler(lnum, funcName + " is not defined")); serial.printerr(lang.syntaxfehler(lnum, funcName + " is not defined"));
throw lang.syntaxfehler(lnum, funcName + " is not defined"); throw lang.syntaxfehler(lnum, funcName + " is not defined");
} }
@@ -1428,7 +1426,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);