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

pipeline operator

This commit is contained in:
Adam D. Ruppe 2019-10-04 21:14:08 -04:00
parent c9940750b6
commit a318432994
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jsvar.d
View File

@ -391,7 +391,7 @@ private var _op(alias _this, alias this2, string op, T)(T t) if(op != "~") {
return _op!(_this, this2, op)(t._payload._floating); return _op!(_this, this2, op)(t._payload._floating);
if(t.payloadType() == var.Type.String) if(t.payloadType() == var.Type.String)
return _op!(_this, this2, op)(t._payload._string); return _op!(_this, this2, op)(t._payload._string);
assert(0, to!string(t.payloadType())); throw new Exception("Attempted invalid operator `" ~ op ~ "` on variable of type " ~ to!string(t.payloadType()));
} else { } else {
if(this2.payloadType() == var.Type.Integral) { if(this2.payloadType() == var.Type.Integral) {
auto l = this2._payload._integral; auto l = this2._payload._integral;

44
script.d
View File

@ -10,6 +10,8 @@
state consists of all variables and source to functions state consists of all variables and source to functions
Steal Ruby's [regex, capture] maybe Steal Ruby's [regex, capture] maybe
and the => operator too
*/ */
/++ /++
A small script interpreter that builds on [arsd.jsvar] to be easily embedded inside and to have has easy A small script interpreter that builds on [arsd.jsvar] to be easily embedded inside and to have has easy
@ -99,6 +101,7 @@
Variable names that start with __ are reserved and you shouldn't use them. Variable names that start with __ are reserved and you shouldn't use them.
* int, float, string, array, bool, and json!q{} literals * int, float, string, array, bool, and json!q{} literals
* var.prototype, var.typeof. prototype works more like Mozilla's __proto__ than standard javascript prototype. * var.prototype, var.typeof. prototype works more like Mozilla's __proto__ than standard javascript prototype.
* the |> pipeline operator
* classes: * classes:
// inheritance works // inheritance works
class Foo : bar { class Foo : bar {
@ -347,6 +350,9 @@ private enum string[] symbols = [
"+=", "-=", "*=", "/=", "~=", "==", "<=", ">=","!=", "%=", "+=", "-=", "*=", "/=", "~=", "==", "<=", ">=","!=", "%=",
"&=", "|=", "^=", "&=", "|=", "^=",
"..", "..",
"<<", ">>", // FIXME
"|>",
"=>", // FIXME
"?", ".",",",";",":", "?", ".",",",";",":",
"[", "]", "{", "}", "(", ")", "[", "]", "{", "}", "(", ")",
"&", "|", "^", "&", "|", "^",
@ -1126,10 +1132,15 @@ class BinaryExpression : Expression {
//writeln(left, " "~op~" ", right); //writeln(left, " "~op~" ", right);
var n; var n;
foreach(ctOp; CtList!("+", "-", "*", "/", "==", "!=", "<=", ">=", ">", "<", "~", "&&", "||", "&", "|", "^", "%")) sw: switch(op) {
if(ctOp == op) { static foreach(ctOp; CtList!("+", "-", "*", "/", "==", "!=", "<=", ">=", ">", "<", "~", "&&", "||", "&", "|", "^", "%"))
case ctOp: {
n = mixin("left "~ctOp~" right"); n = mixin("left "~ctOp~" right");
break sw;
} }
default:
assert(0, op);
}
return InterpretResult(n, sc); return InterpretResult(n, sc);
} }
@ -1172,6 +1183,31 @@ class OpAssignExpression : Expression {
} }
} }
class PipelineExpression : Expression {
Expression e1;
Expression e2;
CallExpression ce;
this(Expression e1, Expression e2) {
this.e1 = e1;
this.e2 = e2;
if(auto ce = cast(CallExpression) e2) {
this.ce = new CallExpression(ce.func);
this.ce.arguments = [e1] ~ ce.arguments;
} else {
this.ce = new CallExpression(e2);
this.ce.arguments ~= e1;
}
}
override string toString() { return e1.toString() ~ " |> " ~ e2.toString(); }
override InterpretResult interpret(PrototypeObject sc) {
return ce.interpret(sc);
}
}
class AssignExpression : Expression { class AssignExpression : Expression {
Expression e1; Expression e1;
Expression e2; Expression e2;
@ -2122,6 +2158,10 @@ Expression parseAddend(MyTokenStreamHere)(ref MyTokenStreamHere tokens) {
case ":": // idk case ":": // idk
return e1; return e1;
case "|>":
tokens.popFront();
e1 = new PipelineExpression(e1, parseFactor(tokens));
break;
case ".": case ".":
tokens.popFront(); tokens.popFront();
e1 = new DotVarExpression(e1, parseVariableName(tokens)); e1 = new DotVarExpression(e1, parseVariableName(tokens));