Now flushing serial buffer before uploading code.

app/Base.java

@@ -53,7 +53,7 @@ import com.ice.jni.registry.*;
  */
 public class Base {
   static final int VERSION = 1;
-  static final String VERSION_NAME = "0002 Alpha";
+  static final String VERSION_NAME = "0003 Alpha";
   
   static public int platform;
   

app/Uploader.java

@@ -126,13 +126,13 @@ public class Uploader implements MessageConsumer  {
       }*/
 
       // Cleanup the serial buffer
-      /*serialPort = new Serial();
+      serialPort = new Serial();
       byte[] readBuffer;
       while(serialPort.available() > 0) {
         readBuffer = serialPort.readBytes();
         Thread.sleep(100);
       }
-      serialPort.dispose(); */
+      serialPort.dispose();
 
       String[] commandArray = new String[commandDownloader.size()];
       Process process = Runtime.getRuntime().exec((String[]) commandDownloader.toArray(commandArray));

app/preproc/STDCTokenTypes.java

@@ -1,149 +1,149 @@
-// $ANTLR 2.7.2: "StdCParser.g" -> "StdCLexer.java"$
+// $ANTLR 2.7.2: "StdCParser.g" -> "StdCLexer.java"$
 
 package processing.app.preproc;
 import java.io.*;
 
 import antlr.CommonAST;
 import antlr.DumpASTVisitor;
-
-public interface STDCTokenTypes {
-	int EOF = 1;
-	int NULL_TREE_LOOKAHEAD = 3;
-	int LITERAL_typedef = 4;
-	int LITERAL_asm = 5;
-	int LITERAL_volatile = 6;
-	int LCURLY = 7;
-	int RCURLY = 8;
-	int SEMI = 9;
-	int LITERAL_struct = 10;
-	int LITERAL_union = 11;
-	int LITERAL_enum = 12;
-	int LITERAL_auto = 13;
-	int LITERAL_register = 14;
-	int LITERAL_extern = 15;
-	int LITERAL_static = 16;
-	int LITERAL_const = 17;
-	int LITERAL_void = 18;
-	int LITERAL_char = 19;
-	int LITERAL_short = 20;
-	int LITERAL_int = 21;
-	int LITERAL_long = 22;
-	int LITERAL_float = 23;
-	int LITERAL_double = 24;
-	int LITERAL_signed = 25;
-	int LITERAL_unsigned = 26;
-	int ID = 27;
-	int COMMA = 28;
-	int COLON = 29;
-	int ASSIGN = 30;
-	int STAR = 31;
-	int LPAREN = 32;
-	int RPAREN = 33;
-	int LBRACKET = 34;
-	int RBRACKET = 35;
-	int VARARGS = 36;
-	int LITERAL_while = 37;
-	int LITERAL_do = 38;
-	int LITERAL_for = 39;
-	int LITERAL_goto = 40;
-	int LITERAL_continue = 41;
-	int LITERAL_break = 42;
-	int LITERAL_return = 43;
-	int LITERAL_case = 44;
-	int LITERAL_default = 45;
-	int LITERAL_if = 46;
-	int LITERAL_else = 47;
-	int LITERAL_switch = 48;
-	int DIV_ASSIGN = 49;
-	int PLUS_ASSIGN = 50;
-	int MINUS_ASSIGN = 51;
-	int STAR_ASSIGN = 52;
-	int MOD_ASSIGN = 53;
-	int RSHIFT_ASSIGN = 54;
-	int LSHIFT_ASSIGN = 55;
-	int BAND_ASSIGN = 56;
-	int BOR_ASSIGN = 57;
-	int BXOR_ASSIGN = 58;
-	int QUESTION = 59;
-	int LOR = 60;
-	int LAND = 61;
-	int BOR = 62;
-	int BXOR = 63;
-	int BAND = 64;
-	int EQUAL = 65;
-	int NOT_EQUAL = 66;
-	int LT = 67;
-	int LTE = 68;
-	int GT = 69;
-	int GTE = 70;
-	int LSHIFT = 71;
-	int RSHIFT = 72;
-	int PLUS = 73;
-	int MINUS = 74;
-	int DIV = 75;
-	int MOD = 76;
-	int INC = 77;
-	int DEC = 78;
-	int LITERAL_sizeof = 79;
-	int BNOT = 80;
-	int LNOT = 81;
-	int PTR = 82;
-	int DOT = 83;
-	int CharLiteral = 84;
-	int StringLiteral = 85;
-	int IntOctalConst = 86;
-	int LongOctalConst = 87;
-	int UnsignedOctalConst = 88;
-	int IntIntConst = 89;
-	int LongIntConst = 90;
-	int UnsignedIntConst = 91;
-	int IntHexConst = 92;
-	int LongHexConst = 93;
-	int UnsignedHexConst = 94;
-	int FloatDoubleConst = 95;
-	int DoubleDoubleConst = 96;
-	int LongDoubleConst = 97;
-	int NTypedefName = 98;
-	int NInitDecl = 99;
-	int NDeclarator = 100;
-	int NStructDeclarator = 101;
-	int NDeclaration = 102;
-	int NCast = 103;
-	int NPointerGroup = 104;
-	int NExpressionGroup = 105;
-	int NFunctionCallArgs = 106;
-	int NNonemptyAbstractDeclarator = 107;
-	int NInitializer = 108;
-	int NStatementExpr = 109;
-	int NEmptyExpression = 110;
-	int NParameterTypeList = 111;
-	int NFunctionDef = 112;
-	int NCompoundStatement = 113;
-	int NParameterDeclaration = 114;
-	int NCommaExpr = 115;
-	int NUnaryExpr = 116;
-	int NLabel = 117;
-	int NPostfixExpr = 118;
-	int NRangeExpr = 119;
-	int NStringSeq = 120;
-	int NInitializerElementLabel = 121;
-	int NLcurlyInitializer = 122;
-	int NAsmAttribute = 123;
-	int NGnuAsmExpr = 124;
-	int NTypeMissing = 125;
-	int Vocabulary = 126;
-	int Whitespace = 127;
-	int Comment = 128;
-	int CPPComment = 129;
-	int PREPROC_DIRECTIVE = 130;
-	int Space = 131;
-	int LineDirective = 132;
-	int BadStringLiteral = 133;
-	int Escape = 134;
-	int Digit = 135;
-	int LongSuffix = 136;
-	int UnsignedSuffix = 137;
-	int FloatSuffix = 138;
-	int Exponent = 139;
-	int Number = 140;
-}
+
+public interface STDCTokenTypes {
+	int EOF = 1;
+	int NULL_TREE_LOOKAHEAD = 3;
+	int LITERAL_typedef = 4;
+	int LITERAL_asm = 5;
+	int LITERAL_volatile = 6;
+	int LCURLY = 7;
+	int RCURLY = 8;
+	int SEMI = 9;
+	int LITERAL_struct = 10;
+	int LITERAL_union = 11;
+	int LITERAL_enum = 12;
+	int LITERAL_auto = 13;
+	int LITERAL_register = 14;
+	int LITERAL_extern = 15;
+	int LITERAL_static = 16;
+	int LITERAL_const = 17;
+	int LITERAL_void = 18;
+	int LITERAL_char = 19;
+	int LITERAL_short = 20;
+	int LITERAL_int = 21;
+	int LITERAL_long = 22;
+	int LITERAL_float = 23;
+	int LITERAL_double = 24;
+	int LITERAL_signed = 25;
+	int LITERAL_unsigned = 26;
+	int ID = 27;
+	int COMMA = 28;
+	int COLON = 29;
+	int ASSIGN = 30;
+	int STAR = 31;
+	int LPAREN = 32;
+	int RPAREN = 33;
+	int LBRACKET = 34;
+	int RBRACKET = 35;
+	int VARARGS = 36;
+	int LITERAL_while = 37;
+	int LITERAL_do = 38;
+	int LITERAL_for = 39;
+	int LITERAL_goto = 40;
+	int LITERAL_continue = 41;
+	int LITERAL_break = 42;
+	int LITERAL_return = 43;
+	int LITERAL_case = 44;
+	int LITERAL_default = 45;
+	int LITERAL_if = 46;
+	int LITERAL_else = 47;
+	int LITERAL_switch = 48;
+	int DIV_ASSIGN = 49;
+	int PLUS_ASSIGN = 50;
+	int MINUS_ASSIGN = 51;
+	int STAR_ASSIGN = 52;
+	int MOD_ASSIGN = 53;
+	int RSHIFT_ASSIGN = 54;
+	int LSHIFT_ASSIGN = 55;
+	int BAND_ASSIGN = 56;
+	int BOR_ASSIGN = 57;
+	int BXOR_ASSIGN = 58;
+	int QUESTION = 59;
+	int LOR = 60;
+	int LAND = 61;
+	int BOR = 62;
+	int BXOR = 63;
+	int BAND = 64;
+	int EQUAL = 65;
+	int NOT_EQUAL = 66;
+	int LT = 67;
+	int LTE = 68;
+	int GT = 69;
+	int GTE = 70;
+	int LSHIFT = 71;
+	int RSHIFT = 72;
+	int PLUS = 73;
+	int MINUS = 74;
+	int DIV = 75;
+	int MOD = 76;
+	int INC = 77;
+	int DEC = 78;
+	int LITERAL_sizeof = 79;
+	int BNOT = 80;
+	int LNOT = 81;
+	int PTR = 82;
+	int DOT = 83;
+	int CharLiteral = 84;
+	int StringLiteral = 85;
+	int IntOctalConst = 86;
+	int LongOctalConst = 87;
+	int UnsignedOctalConst = 88;
+	int IntIntConst = 89;
+	int LongIntConst = 90;
+	int UnsignedIntConst = 91;
+	int IntHexConst = 92;
+	int LongHexConst = 93;
+	int UnsignedHexConst = 94;
+	int FloatDoubleConst = 95;
+	int DoubleDoubleConst = 96;
+	int LongDoubleConst = 97;
+	int NTypedefName = 98;
+	int NInitDecl = 99;
+	int NDeclarator = 100;
+	int NStructDeclarator = 101;
+	int NDeclaration = 102;
+	int NCast = 103;
+	int NPointerGroup = 104;
+	int NExpressionGroup = 105;
+	int NFunctionCallArgs = 106;
+	int NNonemptyAbstractDeclarator = 107;
+	int NInitializer = 108;
+	int NStatementExpr = 109;
+	int NEmptyExpression = 110;
+	int NParameterTypeList = 111;
+	int NFunctionDef = 112;
+	int NCompoundStatement = 113;
+	int NParameterDeclaration = 114;
+	int NCommaExpr = 115;
+	int NUnaryExpr = 116;
+	int NLabel = 117;
+	int NPostfixExpr = 118;
+	int NRangeExpr = 119;
+	int NStringSeq = 120;
+	int NInitializerElementLabel = 121;
+	int NLcurlyInitializer = 122;
+	int NAsmAttribute = 123;
+	int NGnuAsmExpr = 124;
+	int NTypeMissing = 125;
+	int Vocabulary = 126;
+	int Whitespace = 127;
+	int Comment = 128;
+	int CPPComment = 129;
+	int PREPROC_DIRECTIVE = 130;
+	int Space = 131;
+	int LineDirective = 132;
+	int BadStringLiteral = 133;
+	int Escape = 134;
+	int Digit = 135;
+	int LongSuffix = 136;
+	int UnsignedSuffix = 137;
+	int FloatSuffix = 138;
+	int Exponent = 139;
+	int Number = 140;
+}

app/preproc/STDCTokenTypes.txt

@@ -1,139 +1,139 @@
-// $ANTLR 2.7.2: StdCParser.g -> STDCTokenTypes.txt$
-STDC    // output token vocab name
-LITERAL_typedef="typedef"=4
-LITERAL_asm="asm"=5
-LITERAL_volatile="volatile"=6
-LCURLY=7
-RCURLY=8
-SEMI=9
-LITERAL_struct="struct"=10
-LITERAL_union="union"=11
-LITERAL_enum="enum"=12
-LITERAL_auto="auto"=13
-LITERAL_register="register"=14
-LITERAL_extern="extern"=15
-LITERAL_static="static"=16
-LITERAL_const="const"=17
-LITERAL_void="void"=18
-LITERAL_char="char"=19
-LITERAL_short="short"=20
-LITERAL_int="int"=21
-LITERAL_long="long"=22
-LITERAL_float="float"=23
-LITERAL_double="double"=24
-LITERAL_signed="signed"=25
-LITERAL_unsigned="unsigned"=26
-ID=27
-COMMA=28
-COLON=29
-ASSIGN=30
-STAR=31
-LPAREN=32
-RPAREN=33
-LBRACKET=34
-RBRACKET=35
-VARARGS=36
-LITERAL_while="while"=37
-LITERAL_do="do"=38
-LITERAL_for="for"=39
-LITERAL_goto="goto"=40
-LITERAL_continue="continue"=41
-LITERAL_break="break"=42
-LITERAL_return="return"=43
-LITERAL_case="case"=44
-LITERAL_default="default"=45
-LITERAL_if="if"=46
-LITERAL_else="else"=47
-LITERAL_switch="switch"=48
-DIV_ASSIGN=49
-PLUS_ASSIGN=50
-MINUS_ASSIGN=51
-STAR_ASSIGN=52
-MOD_ASSIGN=53
-RSHIFT_ASSIGN=54
-LSHIFT_ASSIGN=55
-BAND_ASSIGN=56
-BOR_ASSIGN=57
-BXOR_ASSIGN=58
-QUESTION=59
-LOR=60
-LAND=61
-BOR=62
-BXOR=63
-BAND=64
-EQUAL=65
-NOT_EQUAL=66
-LT=67
-LTE=68
-GT=69
-GTE=70
-LSHIFT=71
-RSHIFT=72
-PLUS=73
-MINUS=74
-DIV=75
-MOD=76
-INC=77
-DEC=78
-LITERAL_sizeof="sizeof"=79
-BNOT=80
-LNOT=81
-PTR=82
-DOT=83
-CharLiteral=84
-StringLiteral=85
-IntOctalConst=86
-LongOctalConst=87
-UnsignedOctalConst=88
-IntIntConst=89
-LongIntConst=90
-UnsignedIntConst=91
-IntHexConst=92
-LongHexConst=93
-UnsignedHexConst=94
-FloatDoubleConst=95
-DoubleDoubleConst=96
-LongDoubleConst=97
-NTypedefName=98
-NInitDecl=99
-NDeclarator=100
-NStructDeclarator=101
-NDeclaration=102
-NCast=103
-NPointerGroup=104
-NExpressionGroup=105
-NFunctionCallArgs=106
-NNonemptyAbstractDeclarator=107
-NInitializer=108
-NStatementExpr=109
-NEmptyExpression=110
-NParameterTypeList=111
-NFunctionDef=112
-NCompoundStatement=113
-NParameterDeclaration=114
-NCommaExpr=115
-NUnaryExpr=116
-NLabel=117
-NPostfixExpr=118
-NRangeExpr=119
-NStringSeq=120
-NInitializerElementLabel=121
-NLcurlyInitializer=122
-NAsmAttribute=123
-NGnuAsmExpr=124
-NTypeMissing=125
-Vocabulary=126
-Whitespace=127
-Comment=128
-CPPComment=129
-PREPROC_DIRECTIVE("a line directive")=130
-Space=131
-LineDirective=132
-BadStringLiteral=133
-Escape=134
-Digit=135
-LongSuffix=136
-UnsignedSuffix=137
-FloatSuffix=138
-Exponent=139
-Number=140
+// $ANTLR 2.7.2: StdCParser.g -> STDCTokenTypes.txt$
+STDC    // output token vocab name
+LITERAL_typedef="typedef"=4
+LITERAL_asm="asm"=5
+LITERAL_volatile="volatile"=6
+LCURLY=7
+RCURLY=8
+SEMI=9
+LITERAL_struct="struct"=10
+LITERAL_union="union"=11
+LITERAL_enum="enum"=12
+LITERAL_auto="auto"=13
+LITERAL_register="register"=14
+LITERAL_extern="extern"=15
+LITERAL_static="static"=16
+LITERAL_const="const"=17
+LITERAL_void="void"=18
+LITERAL_char="char"=19
+LITERAL_short="short"=20
+LITERAL_int="int"=21
+LITERAL_long="long"=22
+LITERAL_float="float"=23
+LITERAL_double="double"=24
+LITERAL_signed="signed"=25
+LITERAL_unsigned="unsigned"=26
+ID=27
+COMMA=28
+COLON=29
+ASSIGN=30
+STAR=31
+LPAREN=32
+RPAREN=33
+LBRACKET=34
+RBRACKET=35
+VARARGS=36
+LITERAL_while="while"=37
+LITERAL_do="do"=38
+LITERAL_for="for"=39
+LITERAL_goto="goto"=40
+LITERAL_continue="continue"=41
+LITERAL_break="break"=42
+LITERAL_return="return"=43
+LITERAL_case="case"=44
+LITERAL_default="default"=45
+LITERAL_if="if"=46
+LITERAL_else="else"=47
+LITERAL_switch="switch"=48
+DIV_ASSIGN=49
+PLUS_ASSIGN=50
+MINUS_ASSIGN=51
+STAR_ASSIGN=52
+MOD_ASSIGN=53
+RSHIFT_ASSIGN=54
+LSHIFT_ASSIGN=55
+BAND_ASSIGN=56
+BOR_ASSIGN=57
+BXOR_ASSIGN=58
+QUESTION=59
+LOR=60
+LAND=61
+BOR=62
+BXOR=63
+BAND=64
+EQUAL=65
+NOT_EQUAL=66
+LT=67
+LTE=68
+GT=69
+GTE=70
+LSHIFT=71
+RSHIFT=72
+PLUS=73
+MINUS=74
+DIV=75
+MOD=76
+INC=77
+DEC=78
+LITERAL_sizeof="sizeof"=79
+BNOT=80
+LNOT=81
+PTR=82
+DOT=83
+CharLiteral=84
+StringLiteral=85
+IntOctalConst=86
+LongOctalConst=87
+UnsignedOctalConst=88
+IntIntConst=89
+LongIntConst=90
+UnsignedIntConst=91
+IntHexConst=92
+LongHexConst=93
+UnsignedHexConst=94
+FloatDoubleConst=95
+DoubleDoubleConst=96
+LongDoubleConst=97
+NTypedefName=98
+NInitDecl=99
+NDeclarator=100
+NStructDeclarator=101
+NDeclaration=102
+NCast=103
+NPointerGroup=104
+NExpressionGroup=105
+NFunctionCallArgs=106
+NNonemptyAbstractDeclarator=107
+NInitializer=108
+NStatementExpr=109
+NEmptyExpression=110
+NParameterTypeList=111
+NFunctionDef=112
+NCompoundStatement=113
+NParameterDeclaration=114
+NCommaExpr=115
+NUnaryExpr=116
+NLabel=117
+NPostfixExpr=118
+NRangeExpr=119
+NStringSeq=120
+NInitializerElementLabel=121
+NLcurlyInitializer=122
+NAsmAttribute=123
+NGnuAsmExpr=124
+NTypeMissing=125
+Vocabulary=126
+Whitespace=127
+Comment=128
+CPPComment=129
+PREPROC_DIRECTIVE("a line directive")=130
+Space=131
+LineDirective=132
+BadStringLiteral=133
+Escape=134
+Digit=135
+LongSuffix=136
+UnsignedSuffix=137
+FloatSuffix=138
+Exponent=139
+Number=140

app/preproc/WEmitterTokenTypes.java

@@ -1,4 +1,4 @@
-// $ANTLR 2.7.2: "expandedWEmitter.g" -> "WEmitter.java"$
+// $ANTLR 2.7.2: "expandedWEmitter.g" -> "WEmitter.java"$
 
 package processing.app.preproc;
 import processing.app.*;
@@ -7,157 +7,157 @@ import java.util.*;
 
 import antlr.CommonAST;
 import antlr.DumpASTVisitor;
-
-public interface WEmitterTokenTypes {
-	int EOF = 1;
-	int NULL_TREE_LOOKAHEAD = 3;
-	int LITERAL_typedef = 4;
-	int LITERAL_asm = 5;
-	int LITERAL_volatile = 6;
-	int LCURLY = 7;
-	int RCURLY = 8;
-	int SEMI = 9;
-	int LITERAL_struct = 10;
-	int LITERAL_union = 11;
-	int LITERAL_enum = 12;
-	int LITERAL_auto = 13;
-	int LITERAL_register = 14;
-	int LITERAL_extern = 15;
-	int LITERAL_static = 16;
-	int LITERAL_const = 17;
-	int LITERAL_void = 18;
-	int LITERAL_char = 19;
-	int LITERAL_short = 20;
-	int LITERAL_int = 21;
-	int LITERAL_long = 22;
-	int LITERAL_float = 23;
-	int LITERAL_double = 24;
-	int LITERAL_signed = 25;
-	int LITERAL_unsigned = 26;
-	int ID = 27;
-	int COMMA = 28;
-	int COLON = 29;
-	int ASSIGN = 30;
-	int STAR = 31;
-	int LPAREN = 32;
-	int RPAREN = 33;
-	int LBRACKET = 34;
-	int RBRACKET = 35;
-	int VARARGS = 36;
-	int LITERAL_while = 37;
-	int LITERAL_do = 38;
-	int LITERAL_for = 39;
-	int LITERAL_goto = 40;
-	int LITERAL_continue = 41;
-	int LITERAL_break = 42;
-	int LITERAL_return = 43;
-	int LITERAL_case = 44;
-	int LITERAL_default = 45;
-	int LITERAL_if = 46;
-	int LITERAL_else = 47;
-	int LITERAL_switch = 48;
-	int DIV_ASSIGN = 49;
-	int PLUS_ASSIGN = 50;
-	int MINUS_ASSIGN = 51;
-	int STAR_ASSIGN = 52;
-	int MOD_ASSIGN = 53;
-	int RSHIFT_ASSIGN = 54;
-	int LSHIFT_ASSIGN = 55;
-	int BAND_ASSIGN = 56;
-	int BOR_ASSIGN = 57;
-	int BXOR_ASSIGN = 58;
-	int QUESTION = 59;
-	int LOR = 60;
-	int LAND = 61;
-	int BOR = 62;
-	int BXOR = 63;
-	int BAND = 64;
-	int EQUAL = 65;
-	int NOT_EQUAL = 66;
-	int LT = 67;
-	int LTE = 68;
-	int GT = 69;
-	int GTE = 70;
-	int LSHIFT = 71;
-	int RSHIFT = 72;
-	int PLUS = 73;
-	int MINUS = 74;
-	int DIV = 75;
-	int MOD = 76;
-	int INC = 77;
-	int DEC = 78;
-	int LITERAL_sizeof = 79;
-	int BNOT = 80;
-	int LNOT = 81;
-	int PTR = 82;
-	int DOT = 83;
-	int CharLiteral = 84;
-	int StringLiteral = 85;
-	int IntOctalConst = 86;
-	int LongOctalConst = 87;
-	int UnsignedOctalConst = 88;
-	int IntIntConst = 89;
-	int LongIntConst = 90;
-	int UnsignedIntConst = 91;
-	int IntHexConst = 92;
-	int LongHexConst = 93;
-	int UnsignedHexConst = 94;
-	int FloatDoubleConst = 95;
-	int DoubleDoubleConst = 96;
-	int LongDoubleConst = 97;
-	int NTypedefName = 98;
-	int NInitDecl = 99;
-	int NDeclarator = 100;
-	int NStructDeclarator = 101;
-	int NDeclaration = 102;
-	int NCast = 103;
-	int NPointerGroup = 104;
-	int NExpressionGroup = 105;
-	int NFunctionCallArgs = 106;
-	int NNonemptyAbstractDeclarator = 107;
-	int NInitializer = 108;
-	int NStatementExpr = 109;
-	int NEmptyExpression = 110;
-	int NParameterTypeList = 111;
-	int NFunctionDef = 112;
-	int NCompoundStatement = 113;
-	int NParameterDeclaration = 114;
-	int NCommaExpr = 115;
-	int NUnaryExpr = 116;
-	int NLabel = 117;
-	int NPostfixExpr = 118;
-	int NRangeExpr = 119;
-	int NStringSeq = 120;
-	int NInitializerElementLabel = 121;
-	int NLcurlyInitializer = 122;
-	int NAsmAttribute = 123;
-	int NGnuAsmExpr = 124;
-	int NTypeMissing = 125;
-	int Vocabulary = 126;
-	int Whitespace = 127;
-	int Comment = 128;
-	int CPPComment = 129;
-	int PREPROC_DIRECTIVE = 130;
-	int Space = 131;
-	int LineDirective = 132;
-	int BadStringLiteral = 133;
-	int Escape = 134;
-	int Digit = 135;
-	int LongSuffix = 136;
-	int UnsignedSuffix = 137;
-	int FloatSuffix = 138;
-	int Exponent = 139;
-	int Number = 140;
-	int LITERAL___label__ = 141;
-	int LITERAL_inline = 142;
-	int LITERAL_byte = 143;
-	int LITERAL_boolean = 144;
-	int LITERAL_Servo = 145;
-	int LITERAL_Wire = 146;
-	int LITERAL_typeof = 147;
-	int LITERAL___complex = 148;
-	int LITERAL___attribute = 149;
-	int LITERAL___alignof = 150;
-	int LITERAL___real = 151;
-	int LITERAL___imag = 152;
-}
+
+public interface WEmitterTokenTypes {
+	int EOF = 1;
+	int NULL_TREE_LOOKAHEAD = 3;
+	int LITERAL_typedef = 4;
+	int LITERAL_asm = 5;
+	int LITERAL_volatile = 6;
+	int LCURLY = 7;
+	int RCURLY = 8;
+	int SEMI = 9;
+	int LITERAL_struct = 10;
+	int LITERAL_union = 11;
+	int LITERAL_enum = 12;
+	int LITERAL_auto = 13;
+	int LITERAL_register = 14;
+	int LITERAL_extern = 15;
+	int LITERAL_static = 16;
+	int LITERAL_const = 17;
+	int LITERAL_void = 18;
+	int LITERAL_char = 19;
+	int LITERAL_short = 20;
+	int LITERAL_int = 21;
+	int LITERAL_long = 22;
+	int LITERAL_float = 23;
+	int LITERAL_double = 24;
+	int LITERAL_signed = 25;
+	int LITERAL_unsigned = 26;
+	int ID = 27;
+	int COMMA = 28;
+	int COLON = 29;
+	int ASSIGN = 30;
+	int STAR = 31;
+	int LPAREN = 32;
+	int RPAREN = 33;
+	int LBRACKET = 34;
+	int RBRACKET = 35;
+	int VARARGS = 36;
+	int LITERAL_while = 37;
+	int LITERAL_do = 38;
+	int LITERAL_for = 39;
+	int LITERAL_goto = 40;
+	int LITERAL_continue = 41;
+	int LITERAL_break = 42;
+	int LITERAL_return = 43;
+	int LITERAL_case = 44;
+	int LITERAL_default = 45;
+	int LITERAL_if = 46;
+	int LITERAL_else = 47;
+	int LITERAL_switch = 48;
+	int DIV_ASSIGN = 49;
+	int PLUS_ASSIGN = 50;
+	int MINUS_ASSIGN = 51;
+	int STAR_ASSIGN = 52;
+	int MOD_ASSIGN = 53;
+	int RSHIFT_ASSIGN = 54;
+	int LSHIFT_ASSIGN = 55;
+	int BAND_ASSIGN = 56;
+	int BOR_ASSIGN = 57;
+	int BXOR_ASSIGN = 58;
+	int QUESTION = 59;
+	int LOR = 60;
+	int LAND = 61;
+	int BOR = 62;
+	int BXOR = 63;
+	int BAND = 64;
+	int EQUAL = 65;
+	int NOT_EQUAL = 66;
+	int LT = 67;
+	int LTE = 68;
+	int GT = 69;
+	int GTE = 70;
+	int LSHIFT = 71;
+	int RSHIFT = 72;
+	int PLUS = 73;
+	int MINUS = 74;
+	int DIV = 75;
+	int MOD = 76;
+	int INC = 77;
+	int DEC = 78;
+	int LITERAL_sizeof = 79;
+	int BNOT = 80;
+	int LNOT = 81;
+	int PTR = 82;
+	int DOT = 83;
+	int CharLiteral = 84;
+	int StringLiteral = 85;
+	int IntOctalConst = 86;
+	int LongOctalConst = 87;
+	int UnsignedOctalConst = 88;
+	int IntIntConst = 89;
+	int LongIntConst = 90;
+	int UnsignedIntConst = 91;
+	int IntHexConst = 92;
+	int LongHexConst = 93;
+	int UnsignedHexConst = 94;
+	int FloatDoubleConst = 95;
+	int DoubleDoubleConst = 96;
+	int LongDoubleConst = 97;
+	int NTypedefName = 98;
+	int NInitDecl = 99;
+	int NDeclarator = 100;
+	int NStructDeclarator = 101;
+	int NDeclaration = 102;
+	int NCast = 103;
+	int NPointerGroup = 104;
+	int NExpressionGroup = 105;
+	int NFunctionCallArgs = 106;
+	int NNonemptyAbstractDeclarator = 107;
+	int NInitializer = 108;
+	int NStatementExpr = 109;
+	int NEmptyExpression = 110;
+	int NParameterTypeList = 111;
+	int NFunctionDef = 112;
+	int NCompoundStatement = 113;
+	int NParameterDeclaration = 114;
+	int NCommaExpr = 115;
+	int NUnaryExpr = 116;
+	int NLabel = 117;
+	int NPostfixExpr = 118;
+	int NRangeExpr = 119;
+	int NStringSeq = 120;
+	int NInitializerElementLabel = 121;
+	int NLcurlyInitializer = 122;
+	int NAsmAttribute = 123;
+	int NGnuAsmExpr = 124;
+	int NTypeMissing = 125;
+	int Vocabulary = 126;
+	int Whitespace = 127;
+	int Comment = 128;
+	int CPPComment = 129;
+	int PREPROC_DIRECTIVE = 130;
+	int Space = 131;
+	int LineDirective = 132;
+	int BadStringLiteral = 133;
+	int Escape = 134;
+	int Digit = 135;
+	int LongSuffix = 136;
+	int UnsignedSuffix = 137;
+	int FloatSuffix = 138;
+	int Exponent = 139;
+	int Number = 140;
+	int LITERAL___label__ = 141;
+	int LITERAL_inline = 142;
+	int LITERAL_byte = 143;
+	int LITERAL_boolean = 144;
+	int LITERAL_Servo = 145;
+	int LITERAL_Wire = 146;
+	int LITERAL_typeof = 147;
+	int LITERAL___complex = 148;
+	int LITERAL___attribute = 149;
+	int LITERAL___alignof = 150;
+	int LITERAL___real = 151;
+	int LITERAL___imag = 152;
+}

app/preproc/WEmitterTokenTypes.txt

@@ -1,151 +1,151 @@
-// $ANTLR 2.7.2: expandedWEmitter.g -> WEmitterTokenTypes.txt$
-WEmitter    // output token vocab name
-LITERAL_typedef="typedef"=4
-LITERAL_asm="asm"=5
-LITERAL_volatile="volatile"=6
-LCURLY=7
-RCURLY=8
-SEMI=9
-LITERAL_struct="struct"=10
-LITERAL_union="union"=11
-LITERAL_enum="enum"=12
-LITERAL_auto="auto"=13
-LITERAL_register="register"=14
-LITERAL_extern="extern"=15
-LITERAL_static="static"=16
-LITERAL_const="const"=17
-LITERAL_void="void"=18
-LITERAL_char="char"=19
-LITERAL_short="short"=20
-LITERAL_int="int"=21
-LITERAL_long="long"=22
-LITERAL_float="float"=23
-LITERAL_double="double"=24
-LITERAL_signed="signed"=25
-LITERAL_unsigned="unsigned"=26
-ID=27
-COMMA=28
-COLON=29
-ASSIGN=30
-STAR=31
-LPAREN=32
-RPAREN=33
-LBRACKET=34
-RBRACKET=35
-VARARGS=36
-LITERAL_while="while"=37
-LITERAL_do="do"=38
-LITERAL_for="for"=39
-LITERAL_goto="goto"=40
-LITERAL_continue="continue"=41
-LITERAL_break="break"=42
-LITERAL_return="return"=43
-LITERAL_case="case"=44
-LITERAL_default="default"=45
-LITERAL_if="if"=46
-LITERAL_else="else"=47
-LITERAL_switch="switch"=48
-DIV_ASSIGN=49
-PLUS_ASSIGN=50
-MINUS_ASSIGN=51
-STAR_ASSIGN=52
-MOD_ASSIGN=53
-RSHIFT_ASSIGN=54
-LSHIFT_ASSIGN=55
-BAND_ASSIGN=56
-BOR_ASSIGN=57
-BXOR_ASSIGN=58
-QUESTION=59
-LOR=60
-LAND=61
-BOR=62
-BXOR=63
-BAND=64
-EQUAL=65
-NOT_EQUAL=66
-LT=67
-LTE=68
-GT=69
-GTE=70
-LSHIFT=71
-RSHIFT=72
-PLUS=73
-MINUS=74
-DIV=75
-MOD=76
-INC=77
-DEC=78
-LITERAL_sizeof="sizeof"=79
-BNOT=80
-LNOT=81
-PTR=82
-DOT=83
-CharLiteral=84
-StringLiteral=85
-IntOctalConst=86
-LongOctalConst=87
-UnsignedOctalConst=88
-IntIntConst=89
-LongIntConst=90
-UnsignedIntConst=91
-IntHexConst=92
-LongHexConst=93
-UnsignedHexConst=94
-FloatDoubleConst=95
-DoubleDoubleConst=96
-LongDoubleConst=97
-NTypedefName=98
-NInitDecl=99
-NDeclarator=100
-NStructDeclarator=101
-NDeclaration=102
-NCast=103
-NPointerGroup=104
-NExpressionGroup=105
-NFunctionCallArgs=106
-NNonemptyAbstractDeclarator=107
-NInitializer=108
-NStatementExpr=109
-NEmptyExpression=110
-NParameterTypeList=111
-NFunctionDef=112
-NCompoundStatement=113
-NParameterDeclaration=114
-NCommaExpr=115
-NUnaryExpr=116
-NLabel=117
-NPostfixExpr=118
-NRangeExpr=119
-NStringSeq=120
-NInitializerElementLabel=121
-NLcurlyInitializer=122
-NAsmAttribute=123
-NGnuAsmExpr=124
-NTypeMissing=125
-Vocabulary=126
-Whitespace=127
-Comment=128
-CPPComment=129
-PREPROC_DIRECTIVE("a line directive")=130
-Space=131
-LineDirective=132
-BadStringLiteral=133
-Escape=134
-Digit=135
-LongSuffix=136
-UnsignedSuffix=137
-FloatSuffix=138
-Exponent=139
-Number=140
-LITERAL___label__="__label__"=141
-LITERAL_inline="inline"=142
-LITERAL_byte="byte"=143
-LITERAL_boolean="boolean"=144
-LITERAL_Servo="Servo"=145
-LITERAL_Wire="Wire"=146
-LITERAL_typeof="typeof"=147
-LITERAL___complex="__complex"=148
-LITERAL___attribute="__attribute"=149
-LITERAL___alignof="__alignof"=150
-LITERAL___real="__real"=151
-LITERAL___imag="__imag"=152
+// $ANTLR 2.7.2: expandedWEmitter.g -> WEmitterTokenTypes.txt$
+WEmitter    // output token vocab name
+LITERAL_typedef="typedef"=4
+LITERAL_asm="asm"=5
+LITERAL_volatile="volatile"=6
+LCURLY=7
+RCURLY=8
+SEMI=9
+LITERAL_struct="struct"=10
+LITERAL_union="union"=11
+LITERAL_enum="enum"=12
+LITERAL_auto="auto"=13
+LITERAL_register="register"=14
+LITERAL_extern="extern"=15
+LITERAL_static="static"=16
+LITERAL_const="const"=17
+LITERAL_void="void"=18
+LITERAL_char="char"=19
+LITERAL_short="short"=20
+LITERAL_int="int"=21
+LITERAL_long="long"=22
+LITERAL_float="float"=23
+LITERAL_double="double"=24
+LITERAL_signed="signed"=25
+LITERAL_unsigned="unsigned"=26
+ID=27
+COMMA=28
+COLON=29
+ASSIGN=30
+STAR=31
+LPAREN=32
+RPAREN=33
+LBRACKET=34
+RBRACKET=35
+VARARGS=36
+LITERAL_while="while"=37
+LITERAL_do="do"=38
+LITERAL_for="for"=39
+LITERAL_goto="goto"=40
+LITERAL_continue="continue"=41
+LITERAL_break="break"=42
+LITERAL_return="return"=43
+LITERAL_case="case"=44
+LITERAL_default="default"=45
+LITERAL_if="if"=46
+LITERAL_else="else"=47
+LITERAL_switch="switch"=48
+DIV_ASSIGN=49
+PLUS_ASSIGN=50
+MINUS_ASSIGN=51
+STAR_ASSIGN=52
+MOD_ASSIGN=53
+RSHIFT_ASSIGN=54
+LSHIFT_ASSIGN=55
+BAND_ASSIGN=56
+BOR_ASSIGN=57
+BXOR_ASSIGN=58
+QUESTION=59
+LOR=60
+LAND=61
+BOR=62
+BXOR=63
+BAND=64
+EQUAL=65
+NOT_EQUAL=66
+LT=67
+LTE=68
+GT=69
+GTE=70
+LSHIFT=71
+RSHIFT=72
+PLUS=73
+MINUS=74
+DIV=75
+MOD=76
+INC=77
+DEC=78
+LITERAL_sizeof="sizeof"=79
+BNOT=80
+LNOT=81
+PTR=82
+DOT=83
+CharLiteral=84
+StringLiteral=85
+IntOctalConst=86
+LongOctalConst=87
+UnsignedOctalConst=88
+IntIntConst=89
+LongIntConst=90
+UnsignedIntConst=91
+IntHexConst=92
+LongHexConst=93
+UnsignedHexConst=94
+FloatDoubleConst=95
+DoubleDoubleConst=96
+LongDoubleConst=97
+NTypedefName=98
+NInitDecl=99
+NDeclarator=100
+NStructDeclarator=101
+NDeclaration=102
+NCast=103
+NPointerGroup=104
+NExpressionGroup=105
+NFunctionCallArgs=106
+NNonemptyAbstractDeclarator=107
+NInitializer=108
+NStatementExpr=109
+NEmptyExpression=110
+NParameterTypeList=111
+NFunctionDef=112
+NCompoundStatement=113
+NParameterDeclaration=114
+NCommaExpr=115
+NUnaryExpr=116
+NLabel=117
+NPostfixExpr=118
+NRangeExpr=119
+NStringSeq=120
+NInitializerElementLabel=121
+NLcurlyInitializer=122
+NAsmAttribute=123
+NGnuAsmExpr=124
+NTypeMissing=125
+Vocabulary=126
+Whitespace=127
+Comment=128
+CPPComment=129
+PREPROC_DIRECTIVE("a line directive")=130
+Space=131
+LineDirective=132
+BadStringLiteral=133
+Escape=134
+Digit=135
+LongSuffix=136
+UnsignedSuffix=137
+FloatSuffix=138
+Exponent=139
+Number=140
+LITERAL___label__="__label__"=141
+LITERAL_inline="inline"=142
+LITERAL_byte="byte"=143
+LITERAL_boolean="boolean"=144
+LITERAL_Servo="Servo"=145
+LITERAL_Wire="Wire"=146
+LITERAL_typeof="typeof"=147
+LITERAL___complex="__complex"=148
+LITERAL___attribute="__attribute"=149
+LITERAL___alignof="__alignof"=150
+LITERAL___real="__real"=151
+LITERAL___imag="__imag"=152

app/preproc/WLexerTokenTypes.java

@@ -1,4 +1,4 @@
-// $ANTLR 2.7.2: "expandedWParser.g" -> "WLexer.java"$
+// $ANTLR 2.7.2: "expandedWParser.g" -> "WLexer.java"$
 
 package processing.app.preproc;
 
@@ -6,163 +6,163 @@ import java.io.*;
 
 import antlr.CommonAST;
 import antlr.DumpASTVisitor;
-
-public interface WLexerTokenTypes {
-	int EOF = 1;
-	int NULL_TREE_LOOKAHEAD = 3;
-	int LITERAL_typedef = 4;
-	int LITERAL_asm = 5;
-	int LITERAL_volatile = 6;
-	int LCURLY = 7;
-	int RCURLY = 8;
-	int SEMI = 9;
-	int LITERAL_struct = 10;
-	int LITERAL_union = 11;
-	int LITERAL_enum = 12;
-	int LITERAL_auto = 13;
-	int LITERAL_register = 14;
-	int LITERAL_extern = 15;
-	int LITERAL_static = 16;
-	int LITERAL_const = 17;
-	int LITERAL_void = 18;
-	int LITERAL_char = 19;
-	int LITERAL_short = 20;
-	int LITERAL_int = 21;
-	int LITERAL_long = 22;
-	int LITERAL_float = 23;
-	int LITERAL_double = 24;
-	int LITERAL_signed = 25;
-	int LITERAL_unsigned = 26;
-	int ID = 27;
-	int COMMA = 28;
-	int COLON = 29;
-	int ASSIGN = 30;
-	int STAR = 31;
-	int LPAREN = 32;
-	int RPAREN = 33;
-	int LBRACKET = 34;
-	int RBRACKET = 35;
-	int VARARGS = 36;
-	int LITERAL_while = 37;
-	int LITERAL_do = 38;
-	int LITERAL_for = 39;
-	int LITERAL_goto = 40;
-	int LITERAL_continue = 41;
-	int LITERAL_break = 42;
-	int LITERAL_return = 43;
-	int LITERAL_case = 44;
-	int LITERAL_default = 45;
-	int LITERAL_if = 46;
-	int LITERAL_else = 47;
-	int LITERAL_switch = 48;
-	int DIV_ASSIGN = 49;
-	int PLUS_ASSIGN = 50;
-	int MINUS_ASSIGN = 51;
-	int STAR_ASSIGN = 52;
-	int MOD_ASSIGN = 53;
-	int RSHIFT_ASSIGN = 54;
-	int LSHIFT_ASSIGN = 55;
-	int BAND_ASSIGN = 56;
-	int BOR_ASSIGN = 57;
-	int BXOR_ASSIGN = 58;
-	int QUESTION = 59;
-	int LOR = 60;
-	int LAND = 61;
-	int BOR = 62;
-	int BXOR = 63;
-	int BAND = 64;
-	int EQUAL = 65;
-	int NOT_EQUAL = 66;
-	int LT = 67;
-	int LTE = 68;
-	int GT = 69;
-	int GTE = 70;
-	int LSHIFT = 71;
-	int RSHIFT = 72;
-	int PLUS = 73;
-	int MINUS = 74;
-	int DIV = 75;
-	int MOD = 76;
-	int INC = 77;
-	int DEC = 78;
-	int LITERAL_sizeof = 79;
-	int BNOT = 80;
-	int LNOT = 81;
-	int PTR = 82;
-	int DOT = 83;
-	int CharLiteral = 84;
-	int StringLiteral = 85;
-	int IntOctalConst = 86;
-	int LongOctalConst = 87;
-	int UnsignedOctalConst = 88;
-	int IntIntConst = 89;
-	int LongIntConst = 90;
-	int UnsignedIntConst = 91;
-	int IntHexConst = 92;
-	int LongHexConst = 93;
-	int UnsignedHexConst = 94;
-	int FloatDoubleConst = 95;
-	int DoubleDoubleConst = 96;
-	int LongDoubleConst = 97;
-	int NTypedefName = 98;
-	int NInitDecl = 99;
-	int NDeclarator = 100;
-	int NStructDeclarator = 101;
-	int NDeclaration = 102;
-	int NCast = 103;
-	int NPointerGroup = 104;
-	int NExpressionGroup = 105;
-	int NFunctionCallArgs = 106;
-	int NNonemptyAbstractDeclarator = 107;
-	int NInitializer = 108;
-	int NStatementExpr = 109;
-	int NEmptyExpression = 110;
-	int NParameterTypeList = 111;
-	int NFunctionDef = 112;
-	int NCompoundStatement = 113;
-	int NParameterDeclaration = 114;
-	int NCommaExpr = 115;
-	int NUnaryExpr = 116;
-	int NLabel = 117;
-	int NPostfixExpr = 118;
-	int NRangeExpr = 119;
-	int NStringSeq = 120;
-	int NInitializerElementLabel = 121;
-	int NLcurlyInitializer = 122;
-	int NAsmAttribute = 123;
-	int NGnuAsmExpr = 124;
-	int NTypeMissing = 125;
-	int Vocabulary = 126;
-	int Whitespace = 127;
-	int Comment = 128;
-	int CPPComment = 129;
-	int PREPROC_DIRECTIVE = 130;
-	int Space = 131;
-	int LineDirective = 132;
-	int BadStringLiteral = 133;
-	int Escape = 134;
-	int Digit = 135;
-	int LongSuffix = 136;
-	int UnsignedSuffix = 137;
-	int FloatSuffix = 138;
-	int Exponent = 139;
-	int Number = 140;
-	int LITERAL___label__ = 141;
-	int LITERAL_inline = 142;
-	int LITERAL_byte = 143;
-	int LITERAL_boolean = 144;
-	int LITERAL_Servo = 145;
-	int LITERAL_Wire = 146;
-	int LITERAL_typeof = 147;
-	int LITERAL___complex = 148;
-	int LITERAL___attribute = 149;
-	int LITERAL___alignof = 150;
-	int LITERAL___real = 151;
-	int LITERAL___imag = 152;
-	int LITERAL___extension__ = 153;
-	int IntSuffix = 154;
-	int NumberSuffix = 155;
-	int IDMEAT = 156;
-	int WideCharLiteral = 157;
-	int WideStringLiteral = 158;
-}
+
+public interface WLexerTokenTypes {
+	int EOF = 1;
+	int NULL_TREE_LOOKAHEAD = 3;
+	int LITERAL_typedef = 4;
+	int LITERAL_asm = 5;
+	int LITERAL_volatile = 6;
+	int LCURLY = 7;
+	int RCURLY = 8;
+	int SEMI = 9;
+	int LITERAL_struct = 10;
+	int LITERAL_union = 11;
+	int LITERAL_enum = 12;
+	int LITERAL_auto = 13;
+	int LITERAL_register = 14;
+	int LITERAL_extern = 15;
+	int LITERAL_static = 16;
+	int LITERAL_const = 17;
+	int LITERAL_void = 18;
+	int LITERAL_char = 19;
+	int LITERAL_short = 20;
+	int LITERAL_int = 21;
+	int LITERAL_long = 22;
+	int LITERAL_float = 23;
+	int LITERAL_double = 24;
+	int LITERAL_signed = 25;
+	int LITERAL_unsigned = 26;
+	int ID = 27;
+	int COMMA = 28;
+	int COLON = 29;
+	int ASSIGN = 30;
+	int STAR = 31;
+	int LPAREN = 32;
+	int RPAREN = 33;
+	int LBRACKET = 34;
+	int RBRACKET = 35;
+	int VARARGS = 36;
+	int LITERAL_while = 37;
+	int LITERAL_do = 38;
+	int LITERAL_for = 39;
+	int LITERAL_goto = 40;
+	int LITERAL_continue = 41;
+	int LITERAL_break = 42;
+	int LITERAL_return = 43;
+	int LITERAL_case = 44;
+	int LITERAL_default = 45;
+	int LITERAL_if = 46;
+	int LITERAL_else = 47;
+	int LITERAL_switch = 48;
+	int DIV_ASSIGN = 49;
+	int PLUS_ASSIGN = 50;
+	int MINUS_ASSIGN = 51;
+	int STAR_ASSIGN = 52;
+	int MOD_ASSIGN = 53;
+	int RSHIFT_ASSIGN = 54;
+	int LSHIFT_ASSIGN = 55;
+	int BAND_ASSIGN = 56;
+	int BOR_ASSIGN = 57;
+	int BXOR_ASSIGN = 58;
+	int QUESTION = 59;
+	int LOR = 60;
+	int LAND = 61;
+	int BOR = 62;
+	int BXOR = 63;
+	int BAND = 64;
+	int EQUAL = 65;
+	int NOT_EQUAL = 66;
+	int LT = 67;
+	int LTE = 68;
+	int GT = 69;
+	int GTE = 70;
+	int LSHIFT = 71;
+	int RSHIFT = 72;
+	int PLUS = 73;
+	int MINUS = 74;
+	int DIV = 75;
+	int MOD = 76;
+	int INC = 77;
+	int DEC = 78;
+	int LITERAL_sizeof = 79;
+	int BNOT = 80;
+	int LNOT = 81;
+	int PTR = 82;
+	int DOT = 83;
+	int CharLiteral = 84;
+	int StringLiteral = 85;
+	int IntOctalConst = 86;
+	int LongOctalConst = 87;
+	int UnsignedOctalConst = 88;
+	int IntIntConst = 89;
+	int LongIntConst = 90;
+	int UnsignedIntConst = 91;
+	int IntHexConst = 92;
+	int LongHexConst = 93;
+	int UnsignedHexConst = 94;
+	int FloatDoubleConst = 95;
+	int DoubleDoubleConst = 96;
+	int LongDoubleConst = 97;
+	int NTypedefName = 98;
+	int NInitDecl = 99;
+	int NDeclarator = 100;
+	int NStructDeclarator = 101;
+	int NDeclaration = 102;
+	int NCast = 103;
+	int NPointerGroup = 104;
+	int NExpressionGroup = 105;
+	int NFunctionCallArgs = 106;
+	int NNonemptyAbstractDeclarator = 107;
+	int NInitializer = 108;
+	int NStatementExpr = 109;
+	int NEmptyExpression = 110;
+	int NParameterTypeList = 111;
+	int NFunctionDef = 112;
+	int NCompoundStatement = 113;
+	int NParameterDeclaration = 114;
+	int NCommaExpr = 115;
+	int NUnaryExpr = 116;
+	int NLabel = 117;
+	int NPostfixExpr = 118;
+	int NRangeExpr = 119;
+	int NStringSeq = 120;
+	int NInitializerElementLabel = 121;
+	int NLcurlyInitializer = 122;
+	int NAsmAttribute = 123;
+	int NGnuAsmExpr = 124;
+	int NTypeMissing = 125;
+	int Vocabulary = 126;
+	int Whitespace = 127;
+	int Comment = 128;
+	int CPPComment = 129;
+	int PREPROC_DIRECTIVE = 130;
+	int Space = 131;
+	int LineDirective = 132;
+	int BadStringLiteral = 133;
+	int Escape = 134;
+	int Digit = 135;
+	int LongSuffix = 136;
+	int UnsignedSuffix = 137;
+	int FloatSuffix = 138;
+	int Exponent = 139;
+	int Number = 140;
+	int LITERAL___label__ = 141;
+	int LITERAL_inline = 142;
+	int LITERAL_byte = 143;
+	int LITERAL_boolean = 144;
+	int LITERAL_Servo = 145;
+	int LITERAL_Wire = 146;
+	int LITERAL_typeof = 147;
+	int LITERAL___complex = 148;
+	int LITERAL___attribute = 149;
+	int LITERAL___alignof = 150;
+	int LITERAL___real = 151;
+	int LITERAL___imag = 152;
+	int LITERAL___extension__ = 153;
+	int IntSuffix = 154;
+	int NumberSuffix = 155;
+	int IDMEAT = 156;
+	int WideCharLiteral = 157;
+	int WideStringLiteral = 158;
+}

app/preproc/WLexerTokenTypes.txt

@@ -1,157 +1,157 @@
-// $ANTLR 2.7.2: expandedWParser.g -> WLexerTokenTypes.txt$
-WLexer    // output token vocab name
-LITERAL_typedef="typedef"=4
-LITERAL_asm="asm"=5
-LITERAL_volatile="volatile"=6
-LCURLY=7
-RCURLY=8
-SEMI=9
-LITERAL_struct="struct"=10
-LITERAL_union="union"=11
-LITERAL_enum="enum"=12
-LITERAL_auto="auto"=13
-LITERAL_register="register"=14
-LITERAL_extern="extern"=15
-LITERAL_static="static"=16
-LITERAL_const="const"=17
-LITERAL_void="void"=18
-LITERAL_char="char"=19
-LITERAL_short="short"=20
-LITERAL_int="int"=21
-LITERAL_long="long"=22
-LITERAL_float="float"=23
-LITERAL_double="double"=24
-LITERAL_signed="signed"=25
-LITERAL_unsigned="unsigned"=26
-ID=27
-COMMA=28
-COLON=29
-ASSIGN=30
-STAR=31
-LPAREN=32
-RPAREN=33
-LBRACKET=34
-RBRACKET=35
-VARARGS=36
-LITERAL_while="while"=37
-LITERAL_do="do"=38
-LITERAL_for="for"=39
-LITERAL_goto="goto"=40
-LITERAL_continue="continue"=41
-LITERAL_break="break"=42
-LITERAL_return="return"=43
-LITERAL_case="case"=44
-LITERAL_default="default"=45
-LITERAL_if="if"=46
-LITERAL_else="else"=47
-LITERAL_switch="switch"=48
-DIV_ASSIGN=49
-PLUS_ASSIGN=50
-MINUS_ASSIGN=51
-STAR_ASSIGN=52
-MOD_ASSIGN=53
-RSHIFT_ASSIGN=54
-LSHIFT_ASSIGN=55
-BAND_ASSIGN=56
-BOR_ASSIGN=57
-BXOR_ASSIGN=58
-QUESTION=59
-LOR=60
-LAND=61
-BOR=62
-BXOR=63
-BAND=64
-EQUAL=65
-NOT_EQUAL=66
-LT=67
-LTE=68
-GT=69
-GTE=70
-LSHIFT=71
-RSHIFT=72
-PLUS=73
-MINUS=74
-DIV=75
-MOD=76
-INC=77
-DEC=78
-LITERAL_sizeof="sizeof"=79
-BNOT=80
-LNOT=81
-PTR=82
-DOT=83
-CharLiteral=84
-StringLiteral=85
-IntOctalConst=86
-LongOctalConst=87
-UnsignedOctalConst=88
-IntIntConst=89
-LongIntConst=90
-UnsignedIntConst=91
-IntHexConst=92
-LongHexConst=93
-UnsignedHexConst=94
-FloatDoubleConst=95
-DoubleDoubleConst=96
-LongDoubleConst=97
-NTypedefName=98
-NInitDecl=99
-NDeclarator=100
-NStructDeclarator=101
-NDeclaration=102
-NCast=103
-NPointerGroup=104
-NExpressionGroup=105
-NFunctionCallArgs=106
-NNonemptyAbstractDeclarator=107
-NInitializer=108
-NStatementExpr=109
-NEmptyExpression=110
-NParameterTypeList=111
-NFunctionDef=112
-NCompoundStatement=113
-NParameterDeclaration=114
-NCommaExpr=115
-NUnaryExpr=116
-NLabel=117
-NPostfixExpr=118
-NRangeExpr=119
-NStringSeq=120
-NInitializerElementLabel=121
-NLcurlyInitializer=122
-NAsmAttribute=123
-NGnuAsmExpr=124
-NTypeMissing=125
-Vocabulary=126
-Whitespace=127
-Comment=128
-CPPComment=129
-PREPROC_DIRECTIVE("a line directive")=130
-Space=131
-LineDirective=132
-BadStringLiteral=133
-Escape=134
-Digit=135
-LongSuffix=136
-UnsignedSuffix=137
-FloatSuffix=138
-Exponent=139
-Number=140
-LITERAL___label__="__label__"=141
-LITERAL_inline="inline"=142
-LITERAL_byte="byte"=143
-LITERAL_boolean="boolean"=144
-LITERAL_Servo="Servo"=145
-LITERAL_Wire="Wire"=146
-LITERAL_typeof="typeof"=147
-LITERAL___complex="__complex"=148
-LITERAL___attribute="__attribute"=149
-LITERAL___alignof="__alignof"=150
-LITERAL___real="__real"=151
-LITERAL___imag="__imag"=152
-LITERAL___extension__="__extension__"=153
-IntSuffix=154
-NumberSuffix=155
-IDMEAT=156
-WideCharLiteral=157
-WideStringLiteral=158
+// $ANTLR 2.7.2: expandedWParser.g -> WLexerTokenTypes.txt$
+WLexer    // output token vocab name
+LITERAL_typedef="typedef"=4
+LITERAL_asm="asm"=5
+LITERAL_volatile="volatile"=6
+LCURLY=7
+RCURLY=8
+SEMI=9
+LITERAL_struct="struct"=10
+LITERAL_union="union"=11
+LITERAL_enum="enum"=12
+LITERAL_auto="auto"=13
+LITERAL_register="register"=14
+LITERAL_extern="extern"=15
+LITERAL_static="static"=16
+LITERAL_const="const"=17
+LITERAL_void="void"=18
+LITERAL_char="char"=19
+LITERAL_short="short"=20
+LITERAL_int="int"=21
+LITERAL_long="long"=22
+LITERAL_float="float"=23
+LITERAL_double="double"=24
+LITERAL_signed="signed"=25
+LITERAL_unsigned="unsigned"=26
+ID=27
+COMMA=28
+COLON=29
+ASSIGN=30
+STAR=31
+LPAREN=32
+RPAREN=33
+LBRACKET=34
+RBRACKET=35
+VARARGS=36
+LITERAL_while="while"=37
+LITERAL_do="do"=38
+LITERAL_for="for"=39
+LITERAL_goto="goto"=40
+LITERAL_continue="continue"=41
+LITERAL_break="break"=42
+LITERAL_return="return"=43
+LITERAL_case="case"=44
+LITERAL_default="default"=45
+LITERAL_if="if"=46
+LITERAL_else="else"=47
+LITERAL_switch="switch"=48
+DIV_ASSIGN=49
+PLUS_ASSIGN=50
+MINUS_ASSIGN=51
+STAR_ASSIGN=52
+MOD_ASSIGN=53
+RSHIFT_ASSIGN=54
+LSHIFT_ASSIGN=55
+BAND_ASSIGN=56
+BOR_ASSIGN=57
+BXOR_ASSIGN=58
+QUESTION=59
+LOR=60
+LAND=61
+BOR=62
+BXOR=63
+BAND=64
+EQUAL=65
+NOT_EQUAL=66
+LT=67
+LTE=68
+GT=69
+GTE=70
+LSHIFT=71
+RSHIFT=72
+PLUS=73
+MINUS=74
+DIV=75
+MOD=76
+INC=77
+DEC=78
+LITERAL_sizeof="sizeof"=79
+BNOT=80
+LNOT=81
+PTR=82
+DOT=83
+CharLiteral=84
+StringLiteral=85
+IntOctalConst=86
+LongOctalConst=87
+UnsignedOctalConst=88
+IntIntConst=89
+LongIntConst=90
+UnsignedIntConst=91
+IntHexConst=92
+LongHexConst=93
+UnsignedHexConst=94
+FloatDoubleConst=95
+DoubleDoubleConst=96
+LongDoubleConst=97
+NTypedefName=98
+NInitDecl=99
+NDeclarator=100
+NStructDeclarator=101
+NDeclaration=102
+NCast=103
+NPointerGroup=104
+NExpressionGroup=105
+NFunctionCallArgs=106
+NNonemptyAbstractDeclarator=107
+NInitializer=108
+NStatementExpr=109
+NEmptyExpression=110
+NParameterTypeList=111
+NFunctionDef=112
+NCompoundStatement=113
+NParameterDeclaration=114
+NCommaExpr=115
+NUnaryExpr=116
+NLabel=117
+NPostfixExpr=118
+NRangeExpr=119
+NStringSeq=120
+NInitializerElementLabel=121
+NLcurlyInitializer=122
+NAsmAttribute=123
+NGnuAsmExpr=124
+NTypeMissing=125
+Vocabulary=126
+Whitespace=127
+Comment=128
+CPPComment=129
+PREPROC_DIRECTIVE("a line directive")=130
+Space=131
+LineDirective=132
+BadStringLiteral=133
+Escape=134
+Digit=135
+LongSuffix=136
+UnsignedSuffix=137
+FloatSuffix=138
+Exponent=139
+Number=140
+LITERAL___label__="__label__"=141
+LITERAL_inline="inline"=142
+LITERAL_byte="byte"=143
+LITERAL_boolean="boolean"=144
+LITERAL_Servo="Servo"=145
+LITERAL_Wire="Wire"=146
+LITERAL_typeof="typeof"=147
+LITERAL___complex="__complex"=148
+LITERAL___attribute="__attribute"=149
+LITERAL___alignof="__alignof"=150
+LITERAL___real="__real"=151
+LITERAL___imag="__imag"=152
+LITERAL___extension__="__extension__"=153
+IntSuffix=154
+NumberSuffix=155
+IDMEAT=156
+WideCharLiteral=157
+WideStringLiteral=158

app/preproc/WTokenTypes.java

@@ -1,4 +1,4 @@
-// $ANTLR 2.7.2: "expandedWParser.g" -> "WLexer.java"$
+// $ANTLR 2.7.2: "expandedWParser.g" -> "WLexer.java"$
 
 package processing.app.preproc;
 
@@ -6,157 +6,157 @@ import java.io.*;
 
 import antlr.CommonAST;
 import antlr.DumpASTVisitor;
-
-public interface WTokenTypes {
-	int EOF = 1;
-	int NULL_TREE_LOOKAHEAD = 3;
-	int LITERAL_typedef = 4;
-	int LITERAL_asm = 5;
-	int LITERAL_volatile = 6;
-	int LCURLY = 7;
-	int RCURLY = 8;
-	int SEMI = 9;
-	int LITERAL_struct = 10;
-	int LITERAL_union = 11;
-	int LITERAL_enum = 12;
-	int LITERAL_auto = 13;
-	int LITERAL_register = 14;
-	int LITERAL_extern = 15;
-	int LITERAL_static = 16;
-	int LITERAL_const = 17;
-	int LITERAL_void = 18;
-	int LITERAL_char = 19;
-	int LITERAL_short = 20;
-	int LITERAL_int = 21;
-	int LITERAL_long = 22;
-	int LITERAL_float = 23;
-	int LITERAL_double = 24;
-	int LITERAL_signed = 25;
-	int LITERAL_unsigned = 26;
-	int ID = 27;
-	int COMMA = 28;
-	int COLON = 29;
-	int ASSIGN = 30;
-	int STAR = 31;
-	int LPAREN = 32;
-	int RPAREN = 33;
-	int LBRACKET = 34;
-	int RBRACKET = 35;
-	int VARARGS = 36;
-	int LITERAL_while = 37;
-	int LITERAL_do = 38;
-	int LITERAL_for = 39;
-	int LITERAL_goto = 40;
-	int LITERAL_continue = 41;
-	int LITERAL_break = 42;
-	int LITERAL_return = 43;
-	int LITERAL_case = 44;
-	int LITERAL_default = 45;
-	int LITERAL_if = 46;
-	int LITERAL_else = 47;
-	int LITERAL_switch = 48;
-	int DIV_ASSIGN = 49;
-	int PLUS_ASSIGN = 50;
-	int MINUS_ASSIGN = 51;
-	int STAR_ASSIGN = 52;
-	int MOD_ASSIGN = 53;
-	int RSHIFT_ASSIGN = 54;
-	int LSHIFT_ASSIGN = 55;
-	int BAND_ASSIGN = 56;
-	int BOR_ASSIGN = 57;
-	int BXOR_ASSIGN = 58;
-	int QUESTION = 59;
-	int LOR = 60;
-	int LAND = 61;
-	int BOR = 62;
-	int BXOR = 63;
-	int BAND = 64;
-	int EQUAL = 65;
-	int NOT_EQUAL = 66;
-	int LT = 67;
-	int LTE = 68;
-	int GT = 69;
-	int GTE = 70;
-	int LSHIFT = 71;
-	int RSHIFT = 72;
-	int PLUS = 73;
-	int MINUS = 74;
-	int DIV = 75;
-	int MOD = 76;
-	int INC = 77;
-	int DEC = 78;
-	int LITERAL_sizeof = 79;
-	int BNOT = 80;
-	int LNOT = 81;
-	int PTR = 82;
-	int DOT = 83;
-	int CharLiteral = 84;
-	int StringLiteral = 85;
-	int IntOctalConst = 86;
-	int LongOctalConst = 87;
-	int UnsignedOctalConst = 88;
-	int IntIntConst = 89;
-	int LongIntConst = 90;
-	int UnsignedIntConst = 91;
-	int IntHexConst = 92;
-	int LongHexConst = 93;
-	int UnsignedHexConst = 94;
-	int FloatDoubleConst = 95;
-	int DoubleDoubleConst = 96;
-	int LongDoubleConst = 97;
-	int NTypedefName = 98;
-	int NInitDecl = 99;
-	int NDeclarator = 100;
-	int NStructDeclarator = 101;
-	int NDeclaration = 102;
-	int NCast = 103;
-	int NPointerGroup = 104;
-	int NExpressionGroup = 105;
-	int NFunctionCallArgs = 106;
-	int NNonemptyAbstractDeclarator = 107;
-	int NInitializer = 108;
-	int NStatementExpr = 109;
-	int NEmptyExpression = 110;
-	int NParameterTypeList = 111;
-	int NFunctionDef = 112;
-	int NCompoundStatement = 113;
-	int NParameterDeclaration = 114;
-	int NCommaExpr = 115;
-	int NUnaryExpr = 116;
-	int NLabel = 117;
-	int NPostfixExpr = 118;
-	int NRangeExpr = 119;
-	int NStringSeq = 120;
-	int NInitializerElementLabel = 121;
-	int NLcurlyInitializer = 122;
-	int NAsmAttribute = 123;
-	int NGnuAsmExpr = 124;
-	int NTypeMissing = 125;
-	int Vocabulary = 126;
-	int Whitespace = 127;
-	int Comment = 128;
-	int CPPComment = 129;
-	int PREPROC_DIRECTIVE = 130;
-	int Space = 131;
-	int LineDirective = 132;
-	int BadStringLiteral = 133;
-	int Escape = 134;
-	int Digit = 135;
-	int LongSuffix = 136;
-	int UnsignedSuffix = 137;
-	int FloatSuffix = 138;
-	int Exponent = 139;
-	int Number = 140;
-	int LITERAL___label__ = 141;
-	int LITERAL_inline = 142;
-	int LITERAL_byte = 143;
-	int LITERAL_boolean = 144;
-	int LITERAL_Servo = 145;
-	int LITERAL_Wire = 146;
-	int LITERAL_typeof = 147;
-	int LITERAL___complex = 148;
-	int LITERAL___attribute = 149;
-	int LITERAL___alignof = 150;
-	int LITERAL___real = 151;
-	int LITERAL___imag = 152;
-}
+
+public interface WTokenTypes {
+	int EOF = 1;
+	int NULL_TREE_LOOKAHEAD = 3;
+	int LITERAL_typedef = 4;
+	int LITERAL_asm = 5;
+	int LITERAL_volatile = 6;
+	int LCURLY = 7;
+	int RCURLY = 8;
+	int SEMI = 9;
+	int LITERAL_struct = 10;
+	int LITERAL_union = 11;
+	int LITERAL_enum = 12;
+	int LITERAL_auto = 13;
+	int LITERAL_register = 14;
+	int LITERAL_extern = 15;
+	int LITERAL_static = 16;
+	int LITERAL_const = 17;
+	int LITERAL_void = 18;
+	int LITERAL_char = 19;
+	int LITERAL_short = 20;
+	int LITERAL_int = 21;
+	int LITERAL_long = 22;
+	int LITERAL_float = 23;
+	int LITERAL_double = 24;
+	int LITERAL_signed = 25;
+	int LITERAL_unsigned = 26;
+	int ID = 27;
+	int COMMA = 28;
+	int COLON = 29;
+	int ASSIGN = 30;
+	int STAR = 31;
+	int LPAREN = 32;
+	int RPAREN = 33;
+	int LBRACKET = 34;
+	int RBRACKET = 35;
+	int VARARGS = 36;
+	int LITERAL_while = 37;
+	int LITERAL_do = 38;
+	int LITERAL_for = 39;
+	int LITERAL_goto = 40;
+	int LITERAL_continue = 41;
+	int LITERAL_break = 42;
+	int LITERAL_return = 43;
+	int LITERAL_case = 44;
+	int LITERAL_default = 45;
+	int LITERAL_if = 46;
+	int LITERAL_else = 47;
+	int LITERAL_switch = 48;
+	int DIV_ASSIGN = 49;
+	int PLUS_ASSIGN = 50;
+	int MINUS_ASSIGN = 51;
+	int STAR_ASSIGN = 52;
+	int MOD_ASSIGN = 53;
+	int RSHIFT_ASSIGN = 54;
+	int LSHIFT_ASSIGN = 55;
+	int BAND_ASSIGN = 56;
+	int BOR_ASSIGN = 57;
+	int BXOR_ASSIGN = 58;
+	int QUESTION = 59;
+	int LOR = 60;
+	int LAND = 61;
+	int BOR = 62;
+	int BXOR = 63;
+	int BAND = 64;
+	int EQUAL = 65;
+	int NOT_EQUAL = 66;
+	int LT = 67;
+	int LTE = 68;
+	int GT = 69;
+	int GTE = 70;
+	int LSHIFT = 71;
+	int RSHIFT = 72;
+	int PLUS = 73;
+	int MINUS = 74;
+	int DIV = 75;
+	int MOD = 76;
+	int INC = 77;
+	int DEC = 78;
+	int LITERAL_sizeof = 79;
+	int BNOT = 80;
+	int LNOT = 81;
+	int PTR = 82;
+	int DOT = 83;
+	int CharLiteral = 84;
+	int StringLiteral = 85;
+	int IntOctalConst = 86;
+	int LongOctalConst = 87;
+	int UnsignedOctalConst = 88;
+	int IntIntConst = 89;
+	int LongIntConst = 90;
+	int UnsignedIntConst = 91;
+	int IntHexConst = 92;
+	int LongHexConst = 93;
+	int UnsignedHexConst = 94;
+	int FloatDoubleConst = 95;
+	int DoubleDoubleConst = 96;
+	int LongDoubleConst = 97;
+	int NTypedefName = 98;
+	int NInitDecl = 99;
+	int NDeclarator = 100;
+	int NStructDeclarator = 101;
+	int NDeclaration = 102;
+	int NCast = 103;
+	int NPointerGroup = 104;
+	int NExpressionGroup = 105;
+	int NFunctionCallArgs = 106;
+	int NNonemptyAbstractDeclarator = 107;
+	int NInitializer = 108;
+	int NStatementExpr = 109;
+	int NEmptyExpression = 110;
+	int NParameterTypeList = 111;
+	int NFunctionDef = 112;
+	int NCompoundStatement = 113;
+	int NParameterDeclaration = 114;
+	int NCommaExpr = 115;
+	int NUnaryExpr = 116;
+	int NLabel = 117;
+	int NPostfixExpr = 118;
+	int NRangeExpr = 119;
+	int NStringSeq = 120;
+	int NInitializerElementLabel = 121;
+	int NLcurlyInitializer = 122;
+	int NAsmAttribute = 123;
+	int NGnuAsmExpr = 124;
+	int NTypeMissing = 125;
+	int Vocabulary = 126;
+	int Whitespace = 127;
+	int Comment = 128;
+	int CPPComment = 129;
+	int PREPROC_DIRECTIVE = 130;
+	int Space = 131;
+	int LineDirective = 132;
+	int BadStringLiteral = 133;
+	int Escape = 134;
+	int Digit = 135;
+	int LongSuffix = 136;
+	int UnsignedSuffix = 137;
+	int FloatSuffix = 138;
+	int Exponent = 139;
+	int Number = 140;
+	int LITERAL___label__ = 141;
+	int LITERAL_inline = 142;
+	int LITERAL_byte = 143;
+	int LITERAL_boolean = 144;
+	int LITERAL_Servo = 145;
+	int LITERAL_Wire = 146;
+	int LITERAL_typeof = 147;
+	int LITERAL___complex = 148;
+	int LITERAL___attribute = 149;
+	int LITERAL___alignof = 150;
+	int LITERAL___real = 151;
+	int LITERAL___imag = 152;
+}

app/preproc/WTokenTypes.txt

@@ -1,151 +1,151 @@
-// $ANTLR 2.7.2: expandedWParser.g -> WTokenTypes.txt$
-W    // output token vocab name
-LITERAL_typedef="typedef"=4
-LITERAL_asm="asm"=5
-LITERAL_volatile="volatile"=6
-LCURLY=7
-RCURLY=8
-SEMI=9
-LITERAL_struct="struct"=10
-LITERAL_union="union"=11
-LITERAL_enum="enum"=12
-LITERAL_auto="auto"=13
-LITERAL_register="register"=14
-LITERAL_extern="extern"=15
-LITERAL_static="static"=16
-LITERAL_const="const"=17
-LITERAL_void="void"=18
-LITERAL_char="char"=19
-LITERAL_short="short"=20
-LITERAL_int="int"=21
-LITERAL_long="long"=22
-LITERAL_float="float"=23
-LITERAL_double="double"=24
-LITERAL_signed="signed"=25
-LITERAL_unsigned="unsigned"=26
-ID=27
-COMMA=28
-COLON=29
-ASSIGN=30
-STAR=31
-LPAREN=32
-RPAREN=33
-LBRACKET=34
-RBRACKET=35
-VARARGS=36
-LITERAL_while="while"=37
-LITERAL_do="do"=38
-LITERAL_for="for"=39
-LITERAL_goto="goto"=40
-LITERAL_continue="continue"=41
-LITERAL_break="break"=42
-LITERAL_return="return"=43
-LITERAL_case="case"=44
-LITERAL_default="default"=45
-LITERAL_if="if"=46
-LITERAL_else="else"=47
-LITERAL_switch="switch"=48
-DIV_ASSIGN=49
-PLUS_ASSIGN=50
-MINUS_ASSIGN=51
-STAR_ASSIGN=52
-MOD_ASSIGN=53
-RSHIFT_ASSIGN=54
-LSHIFT_ASSIGN=55
-BAND_ASSIGN=56
-BOR_ASSIGN=57
-BXOR_ASSIGN=58
-QUESTION=59
-LOR=60
-LAND=61
-BOR=62
-BXOR=63
-BAND=64
-EQUAL=65
-NOT_EQUAL=66
-LT=67
-LTE=68
-GT=69
-GTE=70
-LSHIFT=71
-RSHIFT=72
-PLUS=73
-MINUS=74
-DIV=75
-MOD=76
-INC=77
-DEC=78
-LITERAL_sizeof="sizeof"=79
-BNOT=80
-LNOT=81
-PTR=82
-DOT=83
-CharLiteral=84
-StringLiteral=85
-IntOctalConst=86
-LongOctalConst=87
-UnsignedOctalConst=88
-IntIntConst=89
-LongIntConst=90
-UnsignedIntConst=91
-IntHexConst=92
-LongHexConst=93
-UnsignedHexConst=94
-FloatDoubleConst=95
-DoubleDoubleConst=96
-LongDoubleConst=97
-NTypedefName=98
-NInitDecl=99
-NDeclarator=100
-NStructDeclarator=101
-NDeclaration=102
-NCast=103
-NPointerGroup=104
-NExpressionGroup=105
-NFunctionCallArgs=106
-NNonemptyAbstractDeclarator=107
-NInitializer=108
-NStatementExpr=109
-NEmptyExpression=110
-NParameterTypeList=111
-NFunctionDef=112
-NCompoundStatement=113
-NParameterDeclaration=114
-NCommaExpr=115
-NUnaryExpr=116
-NLabel=117
-NPostfixExpr=118
-NRangeExpr=119
-NStringSeq=120
-NInitializerElementLabel=121
-NLcurlyInitializer=122
-NAsmAttribute=123
-NGnuAsmExpr=124
-NTypeMissing=125
-Vocabulary=126
-Whitespace=127
-Comment=128
-CPPComment=129
-PREPROC_DIRECTIVE("a line directive")=130
-Space=131
-LineDirective=132
-BadStringLiteral=133
-Escape=134
-Digit=135
-LongSuffix=136
-UnsignedSuffix=137
-FloatSuffix=138
-Exponent=139
-Number=140
-LITERAL___label__="__label__"=141
-LITERAL_inline="inline"=142
-LITERAL_byte="byte"=143
-LITERAL_boolean="boolean"=144
-LITERAL_Servo="Servo"=145
-LITERAL_Wire="Wire"=146
-LITERAL_typeof="typeof"=147
-LITERAL___complex="__complex"=148
-LITERAL___attribute="__attribute"=149
-LITERAL___alignof="__alignof"=150
-LITERAL___real="__real"=151
-LITERAL___imag="__imag"=152
+// $ANTLR 2.7.2: expandedWParser.g -> WTokenTypes.txt$
+W    // output token vocab name
+LITERAL_typedef="typedef"=4
+LITERAL_asm="asm"=5
+LITERAL_volatile="volatile"=6
+LCURLY=7
+RCURLY=8
+SEMI=9
+LITERAL_struct="struct"=10
+LITERAL_union="union"=11
+LITERAL_enum="enum"=12
+LITERAL_auto="auto"=13
+LITERAL_register="register"=14
+LITERAL_extern="extern"=15
+LITERAL_static="static"=16
+LITERAL_const="const"=17
+LITERAL_void="void"=18
+LITERAL_char="char"=19
+LITERAL_short="short"=20
+LITERAL_int="int"=21
+LITERAL_long="long"=22
+LITERAL_float="float"=23
+LITERAL_double="double"=24
+LITERAL_signed="signed"=25
+LITERAL_unsigned="unsigned"=26
+ID=27
+COMMA=28
+COLON=29
+ASSIGN=30
+STAR=31
+LPAREN=32
+RPAREN=33
+LBRACKET=34
+RBRACKET=35
+VARARGS=36
+LITERAL_while="while"=37
+LITERAL_do="do"=38
+LITERAL_for="for"=39
+LITERAL_goto="goto"=40
+LITERAL_continue="continue"=41
+LITERAL_break="break"=42
+LITERAL_return="return"=43
+LITERAL_case="case"=44
+LITERAL_default="default"=45
+LITERAL_if="if"=46
+LITERAL_else="else"=47
+LITERAL_switch="switch"=48
+DIV_ASSIGN=49
+PLUS_ASSIGN=50
+MINUS_ASSIGN=51
+STAR_ASSIGN=52
+MOD_ASSIGN=53
+RSHIFT_ASSIGN=54
+LSHIFT_ASSIGN=55
+BAND_ASSIGN=56
+BOR_ASSIGN=57
+BXOR_ASSIGN=58
+QUESTION=59
+LOR=60
+LAND=61
+BOR=62
+BXOR=63
+BAND=64
+EQUAL=65
+NOT_EQUAL=66
+LT=67
+LTE=68
+GT=69
+GTE=70
+LSHIFT=71
+RSHIFT=72
+PLUS=73
+MINUS=74
+DIV=75
+MOD=76
+INC=77
+DEC=78
+LITERAL_sizeof="sizeof"=79
+BNOT=80
+LNOT=81
+PTR=82
+DOT=83
+CharLiteral=84
+StringLiteral=85
+IntOctalConst=86
+LongOctalConst=87
+UnsignedOctalConst=88
+IntIntConst=89
+LongIntConst=90
+UnsignedIntConst=91
+IntHexConst=92
+LongHexConst=93
+UnsignedHexConst=94
+FloatDoubleConst=95
+DoubleDoubleConst=96
+LongDoubleConst=97
+NTypedefName=98
+NInitDecl=99
+NDeclarator=100
+NStructDeclarator=101
+NDeclaration=102
+NCast=103
+NPointerGroup=104
+NExpressionGroup=105
+NFunctionCallArgs=106
+NNonemptyAbstractDeclarator=107
+NInitializer=108
+NStatementExpr=109
+NEmptyExpression=110
+NParameterTypeList=111
+NFunctionDef=112
+NCompoundStatement=113
+NParameterDeclaration=114
+NCommaExpr=115
+NUnaryExpr=116
+NLabel=117
+NPostfixExpr=118
+NRangeExpr=119
+NStringSeq=120
+NInitializerElementLabel=121
+NLcurlyInitializer=122
+NAsmAttribute=123
+NGnuAsmExpr=124
+NTypeMissing=125
+Vocabulary=126
+Whitespace=127
+Comment=128
+CPPComment=129
+PREPROC_DIRECTIVE("a line directive")=130
+Space=131
+LineDirective=132
+BadStringLiteral=133
+Escape=134
+Digit=135
+LongSuffix=136
+UnsignedSuffix=137
+FloatSuffix=138
+Exponent=139
+Number=140
+LITERAL___label__="__label__"=141
+LITERAL_inline="inline"=142
+LITERAL_byte="byte"=143
+LITERAL_boolean="boolean"=144
+LITERAL_Servo="Servo"=145
+LITERAL_Wire="Wire"=146
+LITERAL_typeof="typeof"=147
+LITERAL___complex="__complex"=148
+LITERAL___attribute="__attribute"=149
+LITERAL___alignof="__alignof"=150
+LITERAL___real="__real"=151
+LITERAL___imag="__imag"=152

app/preproc/WTreeParserTokenTypes.java

@@ -1,4 +1,4 @@
-// $ANTLR 2.7.2: "WTreeParser.g" -> "WTreeParser.java"$
+// $ANTLR 2.7.2: "WTreeParser.g" -> "WTreeParser.java"$
 
 package processing.app.preproc;
 
@@ -6,157 +6,157 @@ import java.io.*;
 
 import antlr.CommonAST;
 import antlr.DumpASTVisitor;
-
-public interface WTreeParserTokenTypes {
-	int EOF = 1;
-	int NULL_TREE_LOOKAHEAD = 3;
-	int LITERAL_typedef = 4;
-	int LITERAL_asm = 5;
-	int LITERAL_volatile = 6;
-	int LCURLY = 7;
-	int RCURLY = 8;
-	int SEMI = 9;
-	int LITERAL_struct = 10;
-	int LITERAL_union = 11;
-	int LITERAL_enum = 12;
-	int LITERAL_auto = 13;
-	int LITERAL_register = 14;
-	int LITERAL_extern = 15;
-	int LITERAL_static = 16;
-	int LITERAL_const = 17;
-	int LITERAL_void = 18;
-	int LITERAL_char = 19;
-	int LITERAL_short = 20;
-	int LITERAL_int = 21;
-	int LITERAL_long = 22;
-	int LITERAL_float = 23;
-	int LITERAL_double = 24;
-	int LITERAL_signed = 25;
-	int LITERAL_unsigned = 26;
-	int ID = 27;
-	int COMMA = 28;
-	int COLON = 29;
-	int ASSIGN = 30;
-	int STAR = 31;
-	int LPAREN = 32;
-	int RPAREN = 33;
-	int LBRACKET = 34;
-	int RBRACKET = 35;
-	int VARARGS = 36;
-	int LITERAL_while = 37;
-	int LITERAL_do = 38;
-	int LITERAL_for = 39;
-	int LITERAL_goto = 40;
-	int LITERAL_continue = 41;
-	int LITERAL_break = 42;
-	int LITERAL_return = 43;
-	int LITERAL_case = 44;
-	int LITERAL_default = 45;
-	int LITERAL_if = 46;
-	int LITERAL_else = 47;
-	int LITERAL_switch = 48;
-	int DIV_ASSIGN = 49;
-	int PLUS_ASSIGN = 50;
-	int MINUS_ASSIGN = 51;
-	int STAR_ASSIGN = 52;
-	int MOD_ASSIGN = 53;
-	int RSHIFT_ASSIGN = 54;
-	int LSHIFT_ASSIGN = 55;
-	int BAND_ASSIGN = 56;
-	int BOR_ASSIGN = 57;
-	int BXOR_ASSIGN = 58;
-	int QUESTION = 59;
-	int LOR = 60;
-	int LAND = 61;
-	int BOR = 62;
-	int BXOR = 63;
-	int BAND = 64;
-	int EQUAL = 65;
-	int NOT_EQUAL = 66;
-	int LT = 67;
-	int LTE = 68;
-	int GT = 69;
-	int GTE = 70;
-	int LSHIFT = 71;
-	int RSHIFT = 72;
-	int PLUS = 73;
-	int MINUS = 74;
-	int DIV = 75;
-	int MOD = 76;
-	int INC = 77;
-	int DEC = 78;
-	int LITERAL_sizeof = 79;
-	int BNOT = 80;
-	int LNOT = 81;
-	int PTR = 82;
-	int DOT = 83;
-	int CharLiteral = 84;
-	int StringLiteral = 85;
-	int IntOctalConst = 86;
-	int LongOctalConst = 87;
-	int UnsignedOctalConst = 88;
-	int IntIntConst = 89;
-	int LongIntConst = 90;
-	int UnsignedIntConst = 91;
-	int IntHexConst = 92;
-	int LongHexConst = 93;
-	int UnsignedHexConst = 94;
-	int FloatDoubleConst = 95;
-	int DoubleDoubleConst = 96;
-	int LongDoubleConst = 97;
-	int NTypedefName = 98;
-	int NInitDecl = 99;
-	int NDeclarator = 100;
-	int NStructDeclarator = 101;
-	int NDeclaration = 102;
-	int NCast = 103;
-	int NPointerGroup = 104;
-	int NExpressionGroup = 105;
-	int NFunctionCallArgs = 106;
-	int NNonemptyAbstractDeclarator = 107;
-	int NInitializer = 108;
-	int NStatementExpr = 109;
-	int NEmptyExpression = 110;
-	int NParameterTypeList = 111;
-	int NFunctionDef = 112;
-	int NCompoundStatement = 113;
-	int NParameterDeclaration = 114;
-	int NCommaExpr = 115;
-	int NUnaryExpr = 116;
-	int NLabel = 117;
-	int NPostfixExpr = 118;
-	int NRangeExpr = 119;
-	int NStringSeq = 120;
-	int NInitializerElementLabel = 121;
-	int NLcurlyInitializer = 122;
-	int NAsmAttribute = 123;
-	int NGnuAsmExpr = 124;
-	int NTypeMissing = 125;
-	int Vocabulary = 126;
-	int Whitespace = 127;
-	int Comment = 128;
-	int CPPComment = 129;
-	int PREPROC_DIRECTIVE = 130;
-	int Space = 131;
-	int LineDirective = 132;
-	int BadStringLiteral = 133;
-	int Escape = 134;
-	int Digit = 135;
-	int LongSuffix = 136;
-	int UnsignedSuffix = 137;
-	int FloatSuffix = 138;
-	int Exponent = 139;
-	int Number = 140;
-	int LITERAL___label__ = 141;
-	int LITERAL_inline = 142;
-	int LITERAL_byte = 143;
-	int LITERAL_boolean = 144;
-	int LITERAL_Servo = 145;
-	int LITERAL_Wire = 146;
-	int LITERAL_typeof = 147;
-	int LITERAL___complex = 148;
-	int LITERAL___attribute = 149;
-	int LITERAL___alignof = 150;
-	int LITERAL___real = 151;
-	int LITERAL___imag = 152;
-}
+
+public interface WTreeParserTokenTypes {
+	int EOF = 1;
+	int NULL_TREE_LOOKAHEAD = 3;
+	int LITERAL_typedef = 4;
+	int LITERAL_asm = 5;
+	int LITERAL_volatile = 6;
+	int LCURLY = 7;
+	int RCURLY = 8;
+	int SEMI = 9;
+	int LITERAL_struct = 10;
+	int LITERAL_union = 11;
+	int LITERAL_enum = 12;
+	int LITERAL_auto = 13;
+	int LITERAL_register = 14;
+	int LITERAL_extern = 15;
+	int LITERAL_static = 16;
+	int LITERAL_const = 17;
+	int LITERAL_void = 18;
+	int LITERAL_char = 19;
+	int LITERAL_short = 20;
+	int LITERAL_int = 21;
+	int LITERAL_long = 22;
+	int LITERAL_float = 23;
+	int LITERAL_double = 24;
+	int LITERAL_signed = 25;
+	int LITERAL_unsigned = 26;
+	int ID = 27;
+	int COMMA = 28;
+	int COLON = 29;
+	int ASSIGN = 30;
+	int STAR = 31;
+	int LPAREN = 32;
+	int RPAREN = 33;
+	int LBRACKET = 34;
+	int RBRACKET = 35;
+	int VARARGS = 36;
+	int LITERAL_while = 37;
+	int LITERAL_do = 38;
+	int LITERAL_for = 39;
+	int LITERAL_goto = 40;
+	int LITERAL_continue = 41;
+	int LITERAL_break = 42;
+	int LITERAL_return = 43;
+	int LITERAL_case = 44;
+	int LITERAL_default = 45;
+	int LITERAL_if = 46;
+	int LITERAL_else = 47;
+	int LITERAL_switch = 48;
+	int DIV_ASSIGN = 49;
+	int PLUS_ASSIGN = 50;
+	int MINUS_ASSIGN = 51;
+	int STAR_ASSIGN = 52;
+	int MOD_ASSIGN = 53;
+	int RSHIFT_ASSIGN = 54;
+	int LSHIFT_ASSIGN = 55;
+	int BAND_ASSIGN = 56;
+	int BOR_ASSIGN = 57;
+	int BXOR_ASSIGN = 58;
+	int QUESTION = 59;
+	int LOR = 60;
+	int LAND = 61;
+	int BOR = 62;
+	int BXOR = 63;
+	int BAND = 64;
+	int EQUAL = 65;
+	int NOT_EQUAL = 66;
+	int LT = 67;
+	int LTE = 68;
+	int GT = 69;
+	int GTE = 70;
+	int LSHIFT = 71;
+	int RSHIFT = 72;
+	int PLUS = 73;
+	int MINUS = 74;
+	int DIV = 75;
+	int MOD = 76;
+	int INC = 77;
+	int DEC = 78;
+	int LITERAL_sizeof = 79;
+	int BNOT = 80;
+	int LNOT = 81;
+	int PTR = 82;
+	int DOT = 83;
+	int CharLiteral = 84;
+	int StringLiteral = 85;
+	int IntOctalConst = 86;
+	int LongOctalConst = 87;
+	int UnsignedOctalConst = 88;
+	int IntIntConst = 89;
+	int LongIntConst = 90;
+	int UnsignedIntConst = 91;
+	int IntHexConst = 92;
+	int LongHexConst = 93;
+	int UnsignedHexConst = 94;
+	int FloatDoubleConst = 95;
+	int DoubleDoubleConst = 96;
+	int LongDoubleConst = 97;
+	int NTypedefName = 98;
+	int NInitDecl = 99;
+	int NDeclarator = 100;
+	int NStructDeclarator = 101;
+	int NDeclaration = 102;
+	int NCast = 103;
+	int NPointerGroup = 104;
+	int NExpressionGroup = 105;
+	int NFunctionCallArgs = 106;
+	int NNonemptyAbstractDeclarator = 107;
+	int NInitializer = 108;
+	int NStatementExpr = 109;
+	int NEmptyExpression = 110;
+	int NParameterTypeList = 111;
+	int NFunctionDef = 112;
+	int NCompoundStatement = 113;
+	int NParameterDeclaration = 114;
+	int NCommaExpr = 115;
+	int NUnaryExpr = 116;
+	int NLabel = 117;
+	int NPostfixExpr = 118;
+	int NRangeExpr = 119;
+	int NStringSeq = 120;
+	int NInitializerElementLabel = 121;
+	int NLcurlyInitializer = 122;
+	int NAsmAttribute = 123;
+	int NGnuAsmExpr = 124;
+	int NTypeMissing = 125;
+	int Vocabulary = 126;
+	int Whitespace = 127;
+	int Comment = 128;
+	int CPPComment = 129;
+	int PREPROC_DIRECTIVE = 130;
+	int Space = 131;
+	int LineDirective = 132;
+	int BadStringLiteral = 133;
+	int Escape = 134;
+	int Digit = 135;
+	int LongSuffix = 136;
+	int UnsignedSuffix = 137;
+	int FloatSuffix = 138;
+	int Exponent = 139;
+	int Number = 140;
+	int LITERAL___label__ = 141;
+	int LITERAL_inline = 142;
+	int LITERAL_byte = 143;
+	int LITERAL_boolean = 144;
+	int LITERAL_Servo = 145;
+	int LITERAL_Wire = 146;
+	int LITERAL_typeof = 147;
+	int LITERAL___complex = 148;
+	int LITERAL___attribute = 149;
+	int LITERAL___alignof = 150;
+	int LITERAL___real = 151;
+	int LITERAL___imag = 152;
+}

app/preproc/WTreeParserTokenTypes.txt

@@ -1,151 +1,151 @@
-// $ANTLR 2.7.2: WTreeParser.g -> WTreeParserTokenTypes.txt$
-WTreeParser    // output token vocab name
-LITERAL_typedef="typedef"=4
-LITERAL_asm="asm"=5
-LITERAL_volatile="volatile"=6
-LCURLY=7
-RCURLY=8
-SEMI=9
-LITERAL_struct="struct"=10
-LITERAL_union="union"=11
-LITERAL_enum="enum"=12
-LITERAL_auto="auto"=13
-LITERAL_register="register"=14
-LITERAL_extern="extern"=15
-LITERAL_static="static"=16
-LITERAL_const="const"=17
-LITERAL_void="void"=18
-LITERAL_char="char"=19
-LITERAL_short="short"=20
-LITERAL_int="int"=21
-LITERAL_long="long"=22
-LITERAL_float="float"=23
-LITERAL_double="double"=24
-LITERAL_signed="signed"=25
-LITERAL_unsigned="unsigned"=26
-ID=27
-COMMA=28
-COLON=29
-ASSIGN=30
-STAR=31
-LPAREN=32
-RPAREN=33
-LBRACKET=34
-RBRACKET=35
-VARARGS=36
-LITERAL_while="while"=37
-LITERAL_do="do"=38
-LITERAL_for="for"=39
-LITERAL_goto="goto"=40
-LITERAL_continue="continue"=41
-LITERAL_break="break"=42
-LITERAL_return="return"=43
-LITERAL_case="case"=44
-LITERAL_default="default"=45
-LITERAL_if="if"=46
-LITERAL_else="else"=47
-LITERAL_switch="switch"=48
-DIV_ASSIGN=49
-PLUS_ASSIGN=50
-MINUS_ASSIGN=51
-STAR_ASSIGN=52
-MOD_ASSIGN=53
-RSHIFT_ASSIGN=54
-LSHIFT_ASSIGN=55
-BAND_ASSIGN=56
-BOR_ASSIGN=57
-BXOR_ASSIGN=58
-QUESTION=59
-LOR=60
-LAND=61
-BOR=62
-BXOR=63
-BAND=64
-EQUAL=65
-NOT_EQUAL=66
-LT=67
-LTE=68
-GT=69
-GTE=70
-LSHIFT=71
-RSHIFT=72
-PLUS=73
-MINUS=74
-DIV=75
-MOD=76
-INC=77
-DEC=78
-LITERAL_sizeof="sizeof"=79
-BNOT=80
-LNOT=81
-PTR=82
-DOT=83
-CharLiteral=84
-StringLiteral=85
-IntOctalConst=86
-LongOctalConst=87
-UnsignedOctalConst=88
-IntIntConst=89
-LongIntConst=90
-UnsignedIntConst=91
-IntHexConst=92
-LongHexConst=93
-UnsignedHexConst=94
-FloatDoubleConst=95
-DoubleDoubleConst=96
-LongDoubleConst=97
-NTypedefName=98
-NInitDecl=99
-NDeclarator=100
-NStructDeclarator=101
-NDeclaration=102
-NCast=103
-NPointerGroup=104
-NExpressionGroup=105
-NFunctionCallArgs=106
-NNonemptyAbstractDeclarator=107
-NInitializer=108
-NStatementExpr=109
-NEmptyExpression=110
-NParameterTypeList=111
-NFunctionDef=112
-NCompoundStatement=113
-NParameterDeclaration=114
-NCommaExpr=115
-NUnaryExpr=116
-NLabel=117
-NPostfixExpr=118
-NRangeExpr=119
-NStringSeq=120
-NInitializerElementLabel=121
-NLcurlyInitializer=122
-NAsmAttribute=123
-NGnuAsmExpr=124
-NTypeMissing=125
-Vocabulary=126
-Whitespace=127
-Comment=128
-CPPComment=129
-PREPROC_DIRECTIVE("a line directive")=130
-Space=131
-LineDirective=132
-BadStringLiteral=133
-Escape=134
-Digit=135
-LongSuffix=136
-UnsignedSuffix=137
-FloatSuffix=138
-Exponent=139
-Number=140
-LITERAL___label__="__label__"=141
-LITERAL_inline="inline"=142
-LITERAL_byte="byte"=143
-LITERAL_boolean="boolean"=144
-LITERAL_Servo="Servo"=145
-LITERAL_Wire="Wire"=146
-LITERAL_typeof="typeof"=147
-LITERAL___complex="__complex"=148
-LITERAL___attribute="__attribute"=149
-LITERAL___alignof="__alignof"=150
-LITERAL___real="__real"=151
-LITERAL___imag="__imag"=152
+// $ANTLR 2.7.2: WTreeParser.g -> WTreeParserTokenTypes.txt$
+WTreeParser    // output token vocab name
+LITERAL_typedef="typedef"=4
+LITERAL_asm="asm"=5
+LITERAL_volatile="volatile"=6
+LCURLY=7
+RCURLY=8
+SEMI=9
+LITERAL_struct="struct"=10
+LITERAL_union="union"=11
+LITERAL_enum="enum"=12
+LITERAL_auto="auto"=13
+LITERAL_register="register"=14
+LITERAL_extern="extern"=15
+LITERAL_static="static"=16
+LITERAL_const="const"=17
+LITERAL_void="void"=18
+LITERAL_char="char"=19
+LITERAL_short="short"=20
+LITERAL_int="int"=21
+LITERAL_long="long"=22
+LITERAL_float="float"=23
+LITERAL_double="double"=24
+LITERAL_signed="signed"=25
+LITERAL_unsigned="unsigned"=26
+ID=27
+COMMA=28
+COLON=29
+ASSIGN=30
+STAR=31
+LPAREN=32
+RPAREN=33
+LBRACKET=34
+RBRACKET=35
+VARARGS=36
+LITERAL_while="while"=37
+LITERAL_do="do"=38
+LITERAL_for="for"=39
+LITERAL_goto="goto"=40
+LITERAL_continue="continue"=41
+LITERAL_break="break"=42
+LITERAL_return="return"=43
+LITERAL_case="case"=44
+LITERAL_default="default"=45
+LITERAL_if="if"=46
+LITERAL_else="else"=47
+LITERAL_switch="switch"=48
+DIV_ASSIGN=49
+PLUS_ASSIGN=50
+MINUS_ASSIGN=51
+STAR_ASSIGN=52
+MOD_ASSIGN=53
+RSHIFT_ASSIGN=54
+LSHIFT_ASSIGN=55
+BAND_ASSIGN=56
+BOR_ASSIGN=57
+BXOR_ASSIGN=58
+QUESTION=59
+LOR=60
+LAND=61
+BOR=62
+BXOR=63
+BAND=64
+EQUAL=65
+NOT_EQUAL=66
+LT=67
+LTE=68
+GT=69
+GTE=70
+LSHIFT=71
+RSHIFT=72
+PLUS=73
+MINUS=74
+DIV=75
+MOD=76
+INC=77
+DEC=78
+LITERAL_sizeof="sizeof"=79
+BNOT=80
+LNOT=81
+PTR=82
+DOT=83
+CharLiteral=84
+StringLiteral=85
+IntOctalConst=86
+LongOctalConst=87
+UnsignedOctalConst=88
+IntIntConst=89
+LongIntConst=90
+UnsignedIntConst=91
+IntHexConst=92
+LongHexConst=93
+UnsignedHexConst=94
+FloatDoubleConst=95
+DoubleDoubleConst=96
+LongDoubleConst=97
+NTypedefName=98
+NInitDecl=99
+NDeclarator=100
+NStructDeclarator=101
+NDeclaration=102
+NCast=103
+NPointerGroup=104
+NExpressionGroup=105
+NFunctionCallArgs=106
+NNonemptyAbstractDeclarator=107
+NInitializer=108
+NStatementExpr=109
+NEmptyExpression=110
+NParameterTypeList=111
+NFunctionDef=112
+NCompoundStatement=113
+NParameterDeclaration=114
+NCommaExpr=115
+NUnaryExpr=116
+NLabel=117
+NPostfixExpr=118
+NRangeExpr=119
+NStringSeq=120
+NInitializerElementLabel=121
+NLcurlyInitializer=122
+NAsmAttribute=123
+NGnuAsmExpr=124
+NTypeMissing=125
+Vocabulary=126
+Whitespace=127
+Comment=128
+CPPComment=129
+PREPROC_DIRECTIVE("a line directive")=130
+Space=131
+LineDirective=132
+BadStringLiteral=133
+Escape=134
+Digit=135
+LongSuffix=136
+UnsignedSuffix=137
+FloatSuffix=138
+Exponent=139
+Number=140
+LITERAL___label__="__label__"=141
+LITERAL_inline="inline"=142
+LITERAL_byte="byte"=143
+LITERAL_boolean="boolean"=144
+LITERAL_Servo="Servo"=145
+LITERAL_Wire="Wire"=146
+LITERAL_typeof="typeof"=147
+LITERAL___complex="__complex"=148
+LITERAL___attribute="__attribute"=149
+LITERAL___alignof="__alignof"=150
+LITERAL___real="__real"=151
+LITERAL___imag="__imag"=152

app/preproc/expandedWEmitter.g

@@ -6,17 +6,17 @@ import java.util.*;
 
 import antlr.CommonAST;
 import antlr.DumpASTVisitor;
-}
-class WEmitter extends TreeParser;
-
-options {
-	importVocab= W;
-	buildAST= false;
-	ASTLabelType= "TNode";
-	codeGenMakeSwitchThreshold= 2;
-	codeGenBitsetTestThreshold= 3;
-}
-
+}
+class WEmitter extends TreeParser;
+
+options {
+	importVocab= W;
+	buildAST= false;
+	ASTLabelType= "TNode";
+	codeGenMakeSwitchThreshold= 2;
+	codeGenBitsetTestThreshold= 3;
+}
+
 {
 
 
@@ -359,29 +359,29 @@ void commaSep( TNode t ) {
 
 
 
-}
-translationUnit 
-options {
-	defaultErrorHandler=false;
-}
+}
+translationUnit 
+options {
+	defaultErrorHandler=false;
+}
 :{ initializePrinting(); }
                ( externalList )? 
                                 { finalizePrinting(); }
-        ;
-
+        ;
+
 externalList :( externalDef )+
-        ;
-
+        ;
+
 externalDef :declaration
         |       functionDef
         |       asm_expr
         |       typelessDeclaration
         |       s:SEMI                          { print( s ); }
-        ;
-
+        ;
+
 typelessDeclaration :#(NTypeMissing initDeclList s: SEMI)    { print( s ); }
-        ;
-
+        ;
+
 asm_expr :#( a:"asm"                              { print( a ); } 
                  ( v:"volatile"                         { print( v ); } 
                  )? 
@@ -390,8 +390,8 @@ asm_expr :#( a:"asm"                              { print( a ); }
                     rc:RCURLY                           { tabs--; print( rc ); }
                     s:SEMI                              { print( s ); }
                 )
-        ;
-
+        ;
+
 declaration :#( NDeclaration
                     declSpecifiers
                     (                   
@@ -399,29 +399,29 @@ declaration :#( NDeclaration
                     )?
                     ( s:SEMI { print( s ); } )+
                 )
-        ;
-
+        ;
+
 declSpecifiers :( storageClassSpecifier
                 | typeQualifier
                 | typeSpecifier
                 )+
-        ;
-
+        ;
+
 storageClassSpecifier :a:"auto"                                { print( a ); }
         |       b:"register"                    { print( b ); }
         |       c:"typedef"                     { print( c ); }
         |       functionStorageClassSpecifier
-        ;
-
+        ;
+
 functionStorageClassSpecifier :a:"extern"                      { print( a ); }
         |       b:"static"                      { print( b ); }
         |       c:"inline"                      { print( c ); }
-        ;
-
+        ;
+
 typeQualifier :a:"const"                       { print( a ); }
         |       b:"volatile"                    { print( b ); }
-        ;
-
+        ;
+
 typeSpecifier :a:"void"                        { print( a ); }
         |       b:"char"                        { print( b ); }
         |       c:"short"                       { print( c ); }
@@ -446,21 +446,21 @@ typeSpecifier :a:"void"                        { print( a ); }
                     rp:RPAREN                      { print( rp ); }
                 )
         |       p:"__complex"                   { print( p ); }
-        ;
-
+        ;
+
 typedefName :#(NTypedefName i:ID         { print( i ); } )
-        ;
-
+        ;
+
 structSpecifier :#( a:"struct"                       { print( a ); }
                 structOrUnionBody
             )
-        ;
-
+        ;
+
 unionSpecifier :#( a:"union"                        { print( a ); }
                 structOrUnionBody
             )
-        ;
-
+        ;
+
 structOrUnionBody :( (ID LCURLY) => i1:ID lc1:LCURLY   { print( i1 ); print ( "{" ); tabs++; }
                         ( structDeclarationList )?
                         rc1:RCURLY                  { tabs--; print( rc1 ); }
@@ -469,32 +469,32 @@ structOrUnionBody :( (ID LCURLY) => i1:ID lc1:LCURLY   { print( i1 ); print ( "{
                     rc2:RCURLY                      { tabs--; print( rc2 ); }
                 | i2:ID                     { print( i2 ); }
                 )
-        ;
-
+        ;
+
 structDeclarationList :( structDeclaration             { print( ";" ); }
                 )+
-        ;
-
+        ;
+
 structDeclaration :specifierQualifierList structDeclaratorList
-        ;
-
+        ;
+
 specifierQualifierList :(
                 typeSpecifier
                 | typeQualifier
                 )+
-        ;
-
+        ;
+
 structDeclaratorList :structDeclarator
                 ( { print(","); } structDeclarator )*
-        ;
-
+        ;
+
 structDeclarator :#( NStructDeclarator       
             ( declarator )?
             ( c:COLON { print( c ); } expr )?
             ( attributeDecl )*
         )
-        ;
-
+        ;
+
 enumSpecifier :#(  a:"enum"                        { print( a ); }
                 ( i:ID { print( i ); } )? 
                 ( lc:LCURLY                        { print( lc ); tabs++; }
@@ -502,17 +502,17 @@ enumSpecifier :#(  a:"enum"                        { print( a ); }
                   rc:RCURLY                        { tabs--; print( rc ); }
                 )?
             )
-        ;
-
+        ;
+
 enumList :enumerator ( {print(",");} enumerator)*
-        ;
-
+        ;
+
 enumerator :i:ID            { print( i ); }
                 ( b:ASSIGN      { print( b ); }
                   expr
                 )?
-        ;
-
+        ;
+
 attributeDecl :#( a:"__attribute"            { print( a ); }
            (b:. { print( b ); } )*
         )
@@ -521,13 +521,13 @@ attributeDecl :#( a:"__attribute"            { print( a ); }
              expr                       { print( ")" ); }
              rp:RPAREN                  { print( rp ); }
            )    
-        ;
-
+        ;
+
 initDeclList :initDecl     
 		( { print( "," ); } initDecl )*
-        ;
-
-initDecl { String declName = ""; }
+        ;
+
+initDecl { String declName = ""; }
 :#(NInitDecl
                 declarator
                 ( attributeDecl )*
@@ -537,25 +537,25 @@ initDecl { String declName = ""; }
                   expr
                 )?
                 )
-        ;
-
+        ;
+
 pointerGroup :#( NPointerGroup 
                    ( a:STAR             { print( a ); }
                     ( typeQualifier )* 
                    )+ 
                 )
-        ;
-
+        ;
+
 idList :i:ID                            { print( i ); }
                 (  c:COMMA                      { print( c ); }
                    id:ID                        { print( id ); }
                 )*
-        ;
-
+        ;
+
 initializer :#( NInitializer (initializerElementLabel)? expr )
                 | lcurlyInitializer
-        ;
-
+        ;
+
 initializerElementLabel :#( NInitializerElementLabel
                 (
                     ( l:LBRACKET              { print( l ); }
@@ -567,18 +567,18 @@ initializerElementLabel :#( NInitializerElementLabel
                     | d:DOT i2:ID a2:ASSIGN      { print( d ); print( i2 ); print( a2 ); }
                 )
             )
-        ;
-
+        ;
+
 lcurlyInitializer :#(n:NLcurlyInitializer    { print( n ); tabs++; }
                 initializerList       
                 rc:RCURLY               { tabs--; print( rc ); } 
                 )
-        ;
-
+        ;
+
 initializerList :( i:initializer { commaSep( i ); }
                 )*
-        ;
-
+        ;
+
 declarator :#( NDeclarator
                 ( pointerGroup )?               
 
@@ -596,22 +596,22 @@ declarator :#( NDeclarator
                  | lb:LBRACKET { print( lb );} ( expr )? rb:RBRACKET { print( rb ); }
                 )*
              )
-        ;
-
+        ;
+
 parameterTypeList :( parameterDeclaration
                     ( c:COMMA { print( c ); }
                       | s:SEMI { print( s ); }
                     )?
                 )+
                 ( v:VARARGS { print( v ); } )?
-        ;
-
+        ;
+
 parameterDeclaration :#( NParameterDeclaration
                 declSpecifiers
                 (declarator | nonemptyAbstractDeclarator)?
                 )
-        ;
-
+        ;
+
 functionDef :#( NFunctionDef
                 ( functionDeclSpecifiers)? 
                 declarator
@@ -620,14 +620,14 @@ functionDef :#( NFunctionDef
                 )*
                 compoundStatement
             )
-        ;
-
+        ;
+
 functionDeclSpecifiers :( functionStorageClassSpecifier
                 | typeQualifier
                 | typeSpecifier
                 )+
-        ;
-
+        ;
+
 declarationList :(   //ANTLR doesn't know that declarationList properly eats all the declarations
                     //so it warns about the ambiguity
                     options {
@@ -636,15 +636,15 @@ declarationList :(   //ANTLR doesn't know that declarationList properly eats all
                 localLabelDecl
                 |  declaration
                 )+
-        ;
-
+        ;
+
 localLabelDecl :#(a:"__label__"             { print( a ); }
               ( i:ID                    { commaSep( i ); }
               )+
                                         { print( ";" ); }
             )
-        ;
-
+        ;
+
 compoundStatement :#( cs:NCompoundStatement                { print( cs ); tabs++; }
                 ( declarationList
                 | functionDef
@@ -653,14 +653,14 @@ compoundStatement :#( cs:NCompoundStatement                { print( cs ); tabs++
                 rc:RCURLY                               { tabs--; print( rc ); }
                 )                               
                                                 
-        ;
-
+        ;
+
 statementList :( statement )+
-        ;
-
+        ;
+
 statement :statementBody
-        ;
-
+        ;
+
 statementBody :s:SEMI                          { print( s ); }
 
         |       compoundStatement       // Group of statements
@@ -738,8 +738,8 @@ statementBody :s:SEMI                          { print( s ); }
 
 
 
-        ;
-
+        ;
+
 expr :binaryExpr
         |       conditionalExpr
         |       castExpr
@@ -751,20 +751,20 @@ expr :binaryExpr
         |       initializer
         |       rangeExpr
         |       gnuAsmExpr
-        ;
-
+        ;
+
 emptyExpr :NEmptyExpression
-        ;
-
+        ;
+
 compoundStatementExpr :#(l:LPAREN                  { print( l ); }
                 compoundStatement 
                 r:RPAREN                { print( r ); }
             )
-        ;
-
+        ;
+
 rangeExpr :#(NRangeExpr expr v:VARARGS{ print( v ); } expr)
-        ;
-
+        ;
+
 gnuAsmExpr :#(n:NGnuAsmExpr                        { print( n ); }
                 (v:"volatile" { print( v ); } )? 
                 lp:LPAREN               { print( lp ); }
@@ -789,16 +789,16 @@ gnuAsmExpr :#(n:NGnuAsmExpr                        { print( n ); }
                 )?
                 rp:RPAREN               { print( rp ); }
             )
-        ;
-
+        ;
+
 strOptExprPair :stringConst 
             ( 
             l:LPAREN                    { print( l ); }
             expr 
             r:RPAREN                    { print( r ); }
             )?
-        ;
-
+        ;
+
 binaryOperator :ASSIGN
         |       DIV_ASSIGN
         |       PLUS_ASSIGN
@@ -829,8 +829,8 @@ binaryOperator :ASSIGN
         |       DIV
         |       MOD
         |       NCommaExpr
-        ;
-
+        ;
+
 binaryExpr :b:binaryOperator
                     // no rules allowed as roots, so here I manually get 
                     // the first and second children of the binary operator
@@ -843,27 +843,27 @@ binaryExpr :b:binaryOperator
                                                 expr( e2 );
                                         }
                                                 
-        ;
-
+        ;
+
 conditionalExpr :#( q:QUESTION 
                 expr                    { print( q ); }
                 ( expr )? 
                 c:COLON                 { print( c ); }
                 expr 
                 )
-        ;
-
+        ;
+
 castExpr :#( 
                 c:NCast                 { print( c ); }
                 typeName                
                 rp:RPAREN               { print( rp ); }
                 expr 
                 )
-        ;
-
+        ;
+
 typeName :specifierQualifierList (nonemptyAbstractDeclarator)?
-        ;
-
+        ;
+
 nonemptyAbstractDeclarator :#( NNonemptyAbstractDeclarator
             (   pointerGroup
                 (   (lp1:LPAREN                         { print( lp1 ); }
@@ -893,8 +893,8 @@ nonemptyAbstractDeclarator :#( NNonemptyAbstractDeclarator
                 )+
             )
             )
-        ;
-
+        ;
+
 unaryExpr :#( i:INC { print( i ); } expr )
         |       #( d:DEC { print( d ); } expr )
         |       #( NUnaryExpr u:unaryOperator { print( u ); } expr)
@@ -914,8 +914,8 @@ unaryExpr :#( i:INC { print( i ); } expr )
                     | expr
                     )
                 )
-        ;
-
+        ;
+
 unaryOperator :BAND
         |       STAR
         |       PLUS
@@ -925,8 +925,8 @@ unaryOperator :BAND
         |       LAND
         |       "__real"
         |       "__imag"
-        ;
-
+        ;
+
 postfixExpr :#( NPostfixExpr
                     primaryExpr
                     ( a:PTR b:ID                                { print( a ); print( b ); }
@@ -942,8 +942,8 @@ postfixExpr :#( NPostfixExpr
                     | g:DEC                                     { print( g ); }
                     )+
                 )
-        ;
-
+        ;
+
 primaryExpr :i:ID                            { print( i ); }
         |       n:Number                        { print( n ); }
         |       charConst
@@ -957,21 +957,21 @@ primaryExpr :i:ID                            { print( i ); }
         |       #( eg:NExpressionGroup          { print( eg ); }
                  expr                           { print( ")" ); }
                 )
-        ;
-
+        ;
+
 argExprList :expr ( {print( "," );} expr )*
-        ;
-
+        ;
+
 protected charConst :c:CharLiteral                   { print( c ); }
-        ;
-
+        ;
+
 protected stringConst :#( NStringSeq
                     (
                     s:StringLiteral                 { print( s ); }
                     )+
                 )
-        ;
-
+        ;
+
 protected intConst :IntOctalConst
         |       LongOctalConst
         |       UnsignedOctalConst
@@ -981,18 +981,18 @@ protected intConst :IntOctalConst
         |       IntHexConst
         |       LongHexConst
         |       UnsignedHexConst
-        ;
-
+        ;
+
 protected floatConst :FloatDoubleConst
         |       DoubleDoubleConst
         |       LongDoubleConst
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 commaExpr :#(NCommaExpr expr expr)
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 assignExpr :#( ASSIGN expr expr)
         |       #( DIV_ASSIGN expr expr)
         |       #( PLUS_ASSIGN expr expr)
@@ -1004,54 +1004,54 @@ assignExpr :#( ASSIGN expr expr)
         |       #( BAND_ASSIGN expr expr)
         |       #( BOR_ASSIGN expr expr)
         |       #( BXOR_ASSIGN expr expr)
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 logicalOrExpr :#( LOR expr expr) 
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 logicalAndExpr :#( LAND expr expr )
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 inclusiveOrExpr :#( BOR expr expr )
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 exclusiveOrExpr :#( BXOR expr expr )
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 bitAndExpr :#( BAND expr expr )
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 equalityExpr :#( EQUAL expr expr)
         |       #( NOT_EQUAL expr expr)
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 relationalExpr :#( LT expr expr)
         |       #( LTE expr expr)
         |       #( GT expr expr)
         |       #( GTE expr expr)
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 shiftExpr :#( LSHIFT expr expr)
                 | #( RSHIFT expr expr)
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 additiveExpr :#( PLUS expr expr)
         |       #( MINUS expr expr)
-        ;
-
-// inherited from grammar WTreeParser
+        ;
+
+// inherited from grammar WTreeParser
 multExpr :#( STAR expr expr)
         |       #( DIV expr expr)
         |       #( MOD expr expr)
-        ;
-
-
+        ;
+
+