Skip to content

Commit

Permalink
Merge pull request #1203 from devjunhong/master
Browse files Browse the repository at this point in the history
fix erase and string declaration
  • Loading branch information
teverett committed Aug 8, 2018
2 parents 5a5a72c + d3b1b50 commit 780bcc6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
1 change: 0 additions & 1 deletion vba/examples/example1.bas
@@ -1,4 +1,3 @@
Public Sub Module()
Dim sd As Boolean

End Sub
3 changes: 3 additions & 0 deletions vba/examples/example3erase.bas
@@ -0,0 +1,3 @@
Public Sub Module()
Dim str As String * 3
End Sub
3 changes: 3 additions & 0 deletions vba/examples/example4fixedstring.bas
@@ -0,0 +1,3 @@
Public Sub Module()
Erase array, list
End Sub
8 changes: 3 additions & 5 deletions vba/vba.g4
Expand Up @@ -293,7 +293,7 @@ enumerationStmt:

enumerationStmt_Constant : ambiguousIdentifier (WS? EQ WS? valueStmt)? endOfStatement;

eraseStmt : ERASE WS valueStmt;
eraseStmt : ERASE WS valueStmt (',' WS? valueStmt)*?;

errorStmt : ERROR WS valueStmt;

Expand Down Expand Up @@ -655,7 +655,7 @@ ambiguousIdentifier :

asTypeClause : AS WS? (NEW WS)? type (WS? fieldLength)?;

baseType : BOOLEAN | BYTE | COLLECTION | DATE | DOUBLE | INTEGER | LONG | SINGLE | STRING | VARIANT;
baseType : BOOLEAN | BYTE | COLLECTION | DATE | DOUBLE | INTEGER | LONG | SINGLE | STRING (WS? MULT WS? valueStmt)? | VARIANT;

certainIdentifier :
IDENTIFIER (ambiguousKeyword | IDENTIFIER)*
Expand Down Expand Up @@ -926,7 +926,6 @@ HEXLITERAL : '&H' [0-9A-F]+ '&'?;
SHORTLITERAL : (PLUS|MINUS)? DIGIT+ ('#' | '&' | '@')?;
INTEGERLITERAL : SHORTLITERAL (E SHORTLITERAL)?;
DOUBLELITERAL : (PLUS|MINUS)? DIGIT* '.' DIGIT+ (E SHORTLITERAL)?;
DATELITERAL : '#' DATEORTIME '#';
fragment DATEORTIME : DATEVALUE WS? TIMEVALUE | DATEVALUE | TIMEVALUE;
fragment DATEVALUE : DATEVALUEPART DATESEPARATOR DATEVALUEPART (DATESEPARATOR DATEVALUEPART)?;
Expand All @@ -952,7 +951,6 @@ WS : ([ \t] | LINE_CONTINUATION)+;
// identifier
IDENTIFIER : ~[\]()\r\n\t.,'"|!@#$%^&*\-+:=; ]+ | L_SQUARE_BRACKET (~[!\]\r\n])+ R_SQUARE_BRACKET;
// letters
fragment LETTER : [a-zA-Z_äöüÄÖÜ];
fragment DIGIT : [0-9];
Expand Down Expand Up @@ -984,4 +982,4 @@ fragment V:('v'|'V');
fragment W:('w'|'W');
fragment X:('x'|'X');
fragment Y:('y'|'Y');
fragment Z:('z'|'Z');
fragment Z:('z'|'Z');

0 comments on commit 780bcc6

Please sign in to comment.