Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-15 21:43:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

The expression parser can now parse more than a simple expression

Browse Source 
- Added sequencing (; and {}).
- Added =, +=, -=, *=, /=, %=, ^= to the expression parser. (left-associative for now, will change later)
- Added pre-increment(++) and pre-decrement(--) operators.
- Adjusted/added tests.
This commit is contained in:
TomyLobo
2011-10-23 05:15:23 +02:00
parent 9c070c323f
commit ee79abff67
9 changed files with 345 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/java/com/sk89q/worldedit/expression/ExpressionTest.java
View File

@ -15,8 +15,8 @@ public class ExpressionTest {
assertEquals(1-2+3, simpleEval("1-2+3"), 0);
// check unary ops
assertEquals(2+ +4, simpleEval("2++4"), 0);
assertEquals(2- -4, simpleEval("2--4"), 0);
assertEquals(2+ +4, simpleEval("2+ +4"), 0);
assertEquals(2- -4, simpleEval("2- -4"), 0);
assertEquals(2*-4, simpleEval("2*-4"), 0);
// check functions
@ -31,7 +31,7 @@ public class ExpressionTest {
public void testErrors() throws ExpressionException {
// test lexer errors
try {
Expression.compile("{");
Expression.compile("#");
fail("Error expected");
} catch (LexerException e) {
assertEquals("Error position", 0, e.getPosition());
@ -60,6 +60,15 @@ public class ExpressionTest {
} catch (ParserException e) {}
}
@Test
public void testAssign() throws ExpressionException {
Expression foo = Expression.compile("{a=x} b=y; c=z", "x", "y", "z", "a", "b", "c");
foo.evaluate(2, 3, 5);
assertEquals(2, foo.getVariable("a").invoke(), 0);
assertEquals(3, foo.getVariable("b").invoke(), 0);
assertEquals(5, foo.getVariable("c").invoke(), 0);
}
private double simpleEval(String expression) throws Exception {
return Expression.compile(expression).evaluate();
}