forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

this code is so bad. fixed ternary... OR HAVE I?

This commit is contained in:
Adam D. Ruppe 2020-09-06 22:38:53 -04:00
parent 33534c838b
commit 6b8c5a55bd
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
script.d
View File

@ -49,6 +49,9 @@
your existing knowledge from Javascript will carry over, making it hopefully easy to use right out of the box. your existing knowledge from Javascript will carry over, making it hopefully easy to use right out of the box.
See the [#examples] to quickly get the feel of the script language as well as the interop. See the [#examples] to quickly get the feel of the script language as well as the interop.
I haven't benchmarked it, but I expect it is pretty slow. My goal is to see what is possible for easy interoperability
with dynamic functionality and D rather than speed.
$(TIP $(TIP
A goal of this language is to blur the line between D and script, but A goal of this language is to blur the line between D and script, but
@ -79,6 +82,7 @@
OVERVIEW OVERVIEW
$(LIST $(LIST
* Can subclass D objects in script. See [http://dpldocs.info/this-week-in-d/Blog.Posted_2020_04_27.html#subclasses-in-script
* easy interop with D thanks to arsd.jsvar. When interpreting, pass a var object to use as globals. * easy interop with D thanks to arsd.jsvar. When interpreting, pass a var object to use as globals.
This object also contains the global state when interpretation is done. This object also contains the global state when interpretation is done.
* mostly familiar syntax, hybrid of D and Javascript * mostly familiar syntax, hybrid of D and Javascript
@ -2564,6 +2568,7 @@ Expression parsePart(MyTokenStreamHere)(ref MyTokenStreamHere tokens) {
//tokens.popFront(); //tokens.popFront();
auto parenthetical = new ParentheticalExpression(parseExpression(tokens)); auto parenthetical = new ParentheticalExpression(parseExpression(tokens));
tokens.requireNextToken(ScriptToken.Type.symbol, ")"); tokens.requireNextToken(ScriptToken.Type.symbol, ")");
return parenthetical; return parenthetical;
case "[": case "[":
// array literal // array literal
@ -2775,6 +2780,7 @@ Expression parseAddend(MyTokenStreamHere)(ref MyTokenStreamHere tokens) {
case ",": // possible FIXME these are passed on to the next thing case ",": // possible FIXME these are passed on to the next thing
case ";": case ";":
case ":": // idk case ":": // idk
case "?":
return e1; return e1;
case "|>": case "|>":
@ -2793,15 +2799,6 @@ Expression parseAddend(MyTokenStreamHere)(ref MyTokenStreamHere tokens) {
tokens.popFront(); tokens.popFront();
e1 = new BinaryExpression(peek.str, e1, parseExpression(tokens)); e1 = new BinaryExpression(peek.str, e1, parseExpression(tokens));
break; break;
case "?": // is this the right precedence?
auto e = new TernaryExpression();
e.condition = e1;
tokens.requireNextToken(ScriptToken.Type.symbol, "?");
e.ifTrue = parseExpression(tokens);
tokens.requireNextToken(ScriptToken.Type.symbol, ":");
e.ifFalse = parseExpression(tokens);
e1 = e;
break;
case "~": case "~":
// FIXME: make sure this has the right associativity // FIXME: make sure this has the right associativity
@ -3217,8 +3214,19 @@ Expression parseExpression(MyTokenStreamHere)(ref MyTokenStreamHere tokens, bool
//throw new ScriptCompileException("Parse error, missing finally or catch after try", tryToken.lineNumber); //throw new ScriptCompileException("Parse error, missing finally or catch after try", tryToken.lineNumber);
ret = e; ret = e;
} else } else {
ret = parseAddend(tokens); ret = parseAddend(tokens);
}
if(!tokens.empty && tokens.peekNextToken(ScriptToken.Type.symbol, "?")) {
auto e = new TernaryExpression();
e.condition = ret;
tokens.requireNextToken(ScriptToken.Type.symbol, "?");
e.ifTrue = parseExpression(tokens);
tokens.requireNextToken(ScriptToken.Type.symbol, ":");
e.ifFalse = parseExpression(tokens);
ret = e;
}
} else { } else {
//assert(0); //assert(0);
// return null; // return null;
@ -3423,6 +3431,7 @@ Expression parseStatement(MyTokenStreamHere)(ref MyTokenStreamHere tokens, strin
case "continue": case "continue":
case "break": case "break":
case "return": case "return":
return parseExpression(tokens); return parseExpression(tokens);
// unary prefix operators // unary prefix operators
case "!": case "!":