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

foreach range like in D plus the single int version

This commit is contained in:
Adam D. Ruppe 2020-12-19 19:30:16 -05:00
parent 4a2fffe5e6
commit f5016214f1
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
script.d
View File

@ -2038,10 +2038,11 @@ unittest {
class ForeachExpression : Expression { class ForeachExpression : Expression {
VariableDeclaration decl; VariableDeclaration decl;
Expression subject; Expression subject;
Expression subject2;
Expression loopBody; Expression loopBody;
override string toString() { override string toString() {
return "foreach(" ~ decl.toString() ~ "; " ~ subject.toString() ~ ") " ~ loopBody.toString(); return "foreach(" ~ decl.toString() ~ "; " ~ subject.toString() ~ ((subject2 is null) ? "" : (".." ~ subject2.toString)) ~ ") " ~ loopBody.toString();
} }
override InterpretResult interpret(PrototypeObject sc) { override InterpretResult interpret(PrototypeObject sc) {
@ -2074,8 +2075,35 @@ class ForeachExpression : Expression {
};} };}
var what = subject.interpret(sc).value; var what = subject.interpret(sc).value;
foreach(i, item; what) { var termination = subject2 is null ? var(null) : subject2.interpret(sc).value;
mixin(doLoopBody()); if(what.payloadType == var.Type.Integral && subject2 is null) {
// loop from 0 to what
int end = what.get!int;
foreach(item; 0 .. end) {
auto i = item;
mixin(doLoopBody());
}
} else if(what.payloadType == var.Type.Integral && termination.payloadType == var.Type.Integral) {
// loop what .. termination
int start = what.get!int;
int end = termination.get!int;
int stride;
if(end < start) {
stride = -1;
} else {
stride = 1;
}
int i = -1;
for(int item = start; item != end; item += stride) {
i++;
mixin(doLoopBody());
}
} else {
if(subject2 !is null)
throw new ScriptRuntimeException("foreach( a .. b ) invalid unless a is an integer", null, 0); // FIXME
foreach(i, item; what) {
mixin(doLoopBody());
}
} }
if(flowControl != InterpretResult.FlowControl.Return) if(flowControl != InterpretResult.FlowControl.Return)
@ -3118,6 +3146,12 @@ Expression parseExpression(MyTokenStreamHere)(ref MyTokenStreamHere tokens, bool
e.decl = parseVariableDeclaration(tokens, ";"); e.decl = parseVariableDeclaration(tokens, ";");
tokens.requireNextToken(ScriptToken.Type.symbol, ";"); tokens.requireNextToken(ScriptToken.Type.symbol, ";");
e.subject = parseExpression(tokens); e.subject = parseExpression(tokens);
if(tokens.peekNextToken(ScriptToken.Type.symbol, "..")) {
tokens.popFront;
e.subject2 = parseExpression(tokens);
}
tokens.requireNextToken(ScriptToken.Type.symbol, ")"); tokens.requireNextToken(ScriptToken.Type.symbol, ")");
e.loopBody = parseExpression(tokens); e.loopBody = parseExpression(tokens);
ret = e; ret = e;