Skip to content

Commit 5390b13

Browse files
committed
fixes #1017 (now uses fileNumber rule in getStmt, lockStmt, unlockStmt, seekStmt and widthStmt rules)
1 parent c827897 commit 5390b13

File tree

3 files changed

+914
-912
lines changed

3 files changed

+914
-912
lines changed

Rubberduck.Parsing/Grammar/VBA.g4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ functionStmt :
310310
END_FUNCTION
311311
;
312312

313-
getStmt : GET WS valueStmt WS? ',' WS? valueStmt? WS? ',' WS? valueStmt;
313+
getStmt : GET WS fileNumber WS? ',' WS? valueStmt? WS? ',' WS? valueStmt;
314314

315315
goSubStmt : GOSUB WS valueStmt;
316316

@@ -447,7 +447,7 @@ savepictureStmt : SAVEPICTURE WS valueStmt WS? ',' WS? valueStmt;
447447

448448
saveSettingStmt : SAVESETTING WS valueStmt WS? ',' WS? valueStmt WS? ',' WS? valueStmt WS? ',' WS? valueStmt;
449449

450-
seekStmt : SEEK WS valueStmt WS? ',' WS? valueStmt;
450+
seekStmt : SEEK WS fileNumber WS? ',' WS? valueStmt;
451451

452452
selectCaseStmt :
453453
SELECT WS CASE WS valueStmt NEWLINE+
@@ -500,7 +500,7 @@ typeOfStmt : TYPEOF WS valueStmt (WS IS WS type)?;
500500

501501
unloadStmt : UNLOAD WS valueStmt;
502502

503-
unlockStmt : UNLOCK WS valueStmt (WS? ',' WS? valueStmt (WS TO WS valueStmt)?)?;
503+
unlockStmt : UNLOCK WS fileNumber (WS? ',' WS? valueStmt (WS TO WS valueStmt)?)?;
504504

505505
// operator precedence is represented by rule order
506506
valueStmt :
@@ -552,7 +552,7 @@ whileWendStmt :
552552
WEND
553553
;
554554

555-
widthStmt : WIDTH WS valueStmt WS? ',' WS? valueStmt;
555+
widthStmt : WIDTH WS fileNumber WS? ',' WS? valueStmt;
556556

557557
withStmt :
558558
WITH WS (implicitCallStmt_InStmt | (NEW WS type)) NEWLINE+
@@ -909,7 +909,7 @@ INTEGERLITERAL : (PLUS|MINUS)? ('0'..'9')+ ( ('e' | 'E') INTEGERLITERAL)* ('#' |
909909
DOUBLELITERAL : (PLUS|MINUS)? ('0'..'9')* '.' ('0'..'9')+ ( ('e' | 'E') (PLUS|MINUS)? ('0'..'9')+)* ('#' | '&')?;
910910
BYTELITERAL : ('0'..'9')+;
911911
// identifier
912-
IDENTIFIER : LETTER (LETTERORDIGIT)* | L_SQUARE_BRACKET ((~[!\]\r\n])+ R_SQUARE_BRACKET;
912+
IDENTIFIER : LETTER (LETTERORDIGIT)* | L_SQUARE_BRACKET (~[!\]\r\n])+ R_SQUARE_BRACKET;
913913
// whitespace, line breaks, comments, ...
914914
LINE_CONTINUATION : [ \t]+ '_' '\r'? '\n' -> skip;
915915
NEWLINE : (':' WS?) | (WS? ('\r'? '\n') WS?);

0 commit comments

Comments
 (0)