waitStatement в member

1c-syntax · Oct 26, 2021 · d60a234 · d60a234
1 parent 4446046
commit d60a234
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/antlr/BSLParser.g4 b/src/main/antlr/BSLParser.g4
@@ -179,7 +179,7 @@ tryStatement      : TRY_KEYWORD tryCodeBlock EXCEPT_KEYWORD exceptCodeBlock ENDT
 returnStatement   : RETURN_KEYWORD expression?;
 executeStatement  : EXECUTE_KEYWORD (doCall | callParamList);
 callStatement     : WAIT_KEYWORD? (((IDENTIFIER | globalMethodCall) modifier* accessCall) | globalMethodCall);
-waitStatement     : WAIT_KEYWORD IDENTIFIER;
+waitStatement     : WAIT_KEYWORD expression;
 
 labelName         : IDENTIFIER;
 label             : TILDA labelName COLON;
@@ -240,11 +240,13 @@ boolOperation    : OR_KEYWORD | AND_KEYWORD;
 unaryModifier    : NOT_KEYWORD | MINUS | PLUS;
 member
     : unaryModifier?
+//    WAIT_KEYWORD?
     (
         constValue
-        | WAIT_KEYWORD? complexIdentifier
+        | complexIdentifier
         | (( LPAREN expression RPAREN ) modifier*)
         | (WAIT_KEYWORD (IDENTIFIER | globalMethodCall))
+        | waitStatement
     );
 newExpression    : NEW_KEYWORD typeName doCall? | NEW_KEYWORD doCall;
 typeName         : IDENTIFIER;