Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-01 19:06:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added while loops to the expression parser.

Browse Source 
Also added a test case.
Iterations are currently limited to 256 maximum.
This commit is contained in:
TomyLobo
2011-11-22 06:07:22 +01:00
parent aa43975e34
commit f217be0bdf
5 changed files with 96 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/sk89q/worldedit/expression/parser/Parser.java
View File

@ -36,6 +36,7 @@ import com.sk89q.worldedit.expression.runtime.Functions;
import com.sk89q.worldedit.expression.runtime.RValue;
import com.sk89q.worldedit.expression.runtime.Sequence;
import com.sk89q.worldedit.expression.runtime.Variable;
import com.sk89q.worldedit.expression.runtime.While;
/**
* Processes a list of tokens into an executable tree.
@ -112,7 +113,7 @@ public class Parser {
case 'k':
final String keyword = ((KeywordToken) current).value;
switch (keyword.charAt(0)) {
case 'i': // if
case 'i': { // if
++position;
final RValue condition = parseBracket();
final RValue truePart = parseStatements(true);
@ -128,6 +129,31 @@ public class Parser {
statements.add(new Conditional(current.getPosition(), condition, truePart, falsePart));
break;
}
case 'w': { // while
++position;
final RValue condition = parseBracket();
final RValue body = parseStatements(true);
statements.add(new While(current.getPosition(), condition, body, false));
break;
}
case 'd': { // do
++position;
final RValue body = parseStatements(true);
final Token next = peek();
if (!(next instanceof KeywordToken) || !((KeywordToken) next).value.equals("while")) {
throw new ParserException(current.getPosition(), "Expected while");
}
++position;
final RValue condition = parseBracket();
statements.add(new While(current.getPosition(), condition, body, true));
break;
}
default:
throw new ParserException(current.getPosition(), "Unimplemented keyword '" + keyword + "'");