Scientific notation support (OE13)

RSSW-344

Author: gquerret

proparse/src/main/java/org/prorefactor/proparse/Lexer.java

@@ -26,6 +26,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
@@ -62,7 +63,7 @@
  */
 public class Lexer implements IPreprocessor {
   private static final Logger LOGGER = LoggerFactory.getLogger(Lexer.class);
-
+  private static final Pattern SCIENTIFIC_NOTATION = Pattern.compile("\\d+(\\.\\d+)?e[+-]\\d+");
   private static final int SKIP_CHAR = -100;
   private static final int PROPARSE_DIRECTIVE = -101;
   private static final int INCLUDE_DIRECTIVE = -102;
@@ -771,6 +772,8 @@ private ProToken digitStart(boolean hex) {
           stop = true;
       }
     }
+    if (SCIENTIFIC_NOTATION.matcher(currText).matches())
+      ttype = ABLNodeType.NUMBER;
 
     return makeToken(ttype);
   }

proparse/src/test/java/org/prorefactor/proparse/ABLLexerTest.java

@@ -52,6 +52,20 @@ public void setUp() throws IOException {
     session = new RefactorSession(new UnitTestProparseSettings(), new SportsSchema());
   }
 
+  @Test
+  public void testScientificNotation01() {
+    final var source = "6.02214076 6.02214076e+23 1.456e-3 4.246e+4 6779.0 23766e-1 .23e-1 ";
+    var lexer = new ABLLexer(session, ByteSource.wrap(source.getBytes()), true);
+
+    assertNextTokenTypeWS(lexer, ABLNodeType.NUMBER, "6.02214076");
+    assertNextTokenTypeWS(lexer, ABLNodeType.NUMBER, "6.02214076e+23");
+    assertNextTokenTypeWS(lexer, ABLNodeType.NUMBER, "1.456e-3");
+    assertNextTokenTypeWS(lexer, ABLNodeType.NUMBER, "4.246e+4");
+    assertNextTokenTypeWS(lexer, ABLNodeType.NUMBER, "6779.0");
+    assertNextTokenTypeWS(lexer, ABLNodeType.NUMBER, "23766e-1");
+    assertNextTokenTypeWS(lexer, ABLNodeType.FILENAME, ".23e-1");
+  }
+
   @Test
   public void testDecimalNumber01() {
     final String source = "rct1:height = 0.1\n rct1:row ";