Catch small edge-case in parser

EngineHub · Oct 27, 2019 · 777b132 · 777b132
1 parent ae71c2a
commit 777b132
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/worldedit-core/src/main/antlr/com/sk89q/worldedit/antlr/Expression.g4 b/worldedit-core/src/main/antlr/com/sk89q/worldedit/antlr/Expression.g4
@@ -63,7 +63,7 @@ fragment EXP_CHAR : [eE] ;
 fragment DECIMAL : '.' DIGIT+ ( EXP_CHAR SIGN? DIGIT+ )? ;
 
 // All numbers are treated the same. No int/dec divide.
-NUMBER : SIGN? ( DIGIT+ DECIMAL? | DECIMAL ) ;
+NUMBER : ( DIGIT+ DECIMAL? | DECIMAL ) ;
 
 ID : [A-Za-z] [0-9A-Za-z_]* ;
 

diff --git a/worldedit-core/src/test/java/com/sk89q/worldedit/internal/expression/ExpressionTest.java b/worldedit-core/src/test/java/com/sk89q/worldedit/internal/expression/ExpressionTest.java
@@ -74,6 +74,11 @@ public void testEvaluate() throws ExpressionException {
         assertEquals(8, compile("foo+bar", "foo", "bar").evaluate(5D, 3D), 0);
     }
 
+    @Test
+    void testTightTokenization() {
+        assertEquals(4, simpleEval("3+1"), 0);
+    }
+
     @Test
     public void testErrors() {
         // test lexer errors