Skip to content

Commit c8c6203

Browse files
authored
Merge pull request #4884 from Vogel612/fix/lineSpecialForm
Fixes parser rule for Line special-form syntax.
2 parents 2925035 + 2c2512d commit c8c6203

File tree

3 files changed

+290
-260
lines changed

3 files changed

+290
-260
lines changed

Rubberduck.Parsing/Grammar/VBAParser.g4

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,13 @@ withStmt :
571571
;
572572

573573
// Special forms with special syntax, only available in VBA reports or VB6 forms and pictureboxes.
574-
lineSpecialForm : expression whiteSpace ((STEP whiteSpace?)? tuple)? MINUS (STEP whiteSpace?)? tuple whiteSpace? (COMMA whiteSpace? expression)? whiteSpace? (COMMA whiteSpace? lineSpecialFormOption)?;
574+
// lineSpecialFormOption is required if expression is missing
575+
lineSpecialForm : expression whiteSpace ((STEP whiteSpace?)? tuple)?
576+
whiteSpace? MINUS whiteSpace?
577+
(STEP whiteSpace?)? tuple whiteSpace?
578+
(COMMA whiteSpace? expression? whiteSpace?)?
579+
(COMMA whiteSpace? lineSpecialFormOption)?
580+
;
575581
circleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? CIRCLE whiteSpace (STEP whiteSpace?)? tuple (whiteSpace? COMMA whiteSpace? expression)+;
576582
scaleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? SCALE whiteSpace tuple whiteSpace? MINUS whiteSpace? tuple;
577583
pSetSpecialForm : (expression whiteSpace? DOT whiteSpace?)? PSET (whiteSpace STEP)? whiteSpace? tuple whiteSpace? (COMMA whiteSpace? expression)?;

0 commit comments

Comments
 (0)