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

Cleanup

Browse Source
This commit is contained in:
Wizjany
2011-10-26 16:50:46 -04:00
parent 8797d8ac3c
commit 699807665d
19 changed files with 175 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,8 +100,7 @@ public class Parser {
final Token next = peek();
if (next.id() == '(') {
halfProcessed.add(parseFunctionCall(identifierToken));
}
else {
} else {
RValue variable = variables.get(identifierToken.value);
if (variable == null) {
throw new ParserException(current.getPosition(), "Variable '" + identifierToken.value + "' not found");
@ -130,8 +129,7 @@ public class Parser {
case 'o':
if (expressionStart) {
halfProcessed.add(new PrefixOperator((OperatorToken) current));
}
else {
} else {
halfProcessed.add(current);
}
++position;
@ -148,8 +146,7 @@ public class Parser {
if (isStatement) {
return ParserProcessors.processStatement(halfProcessed);
}
else {
} else {
return ParserProcessors.processExpression(halfProcessed);
}
}
@ -195,8 +192,7 @@ public class Parser {
}
return Functions.getFunction(identifierToken.getPosition(), identifierToken.value, args.toArray(new RValue[args.size()]));
}
catch (NoSuchMethodException e) {
} catch (NoSuchMethodException e) {
throw new ParserException(identifierToken.getPosition(), "Function not found", e);
}
}

35
src/main/java/com/sk89q/worldedit/expression/parser/ParserProcessors.java
View File

@ -134,12 +134,10 @@ public final class ParserProcessors {
for (Identifiable identifiable : input) {
if (semicolonFound) {
rhs.addLast(identifiable);
}
else {
} else {
if (identifiable.id() == ';') {
semicolonFound = true;
}
else {
} else {
lhs.addLast(identifiable);
}
}
@ -151,12 +149,10 @@ public final class ParserProcessors {
}
return processExpression(lhs);
}
else if (lhs.isEmpty()) {
} else if (lhs.isEmpty()) {
return processStatement(rhs);
}
else {
assert(semicolonFound);
} else {
assert (semicolonFound);
RValue lhsInvokable = processExpression(lhs);
RValue rhsInvokable = processStatement(rhs);
@ -193,8 +189,7 @@ public final class ParserProcessors {
}
rhs.removeFirst();
}
else {
} else {
lhs.addFirst(identifiable);
}
}
@ -206,8 +201,7 @@ public final class ParserProcessors {
try {
return Operators.getOperator(input.get(0).getPosition(), operator, lhsInvokable, rhsInvokable);
}
catch (NoSuchMethodException e) {
} catch (NoSuchMethodException e) {
final Token operatorToken = (Token) input.get(lhs.size());
throw new ParserException(operatorToken.getPosition(), "Couldn't find operator '" + operator + "'");
}
@ -236,8 +230,7 @@ public final class ParserProcessors {
}
lhs.removeLast();
}
else {
} else {
rhs.addLast(identifiable);
}
}
@ -249,8 +242,7 @@ public final class ParserProcessors {
try {
return Operators.getOperator(input.get(0).getPosition(), operator, lhsInvokable, rhsInvokable);
}
catch (NoSuchMethodException e) {
} catch (NoSuchMethodException e) {
final Token operatorToken = (Token) input.get(lhs.size());
throw new ParserException(operatorToken.getPosition(), "Couldn't find operator '" + operator + "'");
}
@ -280,19 +272,16 @@ public final class ParserProcessors {
try {
ret = Operators.getOperator(lastPosition, opName, ret);
continue;
}
catch (NoSuchMethodException e) {
} catch (NoSuchMethodException e) {
throw new ParserException(lastPosition, "No such prefix operator: " + operator);
}
}
}
if (last instanceof Token) {
throw new ParserException(lastPosition, "Extra token found in expression: " + last);
}
else if (last instanceof RValue) {
} else if (last instanceof RValue) {
throw new ParserException(lastPosition, "Extra expression found: " + last);
}
else {
} else {
throw new ParserException(lastPosition, "Extra element found: " + last);
}
}