Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-24 10:17:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made it possible to leave parts of a for statement empty.

Browse Source
This commit is contained in:
TomyLobo 2011-11-22 16:56:41 +01:00
parent e6e31d0b93
commit 5ef9df7feb
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,14 +92,6 @@ public class Parser {
final Token current = peek(); final Token current = peek();
switch (current.id()) { switch (current.id()) {
case ';':
++position;
if (singleStatement) {
break loop;
}
break;
case '{': case '{':
consumeCharacter('{'); consumeCharacter('{');
@ -159,11 +151,11 @@ public class Parser {
case 'f': { // for case 'f': { // for
++position; ++position;
consumeCharacter('('); consumeCharacter('(');
final RValue init = parseExpression(); final RValue init = parseExpression(true);
consumeCharacter(';'); consumeCharacter(';');
final RValue condition = parseExpression(); final RValue condition = parseExpression(true);
consumeCharacter(';'); consumeCharacter(';');
final RValue increment = parseExpression(); final RValue increment = parseExpression(true);
consumeCharacter(')'); consumeCharacter(')');
final RValue body = parseStatements(true); final RValue body = parseStatements(true);
@ -181,7 +173,7 @@ public class Parser {
break; break;
default: default:
statements.add(parseExpression()); statements.add(parseExpression(true));
if (peek().id() == ';') { if (peek().id() == ';') {
++position; ++position;
@ -212,7 +204,7 @@ public class Parser {
} }
} }
private final RValue parseExpression() throws ParserException { private final RValue parseExpression(boolean canBeEmpty) throws ParserException {
LinkedList<Identifiable> halfProcessed = new LinkedList<Identifiable>(); LinkedList<Identifiable> halfProcessed = new LinkedList<Identifiable>();
// process brackets, numbers, functions, variables and detect prefix operators // process brackets, numbers, functions, variables and detect prefix operators
@ -279,6 +271,10 @@ public class Parser {
} }
} }
if (halfProcessed.isEmpty() && canBeEmpty) {
return new Sequence(peek().getPosition());
}
return ParserProcessors.processExpression(halfProcessed); return ParserProcessors.processExpression(halfProcessed);
} }
@ -302,7 +298,7 @@ public class Parser {
List<RValue> args = new ArrayList<RValue>(); List<RValue> args = new ArrayList<RValue>();
loop: while (true) { loop: while (true) {
args.add(parseExpression()); args.add(parseExpression(false));
final Token current = peek(); final Token current = peek();
++position; ++position;
@ -328,7 +324,7 @@ public class Parser {
private final RValue parseBracket() throws ParserException { private final RValue parseBracket() throws ParserException {
consumeCharacter('('); consumeCharacter('(');
final RValue ret = parseExpression(); final RValue ret = parseExpression(false);
consumeCharacter(')'); consumeCharacter(')');