COMP: Remove more warnings/errors

1 files changed, 105 insertions, 105 deletions

diff --git a/Source/cmDependsJavaLexer.in.l b/Source/cmDependsJavaLexer.in.l
index 8954179..f77f7fd 100644
--- a/Source/cmDependsJavaLexer.in.l
+++ b/Source/cmDependsJavaLexer.in.l
@@ -91,115 +91,115 @@ Modify cmDependsJavaLexer.h:
 <comment>.|\n {}
 
 \" { BEGIN(string); }
-<string>\" { BEGIN(INITIAL); return STRINGLITERAL; }
+<string>\" { BEGIN(INITIAL); return jp_STRINGLITERAL; }
 <string>. {}
 
-abstract { KEYWORD; return ABSTRACT; }
-assert { KEYWORD; return ASSERT; }
-boolean { KEYWORD; return BOOLEAN_TYPE; }
-break { KEYWORD; return BREAK; }
-byte { KEYWORD; return BYTE_TYPE; }
-case { KEYWORD; return CASE; }
-catch { KEYWORD; return CATCH; }
-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_TYPE; }
-else { KEYWORD; return ELSE; }
-extends { KEYWORD; return EXTENDS; }
-final { KEYWORD; return FINAL; }
-finally { KEYWORD; return FINALLY; }
-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_TYPE; }
-interface { KEYWORD; return INTERFACE; }
-long { KEYWORD; return LONG_TYPE; }
-native { KEYWORD; return NATIVE; }
-new { KEYWORD; return NEW; }
-package { KEYWORD; return PACKAGE; }
-private { KEYWORD; return PRIVATE; }
-protected { KEYWORD; return PROTECTED; }
-public { KEYWORD; return PUBLIC; }
-return { KEYWORD; return RETURN; }
-short { KEYWORD; return SHORT_TYPE; }
-static { KEYWORD; return STATIC; }
-strictfp { KEYWORD; return STRICTFP; }
-super { KEYWORD; return SUPER; }
-switch { KEYWORD; return SWITCH; }
-synchronized { KEYWORD; return SYNCHRONIZED; }
-this { KEYWORD; return THIS; }
-throw { KEYWORD; return THROW; }
-throws { KEYWORD; return THROWS; }
-transient { KEYWORD; return TRANSIENT; }
-try { KEYWORD; return TRY; }
-void { KEYWORD; return VOID; }
-volatile { KEYWORD; return VOLATILE; }
-while { KEYWORD; return WHILE; }
-
-(true|false) { PRIMITIVE; return BOOLEANLITERAL; }
-\'([^\\]|\\.|\\u[0-9a-fA-F]*|\\[0-7]*)\' { PRIMITIVE; return CHARACTERLITERAL; }
-(0|[0-9]+)[lL]? { PRIMITIVE; return DECIMALINTEGERLITERAL; }
-([0-9]+\.[0-9]*|\.[0-9]+|[0-9]+)([eE][+\-]?[0-9]+)?[fFdD]? { PRIMITIVE; return FLOATINGPOINTLITERAL; }
-0[xX][0-9a-fA-F]+[lL]? { PRIMITIVE; return HEXINTEGERLITERAL; }
-null { PRIMITIVE; return NULLLITERAL; }
-
-"&" { SYMBOL; return AND; }
-"&&" { SYMBOL; return ANDAND; }
-"&=" { SYMBOL; return ANDEQUALS; }
-"\]" { SYMBOL; return BRACKETEND; }
-"\[" { SYMBOL; return BRACKETSTART; }
-"\^" { SYMBOL; return CARROT; }
-"\^=" { SYMBOL; return CARROTEQUALS; }
-":" { SYMBOL; return COLON; }
-"," { SYMBOL; return COMMA; }
-"}" { SYMBOL; return CURLYEND; }
-"{" { SYMBOL; return CURLYSTART; }
-"/" { SYMBOL; return DIVIDE; }
-"/=" { SYMBOL; return DIVIDEEQUALS; }
-"\$" { SYMBOL; return DOLLAR; }
-"\." { SYMBOL; return DOT; }
-"=" { SYMBOL; return EQUALS; }
-"==" { SYMBOL; return EQUALSEQUALS; }
-"\!" { SYMBOL; return EXCLAMATION; }
-"\!=" { SYMBOL; return EXCLAMATIONEQUALS; }
-">" { SYMBOL; return GREATER; }
-">=" { SYMBOL; return GTEQUALS; }
-">>" { SYMBOL; return GTGT; }
-">>=" { SYMBOL; return GTGTEQUALS; }
-">>>" { SYMBOL; return GTGTGT; }
-">>>=" { SYMBOL; return GTGTGTEQUALS; }
-"<<=" { SYMBOL; return LESLESEQUALS; }
-"<" { SYMBOL; return LESSTHAN; }
-"<=" { SYMBOL; return LTEQUALS; }
-"<<" { SYMBOL; return LTLT; }
-"-" { SYMBOL; return MINUS; }
-"-=" { SYMBOL; return MINUSEQUALS; }
-"--" { SYMBOL; return MINUSMINUS; }
-"\)" { SYMBOL; return PAREEND; }
-"\(" { SYMBOL; return PARESTART; }
-"%" { SYMBOL; return PERCENT; }
-"%=" { SYMBOL; return PERCENTEQUALS; }
-"\|" { SYMBOL; return PIPE; }
-"\|=" { SYMBOL; return PIPEEQUALS; }
-"\|\|" { SYMBOL; return PIPEPIPE; }
-"\+" { SYMBOL; return PLUS; }
-"\+=" { SYMBOL; return PLUSEQUALS; }
-"\+\+" { SYMBOL; return PLUSPLUS; }
-"\?" { SYMBOL; return QUESTION; }
-";" { SYMBOL; return SEMICOL; }
-"\~" { SYMBOL; return TILDE; }
-"\*" { SYMBOL; return TIMES; }
-"\*=" { SYMBOL; return TIMESEQUALS; }
+abstract { KEYWORD; return jp_ABSTRACT; }
+assert { KEYWORD; return jp_ASSERT; }
+boolean { KEYWORD; return jp_BOOLEAN_TYPE; }
+break { KEYWORD; return jp_BREAK; }
+byte { KEYWORD; return jp_BYTE_TYPE; }
+case { KEYWORD; return jp_CASE; }
+catch { KEYWORD; return jp_CATCH; }
+char { KEYWORD; return jp_CHAR_TYPE; }
+class { KEYWORD; return jp_CLASS; }
+continue { KEYWORD; return jp_CONTINUE; }
+default { KEYWORD; return jp_DEFAULT; }
+do { KEYWORD; return jp_DO; }
+double { KEYWORD; return jp_DOUBLE_TYPE; }
+else { KEYWORD; return jp_ELSE; }
+extends { KEYWORD; return jp_EXTENDS; }
+final { KEYWORD; return jp_FINAL; }
+finally { KEYWORD; return jp_FINALLY; }
+float { KEYWORD; return jp_FLOAT_TYPE; }
+for { KEYWORD; return jp_FOR; }
+if { KEYWORD; return jp_IF; }
+implements { KEYWORD; return jp_IMPLEMENTS; }
+import { KEYWORD; return jp_IMPORT; }
+instanceof { KEYWORD; return jp_INSTANCEOF; }
+int { KEYWORD; return jp_INT_TYPE; }
+interface { KEYWORD; return jp_INTERFACE; }
+long { KEYWORD; return jp_LONG_TYPE; }
+native { KEYWORD; return jp_NATIVE; }
+new { KEYWORD; return jp_NEW; }
+package { KEYWORD; return jp_PACKAGE; }
+private { KEYWORD; return jp_PRIVATE; }
+protected { KEYWORD; return jp_PROTECTED; }
+public { KEYWORD; return jp_PUBLIC; }
+return { KEYWORD; return jp_RETURN; }
+short { KEYWORD; return jp_SHORT_TYPE; }
+static { KEYWORD; return jp_STATIC; }
+strictfp { KEYWORD; return jp_STRICTFP; }
+super { KEYWORD; return jp_SUPER; }
+switch { KEYWORD; return jp_SWITCH; }
+synchronized { KEYWORD; return jp_SYNCHRONIZED; }
+this { KEYWORD; return jp_THIS; }
+throw { KEYWORD; return jp_THROW; }
+throws { KEYWORD; return jp_THROWS; }
+transient { KEYWORD; return jp_TRANSIENT; }
+try { KEYWORD; return jp_TRY; }
+void { KEYWORD; return jp_VOID; }
+volatile { KEYWORD; return jp_VOLATILE; }
+while { KEYWORD; return jp_WHILE; }
+
+(true|false) { PRIMITIVE; return jp_BOOLEANLITERAL; }
+\'([^\\]|\\.|\\u[0-9a-fA-F]*|\\[0-7]*)\' { PRIMITIVE; return jp_CHARACTERLITERAL; }
+(0|[0-9]+)[lL]? { PRIMITIVE; return jp_DECIMALINTEGERLITERAL; }
+([0-9]+\.[0-9]*|\.[0-9]+|[0-9]+)([eE][+\-]?[0-9]+)?[fFdD]? { PRIMITIVE; return jp_FLOATINGPOINTLITERAL; }
+0[xX][0-9a-fA-F]+[lL]? { PRIMITIVE; return jp_HEXINTEGERLITERAL; }
+null { PRIMITIVE; return jp_NULLLITERAL; }
+
+"&" { SYMBOL; return jp_AND; }
+"&&" { SYMBOL; return jp_ANDAND; }
+"&=" { SYMBOL; return jp_ANDEQUALS; }
+"\]" { SYMBOL; return jp_BRACKETEND; }
+"\[" { SYMBOL; return jp_BRACKETSTART; }
+"\^" { SYMBOL; return jp_CARROT; }
+"\^=" { SYMBOL; return jp_CARROTEQUALS; }
+":" { SYMBOL; return jp_COLON; }
+"," { SYMBOL; return jp_COMMA; }
+"}" { SYMBOL; return jp_CURLYEND; }
+"{" { SYMBOL; return jp_CURLYSTART; }
+"/" { SYMBOL; return jp_DIVIDE; }
+"/=" { SYMBOL; return jp_DIVIDEEQUALS; }
+"\$" { SYMBOL; return jp_DOLLAR; }
+"\." { SYMBOL; return jp_DOT; }
+"=" { SYMBOL; return jp_EQUALS; }
+"==" { SYMBOL; return jp_EQUALSEQUALS; }
+"\!" { SYMBOL; return jp_EXCLAMATION; }
+"\!=" { SYMBOL; return jp_EXCLAMATIONEQUALS; }
+">" { SYMBOL; return jp_GREATER; }
+">=" { SYMBOL; return jp_GTEQUALS; }
+">>" { SYMBOL; return jp_GTGT; }
+">>=" { SYMBOL; return jp_GTGTEQUALS; }
+">>>" { SYMBOL; return jp_GTGTGT; }
+">>>=" { SYMBOL; return jp_GTGTGTEQUALS; }
+"<<=" { SYMBOL; return jp_LESLESEQUALS; }
+"<" { SYMBOL; return jp_LESSTHAN; }
+"<=" { SYMBOL; return jp_LTEQUALS; }
+"<<" { SYMBOL; return jp_LTLT; }
+"-" { SYMBOL; return jp_MINUS; }
+"-=" { SYMBOL; return jp_MINUSEQUALS; }
+"--" { SYMBOL; return jp_MINUSMINUS; }
+"\)" { SYMBOL; return jp_PAREEND; }
+"\(" { SYMBOL; return jp_PARESTART; }
+"%" { SYMBOL; return jp_PERCENT; }
+"%=" { SYMBOL; return jp_PERCENTEQUALS; }
+"\|" { SYMBOL; return jp_PIPE; }
+"\|=" { SYMBOL; return jp_PIPEEQUALS; }
+"\|\|" { SYMBOL; return jp_PIPEPIPE; }
+"\+" { SYMBOL; return jp_PLUS; }
+"\+=" { SYMBOL; return jp_PLUSEQUALS; }
+"\+\+" { SYMBOL; return jp_PLUSPLUS; }
+"\?" { SYMBOL; return jp_QUESTION; }
+";" { SYMBOL; return jp_SEMICOL; }
+"\~" { SYMBOL; return jp_TILDE; }
+"\*" { SYMBOL; return jp_TIMES; }
+"\*=" { SYMBOL; return jp_TIMESEQUALS; }
 
 [a-z_A-Z][a-z_0-9A-Z]* { 
   yyextra->AllocateParserType(yylvalp, yytext, strlen(yytext)); 
-  return NAME; 
+  return jp_NAME; 
 }
 
 \/\/.*\n { }
@@ -208,7 +208,7 @@ null { PRIMITIVE; return NULLLITERAL; }
   std::cerr << "Unknown character: " << yytext[0] 
     << " (" << (int)yytext[0] << ")" << std::endl; 
   yyextra->Error("Unknown character"); 
-  return ERROR; 
+  return jp_ERROR; 
 }
 
 %%