minor antlr3 changes

Author: teverett

antlr3/ANTLRv3.g4

@@ -29,7 +29,7 @@
 grammar ANTLRv3;
 
 grammarDef
-   : DOC_COMMENT? ('lexer' | 'parser' | 'tree')
+   : DOC_COMMENT? ('lexer' | 'parser' | 'tree')? 'grammar' id ';' optionsSpec? tokensSpec? attrScope* action* rule_+
    ;
 
 tokensSpec
@@ -67,7 +67,7 @@ optionValue
    | STRING_LITERAL
    | CHAR_LITERAL
    | INT
-   | s = '*'
+   | '*'
    ;
 
 rule_
@@ -93,7 +93,7 @@ block
    ;
 
 altList
-   : alternative rewrite ('|' alternative rewrite)*
+   : alternative rewrite? ('|' alternative rewrite?)*
    ;
 
 alternative
@@ -232,17 +232,6 @@ id
    | RULE_REF
    ;
 
-
-SL_COMMENT
-   : '//' (' $ANTLR ' SRC | ~ ('\r' | '\n')*) '\r'? '\n' -> skip
-   ;
-
-
-ML_COMMENT
-   : '/*' ()*? '*/'
-   ;
-
-
 CHAR_LITERAL
    : '\'' LITERAL_CHAR '\''
    ;
@@ -342,12 +331,6 @@ fragment SRC
    : 'src' ' ' ACTION_STRING_LITERAL ' ' INT
    ;
 
-
-WS
-   : (' ' | '\t' | '\r'? '\n') + -> skip
-   ;
-
-
 fragment WS_LOOP
    : (WS | SL_COMMENT | ML_COMMENT)*
    ;
@@ -542,3 +525,18 @@ RANGE2
 REWRITE
    : '->'
    ;
+
+
+SL_COMMENT
+   : '//' ~[\r\n]* -> skip
+   ;
+
+
+ML_COMMENT
+   : '/*' .*? '*/' -> skip
+   ;
+
+WS
+   : (' ' | '\t' | '\r'? '\n') + -> skip
+   ;
+

antlr3/examples/csv.g

@@ -0,0 +1,58 @@
+/*
+
+ Copyright 2011 by Nathaniel Harward <[email protected]>
+
+ ANTLRv3 grammar for CSV files.
+
+ * No trimming of spaces (disallowed in RFC4180)
+ * No trimming of double-quotes, either to define/end a quoted field or
+   when embedded inside one
+ * Handles all/mixed newline formats (MSDOS/Windows; Unix; Mac OS)
+
+ If you find any issues please email me so I can correct it.
+
+*/
+
+grammar csv;
+
+file
+    : record (NEWLINE record)* EOF
+    ;
+
+record
+    : (quoted_field | unquoted_field) (COMMA (quoted_field | unquoted_field))*
+    ;
+
+quoted_field
+    : DQUOTE
+    ( CHAR
+    | COMMA
+    | DQUOTE DQUOTE
+    | NEWLINE
+    )* DQUOTE
+    ;
+
+unquoted_field
+    : CHAR*
+    ;
+
+CHAR
+    : '\u0000' .. '\u0009'
+    | '\u000b' .. '\u000c'
+    | '\u000e' .. '\u0021'
+    | '\u0023' .. '\u002b'
+    | '\u002d' .. '\uffff'
+    ;
+
+COMMA
+    : '\u002c'
+    ;
+
+DQUOTE
+    : '\u0022'
+    ;
+
+NEWLINE
+    : '\u000d'? '\u000a'    // DOS/Windows(\r\n) + Unix(\n)
+    | '\u000d'              // Mac OS 9 and earlier(\r)
+    ;