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

defun actually works

Browse Source
This commit is contained in:
minjaesong
2020-12-08 22:35:51 +09:00
parent e2d466e604
commit 9fa9a0a203
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
assets/basic.js
View File

@@ -47,6 +47,7 @@ function isNumable(s) {
let lang = {}; let lang = {};
lang.badNumberFormat = Error("Illegal number format"); lang.badNumberFormat = Error("Illegal number format");
lang.badOperatorFormat = Error("Illegal operator format"); lang.badOperatorFormat = Error("Illegal operator format");
lang.divByZero = Error("Division by zero");
lang.badFunctionCallFormat = function(reason) { lang.badFunctionCallFormat = function(reason) {
return Error("Illegal function call" + ((reason) ? ": "+reason : "")); return Error("Illegal function call" + ((reason) ? ": "+reason : ""));
}; };
@@ -381,6 +382,7 @@ let ForGen = function(s,e,t) {
//if (mutated === undefined) throw "InternalError: parametre is missing"; //if (mutated === undefined) throw "InternalError: parametre is missing";
if (mutated !== undefined) this.current = (mutated|0); if (mutated !== undefined) this.current = (mutated|0);
this.current += this.step; this.current += this.step;
serial.println(`[BASIC.FORGEN] ${(mutated|0)} -> ${this.current}`);
return this.hasNext() ? this.current : undefined; return this.hasNext() ? this.current : undefined;
} }
@@ -638,7 +640,10 @@ if no arg text were given (e.g. "10 NEXT"), args will have zero length
return twoArgNum(lnum, args, (lh,rh) => lh * rh); return twoArgNum(lnum, args, (lh,rh) => lh * rh);
}, },
"/" : function(lnum, args) { "/" : function(lnum, args) {
return twoArgNum(lnum, args, (lh,rh) => lh / rh); return twoArgNum(lnum, args, (lh,rh) => {
if (rh == 0) throw lang.divByZero;
return lh / rh
});
}, },
"MOD" : function(lnum, args) { "MOD" : function(lnum, args) {
return twoArgNum(lnum, args, (lh,rh) => lh % rh); return twoArgNum(lnum, args, (lh,rh) => lh % rh);
@@ -1890,7 +1895,7 @@ bF._parseTokens = function(lnum, tokens, states, recDepth) {
} }
separators.slice(1, separators.length - 1).forEach((v) => { if (v !== undefined) seps.push(tokens[v]) }); separators.slice(1, separators.length - 1).forEach((v) => { if (v !== undefined) seps.push(tokens[v]) });
} }
else throw lang.syntaxfehler(lnum, lang.badFunctionCallFormat); else throw lang.badFunctionCallFormat();
treeHead.astLeaves = leaves;//.filter(function(__v) { return __v !== undefined; }); treeHead.astLeaves = leaves;//.filter(function(__v) { return __v !== undefined; });
treeHead.astSeps = seps; treeHead.astSeps = seps;
} }
@@ -1928,7 +1933,7 @@ bF._gotoCmds = {GOTO:1,GOSUB:1,RETURN:1,NEXT:1,END:1,BREAKTO:1}; // put nonzero
*/ */
bF._troNOP = function(lnum) { return new SyntaxTreeReturnObj("null", undefined, lnum + 1); } bF._troNOP = function(lnum) { return new SyntaxTreeReturnObj("null", undefined, lnum + 1); }
bF._executeSyntaxTree = function(lnum, syntaxTree, recDepth) { bF._executeSyntaxTree = function(lnum, syntaxTree, recDepth) {
var _debugExec = true; var _debugExec = false;
var recWedge = "> ".repeat(recDepth); var recWedge = "> ".repeat(recDepth);
if (_debugExec) serial.println(recWedge+"@@ EXECUTE @@"); if (_debugExec) serial.println(recWedge+"@@ EXECUTE @@");
@@ -1970,7 +1975,7 @@ bF._executeSyntaxTree = function(lnum, syntaxTree, recDepth) {
} }
} }
else if ("DEFUN" == funcName) { else if ("DEFUN" == funcName) {
if (recDepth > 0) throw lang.badFunctionCallFormat; // nested DEFUN is TODO and it involves currying and de bruijn indexing if (recDepth > 0) throw lang.badFunctionCallFormat(); // nested DEFUN is TODO and it involves currying and de bruijn indexing
if (syntaxTree.astLeaves.length !== 1) throw lang.syntaxfehler(lnum, "DEFUN 1"); if (syntaxTree.astLeaves.length !== 1) throw lang.syntaxfehler(lnum, "DEFUN 1");
if (syntaxTree.astLeaves[0].astValue !== "=") throw lang.syntaxfehler(lnum, "DEFUN 2 -- "+syntaxTree.astLeaves[0].astValue); if (syntaxTree.astLeaves[0].astValue !== "=") throw lang.syntaxfehler(lnum, "DEFUN 2 -- "+syntaxTree.astLeaves[0].astValue);
if (syntaxTree.astLeaves[0].astLeaves.length !== 2) throw lang.syntaxfehler(lnum, "DEFUN 3"); if (syntaxTree.astLeaves[0].astLeaves.length !== 2) throw lang.syntaxfehler(lnum, "DEFUN 3");

4
assets/sinc.bas Normal file
View File

@@ -0,0 +1,4 @@
10 DEFUN SINC(X)=SIN(X)/X
20 FOR K=1 TO 10
30 PRINT SINC(K)
40 NEXT