Использование предикатов вместо action

Author: nixel2007

bslparser/src/main/antlr/BSLLexer.g4

@@ -167,7 +167,12 @@ AND_KEYWORD: RU_I | A N D;
 NEW_KEYWORD: RU_N RU_O RU_V RU_Y RU_J| N E W;
 GOTO_KEYWORD: RU_P RU_E RU_R RU_E RU_J RU_T RU_I | G O T O;
 BREAK_KEYWORD: RU_P RU_R RU_E RU_R RU_V RU_A RU_T RU_SOFT_SIGN | B R E A K;
-EXECUTE_KEYWORD: (RU_V RU_Y RU_P RU_O RU_L RU_N RU_I RU_T RU_SOFT_SIGN | E X E C U T E) { if (lastTokenType == DOT) { setType(IDENTIFIER); } };
+EXECUTE_KEYWORD
+    :
+    { lastTokenType != DOT }?
+    ( RU_V RU_Y RU_P RU_O RU_L RU_N RU_I RU_T RU_SOFT_SIGN
+    | E X E C U T E)
+    ;
 ADDHANDLER_KEYWORD
     : RU_D RU_O RU_B RU_A RU_V RU_I RU_T RU_SOFT_SIGN RU_O RU_B RU_R RU_A RU_B RU_O RU_T RU_CH RU_I RU_K
     | A D D H A N D L E R

bslparser/src/test/java/org/github/_1c_syntax/parser/BSLLexerTest.java

@@ -92,4 +92,10 @@ void testAnnotation() throws IOException {
       BSLLexer.AMPERSAND, BSLLexer.ANNOTATION_ATSERVER_SYMBOL
     );
   }
+
+  @Test
+  void testExecute() throws IOException {
+    assertMatch("Выполнить", BSLLexer.EXECUTE_KEYWORD);
+    assertMatch("Запрос.Выполнить", BSLLexer.IDENTIFIER, BSLLexer.DOT, BSLLexer.IDENTIFIER);
+  }
 }

bslparser/src/test/java/org/github/_1c_syntax/parser/BSLParserTest.java

@@ -152,6 +152,20 @@ void testAnnotation() throws IOException {
 
     setInput("&Аннотация(П = 0, П2, Истина, \"строка\", П3)");
     assertMatches(parser.annotation());
+  }
+
+  @Test
+  void testExecuteStatement() throws IOException {
+    setInput("Выполнить(А)");
+    assertMatches(parser.executeStatement());
+  }
+
+  @Test
+  void testComplexIdentifier() throws IOException {
+    setInput("Запрос.Пустой()");
+    assertMatches(parser.complexIdentifier());
 
+    setInput("Запрос.Выполнить()");
+    assertMatches(parser.complexIdentifier());
   }
 }