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

basic:leftmost derivatives are now actually leftmost

Browse Source
This commit is contained in:
minjaesong
2020-11-24 11:17:25 +09:00
parent 471575087a
commit 87b08cd9ee
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/tbas/basic.js
View File

@@ -720,7 +720,7 @@ bF._opPrc = {
"OR":12, "OR":12,
"TO":13, "TO":13,
"STEP":14, "STEP":14,
":":15,"~":15, // FIXME it seems every operator is utilised as rightmost-derivative ":":15,"~":15, // array CONS and PUSH
"=":999 "=":999
}; };
bF._opRh = {"^":1,"=":1,":":1}; bF._opRh = {"^":1,"=":1,":":1};
@@ -1320,7 +1320,10 @@ for input "DEFUN sinc(x) = sin(x) / x"
} }
if (parenDepth == 0) { if (parenDepth == 0) {
if (states[k] == "operator" && isSemanticLiteral(tokens[k-1], states[k-1]) && bF._opPrc[tokens[k].toUpperCase()] > topmostOpPrc) { if (states[k] == "operator" && isSemanticLiteral(tokens[k-1], states[k-1]) &&
((bF._opPrc[tokens[k].toUpperCase()] > topmostOpPrc) ||
(!bF._opRh[tokens[k].toUpperCase()] && bF._opPrc[tokens[k].toUpperCase()] == topmostOpPrc))
) {
topmostOp = tokens[k].toUpperCase(); topmostOp = tokens[k].toUpperCase();
topmostOpPrc = bF._opPrc[tokens[k].toUpperCase()]; topmostOpPrc = bF._opPrc[tokens[k].toUpperCase()];
operatorPos = k; operatorPos = k;
@@ -1362,7 +1365,10 @@ for input "DEFUN sinc(x) = sin(x) / x"
separators.push(k); separators.push(k);
} }
if (parenDepth == 0) { if (parenDepth == 0) {
if (states[k] == "operator" && isSemanticLiteral(tokens[k-1], states[k-1]) && bF._opPrc[tokens[k].toUpperCase()] > topmostOpPrc) { if (states[k] == "operator" && isSemanticLiteral(tokens[k-1], states[k-1]) &&
((bF._opPrc[tokens[k].toUpperCase()] > topmostOpPrc) ||
(!bF._opRh[tokens[k].toUpperCase()] && bF._opPrc[tokens[k].toUpperCase()] == topmostOpPrc))
) {
topmostOp = tokens[k].toUpperCase(); topmostOp = tokens[k].toUpperCase();
topmostOpPrc = bF._opPrc[tokens[k].toUpperCase()]; topmostOpPrc = bF._opPrc[tokens[k].toUpperCase()];
operatorPos = k; operatorPos = k;