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

basic: changing curry operator to (~<), i thought plunger (or grabber) is semantically less awkward than the arrow

Browse Source
This commit is contained in:
minjaesong
2020-12-27 02:56:18 +09:00
parent 31ae5bbbbc
commit 83a53499bc
10 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
assets/disk0/tbas/basic.js
View File

@@ -1255,7 +1255,7 @@ if no arg text were given (e.g. "10 NEXT"), args will have zero length
}
return keys;
}},
"<~" : {f:function(lnum, stmtnum, args) { // CURRY operator
"~<" : {f:function(lnum, stmtnum, args) { // CURRY operator
return twoArg(lnum, stmtnum, args, (fn, value) => {
// TODO test only works with DEFUN'd functions
if (fn.astLeaves === undefined) throw lang.badFunctionCallFormat("Only works with DEFUN'd functions yet");
@@ -1421,12 +1421,12 @@ bF._opPrc = {
"STEP":41,
"!":50,"~":51, // array CONS and PUSH
"#": 52, // array concat
"<~": 100, // curry operator
"~<": 100, // curry operator
"~>": 101, // closure operator
"=":999,
"IN":1000
};
bF._opRh = {"^":1,"=":1,"!":1,"IN":1,"~>":1}; // <~ and ~> cannot have same associativity
bF._opRh = {"^":1,"=":1,"!":1,"IN":1,"~>":1}; // ~< and ~> cannot have same associativity
// these names appear on executeSyntaxTree as "exceptional terms" on parsing (regular function calls are not "exceptional terms")
bF._tokenise = function(lnum, cmd) {
var _debugprintStateTransition = false;
@@ -2887,24 +2887,6 @@ bF._interpretLine = function(lnum, cmd) {
}
});
// automatically apply currying
// '(<~) FNQ (P X Y)' into '(<~) FNQ ((<~) P ((<~) X Y))'
// FIXME this autocurrying is very likely to be a janky-ass-shit
syntaxTrees.forEach(syntaxTree => {
if (syntaxTree !== undefined) {
bF._recurseApplyAST(syntaxTree, tree => {
if (tree.astValue == "<~" && tree.astLeaves[1] !== undefined && tree.astLeaves[1].astLeaves[0] !== undefined) {
let subTree = new BasicAST();
subTree.astValue = "<~";
subTree.astType = "op";
subTree.astLnum = tree.astLnum;
subTree.astLeaves = [tree.astLeaves[1], tree.astLeaves[1].astLeaves[0]];
tree.astLeaves[1] = subTree;
}
});
}
});
if (_debugprintHighestLevel) {
syntaxTrees.forEach((t,i) => {
serial.println("\nParsed Statement #"+(i+1));