Merge branch 'develop'

Author: asosnoviy

build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
     id("com.github.ben-manes.versions") version "0.52.0"
     id("ru.vyarus.pom") version "3.0.0"
     id("org.jreleaser") version "1.19.0"
-    id("org.sonarqube") version "6.2.0.5505"
+    id("org.sonarqube") version "7.0.0.6105"
     id("me.champeau.gradle.jmh") version "0.5.3"
 }
 

src/main/antlr/BSLLexer.g4

@@ -89,7 +89,7 @@ NULL: 'NULL';
 DECIMAL: DIGIT+;
 DATETIME: SQUOTE(~['\n\r])*SQUOTE?; // TODO: Честная регулярка
 
-FLOAT : DIGIT+ '.' DIGIT+;
+FLOAT : DIGIT+ '.' DIGIT*;
 STRING: '"' (~[\r\n"] | '""')* '"';
 STRINGSTART: '"' (~["\n\r]| '""')*;
 STRINGTAIL: BAR (~["\n\r] | '""')* '"';

src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java

@@ -562,4 +562,14 @@ void testComments() {
     testLexer.assertThat("#Insert // Комментарий", BSLLexer.HIDDEN)
       .containsAll(BSLLexer.PREPROC_INSERT, BSLLexer.WHITE_SPACE, BSLLexer.LINE_COMMENT);
   }
+
+  @Test
+  void testNumber() {
+    testLexer.assertThat("0").containsAll(BSLLexer.DECIMAL);
+    testLexer.assertThat("111").containsAll(BSLLexer.DECIMAL);
+    testLexer.assertThat("0.1").containsAll(BSLLexer.FLOAT);
+    testLexer.assertThat("111.111").containsAll(BSLLexer.FLOAT);
+    testLexer.assertThat("0.").containsAll(BSLLexer.FLOAT);
+    testLexer.assertThat("111.").containsAll(BSLLexer.FLOAT);
+  }
 }