Merge pull request #35 from 1c-syntax/fix/use

Dash in use
1c-syntax · Jun 12, 2019 · f81eb2e · f81eb2e
2 parents c7ce5a0 + dbdcb3a
commit f81eb2e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/main/antlr/BSLLexer.g4 b/src/main/antlr/BSLLexer.g4
@@ -376,7 +376,10 @@ PREPROC_STRING: '"' (~["\n\r])* '"';
 PREPROC_STRINGTAIL: BAR (~["\n\r])* '"';
 PREPROC_STRINGPART: BAR (~["\n\r])*;
 
-PREPROC_USE_KEYWORD: RU_I RU_S RU_P RU_O RU_L RU_SOFT_SIGN RU_Z RU_O RU_V RU_A RU_T RU_SOFT_SIGN | U S E;
+PREPROC_USE_KEYWORD
+    :
+    (RU_I RU_S RU_P RU_O RU_L RU_SOFT_SIGN RU_Z RU_O RU_V RU_A RU_T RU_SOFT_SIGN
+    | U S E) -> pushMode(USE_MODE);
 
 PREPROC_REGION
     :
@@ -600,3 +603,12 @@ REGION_WHITE_SPACE
     ;
 REGION_IDENTIFIER : LETTER ( LETTER | DIGIT )* -> type(PREPROC_IDENTIFIER), popMode;
 
+mode USE_MODE;
+fragment USE_LETTER: [\p{Letter}] | '_' | '-';
+USE_WHITE_SPACE
+    : [ \t\f]
+    -> channel(HIDDEN)
+    ;
+USE_STRING : '"' (~["\n\r])* '"' -> type(PREPROC_STRING), popMode;
+USE_IDENTIFIER : USE_LETTER ( USE_LETTER | DIGIT )* -> type(PREPROC_IDENTIFIER), popMode;
+
diff --git a/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java b/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java
@@ -96,6 +96,7 @@ void testCRCR() {
   void testUse() {
     assertMatch(BSLLexer.PREPROCESSOR_MODE, "Использовать lib", BSLLexer.PREPROC_USE_KEYWORD, BSLLexer.PREPROC_IDENTIFIER);
     assertMatch(BSLLexer.PREPROCESSOR_MODE, "Использовать \"lib\"", BSLLexer.PREPROC_USE_KEYWORD, BSLLexer.PREPROC_STRING);
+    assertMatch(BSLLexer.PREPROCESSOR_MODE, "Использовать lib-name", BSLLexer.PREPROC_USE_KEYWORD, BSLLexer.PREPROC_IDENTIFIER);
   }
 
   @Test

diff --git a/src/test/java/org/github/_1c_syntax/bsl/parser/BSLParserTest.java b/src/test/java/org/github/_1c_syntax/bsl/parser/BSLParserTest.java
@@ -162,6 +162,9 @@ void testUse() {
     setInput("Использовать \"./lib\"", BSLLexer.PREPROCESSOR_MODE);
     assertMatches(parser.use());
 
+    setInput("Использовать lib-name", BSLLexer.PREPROCESSOR_MODE);
+    assertMatches(parser.use());
+
     setInput("Использовать 1", BSLLexer.PREPROCESSOR_MODE);
     assertNotMatches(parser.use());
   }