COMP: Remove warnings

Source/cmDependsJavaLexer.cxx

@@ -1059,7 +1059,7 @@ YY_RULE_SETUP
 case 9:
 YY_RULE_SETUP
 #line 99 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return BOOLEAN; }
+{ KEYWORD; return BOOLEAN_TYPE; }
   YY_BREAK
 case 10:
 YY_RULE_SETUP
@@ -1069,7 +1069,7 @@ YY_RULE_SETUP
 case 11:
 YY_RULE_SETUP
 #line 101 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return BYTE; }
+{ KEYWORD; return BYTE_TYPE; }
   YY_BREAK
 case 12:
 YY_RULE_SETUP
@@ -1084,7 +1084,7 @@ YY_RULE_SETUP
 case 14:
 YY_RULE_SETUP
 #line 104 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return CHAR; }
+{ KEYWORD; return CHAR_TYPE; }
   YY_BREAK
 case 15:
 YY_RULE_SETUP
@@ -1109,7 +1109,7 @@ YY_RULE_SETUP
 case 19:
 YY_RULE_SETUP
 #line 109 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return DOUBLE; }
+{ KEYWORD; return DOUBLE_TYPE; }
   YY_BREAK
 case 20:
 YY_RULE_SETUP
@@ -1134,7 +1134,7 @@ YY_RULE_SETUP
 case 24:
 YY_RULE_SETUP
 #line 114 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return FLOAT; }
+{ KEYWORD; return FLOAT_TYPE; }
   YY_BREAK
 case 25:
 YY_RULE_SETUP
@@ -1164,7 +1164,7 @@ YY_RULE_SETUP
 case 30:
 YY_RULE_SETUP
 #line 120 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return INT; }
+{ KEYWORD; return INT_TYPE; }
   YY_BREAK
 case 31:
 YY_RULE_SETUP
@@ -1174,7 +1174,7 @@ YY_RULE_SETUP
 case 32:
 YY_RULE_SETUP
 #line 122 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return LONG; }
+{ KEYWORD; return LONG_TYPE; }
   YY_BREAK
 case 33:
 YY_RULE_SETUP
@@ -1214,7 +1214,7 @@ YY_RULE_SETUP
 case 40:
 YY_RULE_SETUP
 #line 130 "cmDependsJavaLexer.in.l"
-{ KEYWORD; return SHORT; }
+{ KEYWORD; return SHORT_TYPE; }
   YY_BREAK
 case 41:
 YY_RULE_SETUP

Source/cmDependsJavaLexer.in.l

@@ -96,30 +96,30 @@ Modify cmDependsJavaLexer.h:
 
 abstract { KEYWORD; return ABSTRACT; }
 assert { KEYWORD; return ASSERT; }
-boolean { KEYWORD; return BOOLEAN; }
+boolean { KEYWORD; return BOOLEAN_TYPE; }
 break { KEYWORD; return BREAK; }
-byte { KEYWORD; return BYTE; }
+byte { KEYWORD; return BYTE_TYPE; }
 case { KEYWORD; return CASE; }
 catch { KEYWORD; return CATCH; }
-char { KEYWORD; return CHAR; }
+char { KEYWORD; return CHAR_TYPE; }
 class { KEYWORD; return CLASS; }
 continue { KEYWORD; return CONTINUE; }
 default { KEYWORD; return DEFAULT; }
 do { KEYWORD; return DO; }
-double { KEYWORD; return DOUBLE; }
+double { KEYWORD; return DOUBLE_TYPE; }
 else { KEYWORD; return ELSE; }
 extends { KEYWORD; return EXTENDS; }
 final { KEYWORD; return FINAL; }
 finally { KEYWORD; return FINALLY; }
-float { KEYWORD; return FLOAT; }
+float { KEYWORD; return FLOAT_TYPE; }
 for { KEYWORD; return FOR; }
 if { KEYWORD; return IF; }
 implements { KEYWORD; return IMPLEMENTS; }
 import { KEYWORD; return IMPORT; }
 instanceof { KEYWORD; return INSTANCEOF; }
-int { KEYWORD; return INT; }
+int { KEYWORD; return INT_TYPE; }
 interface { KEYWORD; return INTERFACE; }
-long { KEYWORD; return LONG; }
+long { KEYWORD; return LONG_TYPE; }
 native { KEYWORD; return NATIVE; }
 new { KEYWORD; return NEW; }
 package { KEYWORD; return PACKAGE; }
@@ -127,7 +127,7 @@ private { KEYWORD; return PRIVATE; }
 protected { KEYWORD; return PROTECTED; }
 public { KEYWORD; return PUBLIC; }
 return { KEYWORD; return RETURN; }
-short { KEYWORD; return SHORT; }
+short { KEYWORD; return SHORT_TYPE; }
 static { KEYWORD; return STATIC; }
 strictfp { KEYWORD; return STRICTFP; }
 super { KEYWORD; return SUPER; }

Source/cmDependsJavaParser.y

@@ -60,6 +60,7 @@ static void cmDependsJavaError(yyscan_t yyscanner, const char* message);
 #endif
 #ifdef _MSC_VER
 # pragma warning (disable: 4102) /* Unused goto label.  */
+# pragma warning (disable: 4065) /* Switch statement contains default but no case. */
 #endif
 %}
 
@@ -76,30 +77,30 @@ static void cmDependsJavaError(yyscan_t yyscanner, const char* message);
 /* Tokens */
 %token ABSTRACT
 %token ASSERT
-%token BOOLEAN
+%token BOOLEAN_TYPE
 %token BREAK
-%token BYTE
+%token BYTE_TYPE
 %token CASE
 %token CATCH
-%token CHAR
+%token CHAR_TYPE
 %token CLASS
 %token CONTINUE
 %token DEFAULT
 %token DO
-%token DOUBLE
+%token DOUBLE_TYPE
 %token ELSE
 %token EXTENDS
 %token FINAL
 %token FINALLY
-%token FLOAT
+%token FLOAT_TYPE
 %token FOR
 %token IF
 %token IMPLEMENTS
 %token IMPORT
 %token INSTANCEOF
-%token INT
+%token INT_TYPE
 %token INTERFACE
-%token LONG
+%token LONG_TYPE
 %token NATIVE
 %token NEW
 %token PACKAGE
@@ -107,7 +108,7 @@ static void cmDependsJavaError(yyscan_t yyscanner, const char* message);
 %token PROTECTED
 %token PUBLIC
 %token RETURN
-%token SHORT
+%token SHORT_TYPE
 %token STATIC
 %token STRICTFP
 %token SUPER
@@ -279,42 +280,42 @@ ReferenceType
 }
 
 PrimitiveType:
-BYTE
+BYTE_TYPE
 {
   ELEMENTSTART(0);
 }
 |
-SHORT
+SHORT_TYPE
 {
   ELEMENTSTART(0);
 }
 |
-INT
+INT_TYPE
 {
   ELEMENTSTART(0);
 }
 |
-LONG
+LONG_TYPE
 {
   ELEMENTSTART(0);
 }
 |
-CHAR
+CHAR_TYPE
 {
   ELEMENTSTART(0);
 }
 |
-FLOAT
+FLOAT_TYPE
 {
   ELEMENTSTART(0);
 }
 |
-DOUBLE
+DOUBLE_TYPE
 {
   ELEMENTSTART(0);
 }
 |
-BOOLEAN
+BOOLEAN_TYPE
 {
   ELEMENTSTART(0);
 }

Source/cmDependsJavaParserTokens.h

@@ -31,30 +31,30 @@
    enum yytokentype {
      ABSTRACT = 258,
      ASSERT = 259,
-     BOOLEAN = 260,
+     BOOLEAN_TYPE = 260,
      BREAK = 261,
-     BYTE = 262,
+     BYTE_TYPE = 262,
      CASE = 263,
      CATCH = 264,
-     CHAR = 265,
+     CHAR_TYPE = 265,
      CLASS = 266,
      CONTINUE = 267,
      DEFAULT = 268,
      DO = 269,
-     DOUBLE = 270,
+     DOUBLE_TYPE = 270,
      ELSE = 271,
      EXTENDS = 272,
      FINAL = 273,
      FINALLY = 274,
-     FLOAT = 275,
+     FLOAT_TYPE = 275,
      FOR = 276,
      IF = 277,
      IMPLEMENTS = 278,
      IMPORT = 279,
      INSTANCEOF = 280,
-     INT = 281,
+     INT_TYPE = 281,
      INTERFACE = 282,
-     LONG = 283,
+     LONG_TYPE = 283,
      NATIVE = 284,
      NEW = 285,
      PACKAGE = 286,
@@ -62,7 +62,7 @@
      PROTECTED = 288,
      PUBLIC = 289,
      RETURN = 290,
-     SHORT = 291,
+     SHORT_TYPE = 291,
      STATIC = 292,
      STRICTFP = 293,
      SUPER = 294,
@@ -136,30 +136,30 @@
 #endif
 #define ABSTRACT 258
 #define ASSERT 259
-#define BOOLEAN 260
+#define BOOLEAN_TYPE 260
 #define BREAK 261
-#define BYTE 262
+#define BYTE_TYPE 262
 #define CASE 263
 #define CATCH 264
-#define CHAR 265
+#define CHAR_TYPE 265
 #define CLASS 266
 #define CONTINUE 267
 #define DEFAULT 268
 #define DO 269
-#define DOUBLE 270
+#define DOUBLE_TYPE 270
 #define ELSE 271
 #define EXTENDS 272
 #define FINAL 273
 #define FINALLY 274
-#define FLOAT 275
+#define FLOAT_TYPE 275
 #define FOR 276
 #define IF 277
 #define IMPLEMENTS 278
 #define IMPORT 279
 #define INSTANCEOF 280
-#define INT 281
+#define INT_TYPE 281
 #define INTERFACE 282
-#define LONG 283
+#define LONG_TYPE 283
 #define NATIVE 284
 #define NEW 285
 #define PACKAGE 286
@@ -167,7 +167,7 @@
 #define PROTECTED 288
 #define PUBLIC 289
 #define RETURN 290
-#define SHORT 291
+#define SHORT_TYPE 291
 #define STATIC 292
 #define STRICTFP 293
 #define SUPER 294