Merge pull request #106 from arnaud-m/raise_error_for_word_WS_word

Raise error when detecting words or numbers separated by white-spaces
- close #81

Author: arnaud-m

src/main/antlr4/Cryptator.g4

@@ -43,6 +43,8 @@ expression returns [ICryptaNode node] //create recursively the tree of expressio
             | e1=expression divORmul e2=expression {$node=new CryptaNode($divORmul.text, $e1.node, $e2.node);}
             | e1=expression addORsub e2=expression {$node=new CryptaNode($addORsub.text, $e1.node, $e2.node);};
 
+
+
 word :  //additional token to simplify the passage in parameter
     (SYMBOL|DIGIT)+;
 
@@ -58,12 +60,15 @@ sub : '-';
 
 // Lexer Rules
 
+ERROR : (SYMBOL|DIGIT)+ WHITESPACE (SYMBOL|DIGIT)+;
+
 COMPARATOR : '=' | '!=' | '<' | '>' | '<=' | '>=';
 
 SYMBOL : [a-zA-Z\u0080-\uFFFF] {};
 
 DIGIT : [0-9] {};
 
-WHITESPACE : ( '\t' | ' ' | '\r' | '\n'| '\u000C' )+ -> skip ;
+AND : ';' | '&&';
+
 
-AND : ';' | '&&';
+WHITESPACE : ( '\t' | ' ' | '\r' | '\n'| '\u000C' )+ -> skip ;

src/test/java/cryptator/ParserTest.java

@@ -8,15 +8,12 @@
  */
 package cryptator;
 
-import static cryptator.TreeTest.testInorder;
-import static cryptator.TreeTest.testPostorder;
-import static cryptator.TreeTest.testPreorder;
-
-import org.junit.Test;
-
 import cryptator.parser.CryptaParserException;
 import cryptator.parser.CryptaParserWrapper;
 import cryptator.specs.ICryptaNode;
+import org.junit.Test;
+
+import static cryptator.TreeTest.*;
 
 public class ParserTest {
 
@@ -125,6 +122,31 @@ public void testParserError7() throws CryptaParserException {
         parser.parse("[send + more] >= money");
     }
 
+    @Test(expected = CryptaParserException.class)
+    public void testParserError8() throws CryptaParserException {
+        parser.parse("  send more = money");
+    }
+
+    @Test(expected = CryptaParserException.class)
+    public void testParserError9() throws CryptaParserException {
+        parser.parse("  send     more = money");
+    }
+
+    @Test(expected = CryptaParserException.class)
+    public void testParserError10() {
+        parser.parse("send+more='1000 1'");
+    }
+
+    @Test(expected = CryptaParserException.class)
+    public void testParserError11() {
+        parser.parse("send+more=\"1000 1\"");
+    }
+
+    @Test(expected = CryptaParserException.class)
+    public void testParserError12() {
+        parser.parse("send + more = '1000' money");
+    }
+
     @Test
     public void testParserAND() throws CryptaParserException {
         final ICryptaNode node = parser.parse("send+more=money; d+e>=y");
@@ -246,6 +268,16 @@ public void testParserIntegerError2() throws CryptaParserException {
         parser.parse("send + more >= money; 1 + '12a45' = 3");
     }
 
+    @Test(expected = CryptaParserException.class)
+    public void testParserIntegerError3() throws CryptaParserException {
+        parser.parse("1000 1=   2");
+    }
+
+    @Test(expected = CryptaParserException.class)
+    public void testParserIntegerError4() throws CryptaParserException {
+        parser.parse("10aa00 1zx=   2");
+    }
+
     @Test
     public void testParserANDsymbol() throws CryptaParserException {
         final ICryptaNode node = parser.parse("send+more=money && d+e>=y");