Skip to content

Commit fa1e5af

Browse files
committed
Methods now parse with args out of order
1 parent ff8d98e commit fa1e5af

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

server/src/antlr/vba.g4

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,12 +441,23 @@ arrayDesignator: '(' wsc? ')';
441441
// 5.3.1.5 Parameter Lists
442442
procedureParameters: '(' wsc? parameterList? wsc? ')';
443443
propertyParameters: '(' wsc? (parameterList wsc? ',' wsc?)? valueParam wsc? ')';
444-
parameterList
444+
validParameterList
445445
: (positionalParameters wsc? ',' wsc? optionalParameters)
446446
| (positionalParameters (wsc? ',' wsc? paramArray)?)
447447
| optionalParameters
448448
| paramArray
449449
;
450+
invalidParameterList
451+
: anyParam (wsc? ',' wsc? anyParam)*
452+
;
453+
454+
parameterList: (validParameterList | invalidParameterList);
455+
456+
anyParam
457+
: positionalParam
458+
| optionalParam
459+
| paramArray
460+
;
450461

451462
positionalParameters: positionalParam (wsc? ',' wsc? positionalParam)*;
452463
optionalParameters: optionalParam (wsc? ',' wsc? optionalParam)*;

0 commit comments

Comments
 (0)