Consolidating token kind definitions that are common to IN_COMMENT and IN_PREPROCESSOR_OUTPUT_COMMENT

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4444 51baf565-9d33-0410-a72c-fc3788e3496d

pmd/etc/grammar/cpp.jj

@@ -158,15 +158,12 @@ SKIP :
 <IN_COMMENT> SKIP:
 { "*/" : DEFAULT }
 
-<IN_COMMENT> MORE:
+<IN_COMMENT,IN_PREPROCESSOR_OUTPUT_COMMENT> MORE:
 { < ~[] > }
 
 <IN_PREPROCESSOR_OUTPUT_COMMENT> SKIP:
 { "*/" : PREPROCESSOR_OUTPUT }
 
-<IN_PREPROCESSOR_OUTPUT_COMMENT> MORE:
-{ < ~[] > }
-
 <PREPROCESSOR_OUTPUT> SKIP:
 {
    "\n" : DEFAULT
@@ -703,8 +700,7 @@ void base_specifier(ClassScope scope) :
    ("virtual" (access_specifier())? | access_specifier() ("virtual")?)?
    (LOOKAHEAD(scope_override_lookahead()) scope_override())?
    t = <ID> ("<" template_argument_list()  ">")?
-   {
-      scope.AddSuper(sym.GetScope(t.image));
+   {                          scope.AddSuper(sym.GetScope(t.image));
    }
 }
 

pmd/src/net/sourceforge/pmd/cpd/cppast/CPPParserConstants.java

@@ -4,122 +4,122 @@ package net.sourceforge.pmd.cpd.cppast;
 public interface CPPParserConstants {
 
   int EOF = 0;
-  int LCURLYBRACE = 19;
-  int RCURLYBRACE = 20;
-  int LSQUAREBRACKET = 21;
-  int RSQUAREBRACKET = 22;
-  int LPARENTHESIS = 23;
-  int RPARENTHESIS = 24;
-  int SCOPE = 25;
-  int COLON = 26;
-  int SEMICOLON = 27;
-  int COMMA = 28;
-  int QUESTIONMARK = 29;
-  int ELLIPSIS = 30;
-  int ASSIGNEQUAL = 31;
-  int TIMESEQUAL = 32;
-  int DIVIDEEQUAL = 33;
-  int MODEQUAL = 34;
-  int PLUSEQUAL = 35;
-  int MINUSEQUAL = 36;
-  int SHIFTLEFTEQUAL = 37;
-  int SHIFTRIGHTEQUAL = 38;
-  int BITWISEANDEQUAL = 39;
-  int BITWISEXOREQUAL = 40;
-  int BITWISEOREQUAL = 41;
-  int OR = 42;
-  int AND = 43;
-  int BITWISEOR = 44;
-  int BITWISEXOR = 45;
-  int AMPERSAND = 46;
-  int EQUAL = 47;
-  int NOTEQUAL = 48;
-  int LESSTHAN = 49;
-  int GREATERTHAN = 50;
-  int LESSTHANOREQUALTO = 51;
-  int GREATERTHANOREQUALTO = 52;
-  int SHIFTLEFT = 53;
-  int SHIFTRIGHT = 54;
-  int PLUS = 55;
-  int MINUS = 56;
-  int STAR = 57;
-  int DIVIDE = 58;
-  int MOD = 59;
-  int PLUSPLUS = 60;
-  int MINUSMINUS = 61;
-  int TILDE = 62;
-  int NOT = 63;
-  int DOT = 64;
-  int POINTERTO = 65;
-  int DOTSTAR = 66;
-  int ARROWSTAR = 67;
-  int AUTO = 68;
-  int BREAK = 69;
-  int CASE = 70;
-  int CATCH = 71;
-  int CHAR = 72;
-  int CONST = 73;
-  int CONTINUE = 74;
-  int _DEFAULT = 75;
-  int DELETE = 76;
-  int DO = 77;
-  int DOUBLE = 78;
-  int ELSE = 79;
-  int ENUM = 80;
-  int EXTERN = 81;
-  int FLOAT = 82;
-  int FOR = 83;
-  int FRIEND = 84;
-  int GOTO = 85;
-  int IF = 86;
-  int INLINE = 87;
-  int INT = 88;
-  int LONG = 89;
-  int NEW = 90;
-  int PRIVATE = 91;
-  int PROTECTED = 92;
-  int PUBLIC = 93;
-  int REDECLARED = 94;
-  int REGISTER = 95;
-  int RETURN = 96;
-  int SHORT = 97;
-  int SIGNED = 98;
-  int SIZEOF = 99;
-  int STATIC = 100;
-  int STRUCT = 101;
-  int CLASS = 102;
-  int SWITCH = 103;
-  int TEMPLATE = 104;
-  int THIS = 105;
-  int TRY = 106;
-  int TYPEDEF = 107;
-  int UNION = 108;
-  int UNSIGNED = 109;
-  int VIRTUAL = 110;
-  int VOID = 111;
-  int VOLATILE = 112;
-  int WHILE = 113;
-  int OPERATOR = 114;
-  int TRUETOK = 115;
-  int FALSETOK = 116;
-  int THROW = 117;
-  int OCTALINT = 118;
-  int OCTALLONG = 119;
-  int UNSIGNED_OCTALINT = 120;
-  int UNSIGNED_OCTALLONG = 121;
-  int DECIMALINT = 122;
-  int DECIMALLONG = 123;
-  int UNSIGNED_DECIMALINT = 124;
-  int UNSIGNED_DECIMALLONG = 125;
-  int HEXADECIMALINT = 126;
-  int HEXADECIMALLONG = 127;
-  int UNSIGNED_HEXADECIMALINT = 128;
-  int UNSIGNED_HEXADECIMALLONG = 129;
-  int FLOATONE = 130;
-  int FLOATTWO = 131;
-  int CHARACTER = 132;
-  int STRING = 133;
-  int ID = 135;
+  int LCURLYBRACE = 18;
+  int RCURLYBRACE = 19;
+  int LSQUAREBRACKET = 20;
+  int RSQUAREBRACKET = 21;
+  int LPARENTHESIS = 22;
+  int RPARENTHESIS = 23;
+  int SCOPE = 24;
+  int COLON = 25;
+  int SEMICOLON = 26;
+  int COMMA = 27;
+  int QUESTIONMARK = 28;
+  int ELLIPSIS = 29;
+  int ASSIGNEQUAL = 30;
+  int TIMESEQUAL = 31;
+  int DIVIDEEQUAL = 32;
+  int MODEQUAL = 33;
+  int PLUSEQUAL = 34;
+  int MINUSEQUAL = 35;
+  int SHIFTLEFTEQUAL = 36;
+  int SHIFTRIGHTEQUAL = 37;
+  int BITWISEANDEQUAL = 38;
+  int BITWISEXOREQUAL = 39;
+  int BITWISEOREQUAL = 40;
+  int OR = 41;
+  int AND = 42;
+  int BITWISEOR = 43;
+  int BITWISEXOR = 44;
+  int AMPERSAND = 45;
+  int EQUAL = 46;
+  int NOTEQUAL = 47;
+  int LESSTHAN = 48;
+  int GREATERTHAN = 49;
+  int LESSTHANOREQUALTO = 50;
+  int GREATERTHANOREQUALTO = 51;
+  int SHIFTLEFT = 52;
+  int SHIFTRIGHT = 53;
+  int PLUS = 54;
+  int MINUS = 55;
+  int STAR = 56;
+  int DIVIDE = 57;
+  int MOD = 58;
+  int PLUSPLUS = 59;
+  int MINUSMINUS = 60;
+  int TILDE = 61;
+  int NOT = 62;
+  int DOT = 63;
+  int POINTERTO = 64;
+  int DOTSTAR = 65;
+  int ARROWSTAR = 66;
+  int AUTO = 67;
+  int BREAK = 68;
+  int CASE = 69;
+  int CATCH = 70;
+  int CHAR = 71;
+  int CONST = 72;
+  int CONTINUE = 73;
+  int _DEFAULT = 74;
+  int DELETE = 75;
+  int DO = 76;
+  int DOUBLE = 77;
+  int ELSE = 78;
+  int ENUM = 79;
+  int EXTERN = 80;
+  int FLOAT = 81;
+  int FOR = 82;
+  int FRIEND = 83;
+  int GOTO = 84;
+  int IF = 85;
+  int INLINE = 86;
+  int INT = 87;
+  int LONG = 88;
+  int NEW = 89;
+  int PRIVATE = 90;
+  int PROTECTED = 91;
+  int PUBLIC = 92;
+  int REDECLARED = 93;
+  int REGISTER = 94;
+  int RETURN = 95;
+  int SHORT = 96;
+  int SIGNED = 97;
+  int SIZEOF = 98;
+  int STATIC = 99;
+  int STRUCT = 100;
+  int CLASS = 101;
+  int SWITCH = 102;
+  int TEMPLATE = 103;
+  int THIS = 104;
+  int TRY = 105;
+  int TYPEDEF = 106;
+  int UNION = 107;
+  int UNSIGNED = 108;
+  int VIRTUAL = 109;
+  int VOID = 110;
+  int VOLATILE = 111;
+  int WHILE = 112;
+  int OPERATOR = 113;
+  int TRUETOK = 114;
+  int FALSETOK = 115;
+  int THROW = 116;
+  int OCTALINT = 117;
+  int OCTALLONG = 118;
+  int UNSIGNED_OCTALINT = 119;
+  int UNSIGNED_OCTALLONG = 120;
+  int DECIMALINT = 121;
+  int DECIMALLONG = 122;
+  int UNSIGNED_DECIMALINT = 123;
+  int UNSIGNED_DECIMALLONG = 124;
+  int HEXADECIMALINT = 125;
+  int HEXADECIMALLONG = 126;
+  int UNSIGNED_HEXADECIMALINT = 127;
+  int UNSIGNED_HEXADECIMALLONG = 128;
+  int FLOATONE = 129;
+  int FLOATTWO = 130;
+  int CHARACTER = 131;
+  int STRING = 132;
+  int ID = 134;
 
   int DEFAULT = 0;
   int IN_LINE_COMMENT = 1;
@@ -141,12 +141,11 @@ public interface CPPParserConstants {
     "\"*/\"",
     "<token of kind 11>",
     "\"*/\"",
-    "<token of kind 13>",
     "\"\\n\"",
     "\"/*\"",
     "\"\\\\\\n\"",
     "\"\\\\\\r\\n\"",
-    "<token of kind 18>",
+    "<token of kind 17>",
     "\"{\"",
     "\"}\"",
     "\"[\"",