fixing warnings in LR parser plugins

2 files changed, 11 insertions, 12 deletions

diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java
index e2e729b7458..6953ff43dac 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java
@@ -191,7 +191,6 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
 		
 		undoStack.add(new IUndoAction() {
 			public void undo() {
-				if(DEBUG) DebugUtil.printMethodTrace("undo");
 				
 				bindingScopeStack.removeLast();
 				symbolTable = symbolTableScopeStack.removeLast();
@@ -1030,7 +1029,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
 
 	
 
-	public IBinding consumeEnumerator(boolean hasInitializer) {
+	public IBinding consumeEnumerator() {
 		if(DEBUG) DebugUtil.printMethodTrace();
 		
 		IToken token = parser.getLeftIToken();
@@ -1206,7 +1205,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
 	}
 	
 	
-	
+	@SuppressWarnings("nls")
 	public void consumeExpressionConstant(int kind) {
 		if(DEBUG) DebugUtil.printMethodTrace();
 		
@@ -1407,7 +1406,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
 	}
 
 
-	public void consumeExpressionUnaryOperator(int operator) {
+	public void consumeExpressionUnaryOperator() {
 		if(DEBUG) DebugUtil.printMethodTrace();
 		
 		// TODO: this is lazy, need to check the actual rules for types and operators
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java
index e6eeaa5c6dc..a7930076d4b 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java
@@ -15,6 +15,7 @@ import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.cdt.core.dom.ast.IBasicType;
 import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.c.ICBasicType;
 import org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym;
@@ -84,26 +85,26 @@ class DeclSpec {
 		if(type != null)
 			return type;
 		if(tokenKindMap.isEmpty()) // there are no type tokens, so it must be implicit int
-			return new C99BasicType(ICBasicType.t_int);
+			return new C99BasicType(IBasicType.t_int);
 		
 		C99BasicType basicType = new C99BasicType();
 		
 		for(int kind : tokenKindMap.keySet()) {
 			switch(kind) {
 				case TK_void:
-					basicType.setType(ICBasicType.t_void);
+					basicType.setType(IBasicType.t_void);
 					break;
 				case TK_char:
-					basicType.setType(ICBasicType.t_char);
+					basicType.setType(IBasicType.t_char);
 					break;
 				case TK_int:
-					basicType.setType(ICBasicType.t_int);
+					basicType.setType(IBasicType.t_int);
 					break;
 				case TK_float:
-					basicType.setType(ICBasicType.t_float);
+					basicType.setType(IBasicType.t_float);
 					break;
 				case TK_double:
-					basicType.setType(ICBasicType.t_double);
+					basicType.setType(IBasicType.t_double);
 					break;
 				case TK_long:
 					boolean isLongLong = count(TK_long) > 1;
@@ -137,8 +138,7 @@ class DeclSpec {
 		
 		if(isConst || isRestrict || isVolatile)
 			return new C99QualifierType(basicType, isConst, isVolatile, isRestrict);
-		else
-			return basicType;
+		return basicType;
 	}