Skip to content

Commit f0f830b

Browse files
authored
Merge pull request #1901 from Hosch250/parserbugs
Fix crash on Excel load
2 parents db56e1b + 530c907 commit f0f830b

File tree

6 files changed

+3062
-3123
lines changed

6 files changed

+3062
-3123
lines changed

Rubberduck.Parsing/Grammar/VBALexer.cs

Lines changed: 1183 additions & 1186 deletions
Large diffs are not rendered by default.

Rubberduck.Parsing/Grammar/VBALexer.g4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ INT : I N T;
4747
LBOUND : L B O U N D;
4848
LEN : L E N;
4949
LENB : L E N B;
50-
LINE : L I N E;
5150
LONGLONG : L O N G L O N G;
5251
LONGPTR : L O N G P T R;
5352
MIDB : M I D B;

Rubberduck.Parsing/Grammar/VBAParser.cs

Lines changed: 1726 additions & 1760 deletions
Large diffs are not rendered by default.

Rubberduck.Parsing/Grammar/VBAParser.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ withStmt :
511511
;
512512

513513
// Special forms with special syntax, only available in a report.
514-
lineSpecialForm : (expression whiteSpace? DOT whiteSpace?)? LINE whiteSpace (STEP whiteSpace?)? tuple MINUS (STEP whiteSpace?)? tuple whiteSpace? (COMMA whiteSpace? expression)? whiteSpace? (COMMA whiteSpace? lineSpecialFormOption)?;
514+
lineSpecialForm : expression whiteSpace (STEP whiteSpace?)? tuple MINUS (STEP whiteSpace?)? tuple whiteSpace? (COMMA whiteSpace? expression)? whiteSpace? (COMMA whiteSpace? lineSpecialFormOption)?;
515515
circleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? CIRCLE whiteSpace (STEP whiteSpace?)? tuple (whiteSpace? COMMA whiteSpace? expression)+;
516516
scaleSpecialForm : (expression whiteSpace? DOT whiteSpace?)? SCALE whiteSpace tuple whiteSpace? MINUS whiteSpace? tuple;
517517
tuple : LPAREN whiteSpace? expression whiteSpace? COMMA whiteSpace? expression whiteSpace? RPAREN;

Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParser.cs

Lines changed: 152 additions & 170 deletions
Large diffs are not rendered by default.

Rubberduck.Parsing/Preprocessing/VBAConditionalCompilationParser.g4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ keyword :
110110
| CLNG
111111
| CLNGLNG
112112
| CLNGPTR
113-
| COLLECTION
114113
| CSNG
115114
| CSTR
116115
| CURRENCY
@@ -119,7 +118,6 @@ keyword :
119118
| DATABASE
120119
| DATE
121120
| DEBUG
122-
| DELETESETTING
123121
| DOEVENTS
124122
| DOUBLE
125123
| END
@@ -160,9 +158,6 @@ keyword :
160158
| PSET
161159
| PTRSAFE
162160
| REM
163-
| RMDIR
164-
| SENDKEYS
165-
| SETATTR
166161
| SGN
167162
| SINGLE
168163
| SPC

0 commit comments

Comments
 (0)