mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

fixing warnings in LR parser plugins

Browse source
This commit is contained in:
Mike Kucera 2008-04-09 19:28:36 +00:00
parent 76beb6c750
commit fe47120500
12 changed files with 36 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/C99ResolveParserAction.java
View file

@ -191,7 +191,6 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
undoStack.add(new IUndoAction() { undoStack.add(new IUndoAction() {
public void undo() { public void undo() {
if(DEBUG) DebugUtil.printMethodTrace("undo");
bindingScopeStack.removeLast(); bindingScopeStack.removeLast();
symbolTable = symbolTableScopeStack.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(); if(DEBUG) DebugUtil.printMethodTrace();
IToken token = parser.getLeftIToken(); IToken token = parser.getLeftIToken();
@ -1206,7 +1205,7 @@ import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
} }
@SuppressWarnings("nls")
public void consumeExpressionConstant(int kind) { public void consumeExpressionConstant(int kind) {
if(DEBUG) DebugUtil.printMethodTrace(); 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(); if(DEBUG) DebugUtil.printMethodTrace();
// TODO: this is lazy, need to check the actual rules for types and operators // TODO: this is lazy, need to check the actual rules for types and operators

16
lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/action/deprecated/DeclSpec.java
View file

@ -15,6 +15,7 @@ import static org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym.*;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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.IType;
import org.eclipse.cdt.core.dom.ast.c.ICBasicType; import org.eclipse.cdt.core.dom.ast.c.ICBasicType;
import org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym; import org.eclipse.cdt.internal.core.dom.lrparser.c99.C99Parsersym;
@ -84,26 +85,26 @@ class DeclSpec {
if(type != null) if(type != null)
return type; return type;
if(tokenKindMap.isEmpty()) // there are no type tokens, so it must be implicit int 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(); C99BasicType basicType = new C99BasicType();
for(int kind : tokenKindMap.keySet()) { for(int kind : tokenKindMap.keySet()) {
switch(kind) { switch(kind) {
case TK_void: case TK_void:
basicType.setType(ICBasicType.t_void); basicType.setType(IBasicType.t_void);
break; break;
case TK_char: case TK_char:
basicType.setType(ICBasicType.t_char); basicType.setType(IBasicType.t_char);
break; break;
case TK_int: case TK_int:
basicType.setType(ICBasicType.t_int); basicType.setType(IBasicType.t_int);
break; break;
case TK_float: case TK_float:
basicType.setType(ICBasicType.t_float); basicType.setType(IBasicType.t_float);
break; break;
case TK_double: case TK_double:
basicType.setType(ICBasicType.t_double); basicType.setType(IBasicType.t_double);
break; break;
case TK_long: case TK_long:
boolean isLongLong = count(TK_long) > 1; boolean isLongLong = count(TK_long) > 1;
@ -137,8 +138,7 @@ class DeclSpec {
if(isConst || isRestrict || isVolatile) if(isConst || isRestrict || isVolatile)
return new C99QualifierType(basicType, isConst, isVolatile, isRestrict); return new C99QualifierType(basicType, isConst, isVolatile, isRestrict);
else return basicType;
return basicType;
} }

4
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/BaseExtensibleLanguage.java
View file

@ -82,6 +82,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage implements
protected abstract ParserLanguage getParserLanguageForPreprocessor(); protected abstract ParserLanguage getParserLanguageForPreprocessor();
@SuppressWarnings("unchecked")
@Override @Override
public Object getAdapter(Class adapter) { public Object getAdapter(Class adapter) {
if (adapter == IPDOMLinkageFactory.class) if (adapter == IPDOMLinkageFactory.class)
@ -117,7 +118,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage implements
ParserLanguage pl = getParserLanguageForPreprocessor(); ParserLanguage pl = getParserLanguageForPreprocessor();
IScanner preprocessor = new CPreprocessor(reader, scanInfo, pl, log, config, fileCreator); IScanner preprocessor = new CPreprocessor(reader, scanInfo, pl, log, config, fileCreator);
preprocessor.setScanComments((options & OPTION_ADD_COMMENTS) != 0); preprocessor.setScanComments((options & OPTION_ADD_COMMENTS) != 0);
preprocessor.setComputeImageLocations((options & AbstractLanguage.OPTION_NO_IMAGE_LOCATIONS) == 0); preprocessor.setComputeImageLocations((options & ILanguage.OPTION_NO_IMAGE_LOCATIONS) == 0);
IParser parser = getParser(); IParser parser = getParser();
IASTTranslationUnit tu = createASTTranslationUnit(index, preprocessor); IASTTranslationUnit tu = createASTTranslationUnit(index, preprocessor);
@ -143,6 +144,7 @@ public abstract class BaseExtensibleLanguage extends AbstractLanguage implements
} }
@SuppressWarnings("nls")
public IASTCompletionNode getCompletionNode(CodeReader reader, public IASTCompletionNode getCompletionNode(CodeReader reader,
IScannerInfo scanInfo, ICodeReaderFactory fileCreator, IScannerInfo scanInfo, ICodeReaderFactory fileCreator,
IIndex index, IParserLogService log, int offset) throws CoreException { IIndex index, IParserLogService log, int offset) throws CoreException {

6
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/LPGTokenAdapter.java
View file

@ -92,7 +92,7 @@ public class LPGTokenAdapter implements lpg.lpgjavaruntime.IToken {
} }
@Deprecated @Deprecated
public String getValue(char[] arg0) { public String getValue(@SuppressWarnings("unused") char[] arg0) {
return toString(); return toString();
} }
@ -100,7 +100,7 @@ public class LPGTokenAdapter implements lpg.lpgjavaruntime.IToken {
this.adjunctIndex = adjunctIndex; this.adjunctIndex = adjunctIndex;
} }
public void setEndOffset(int arg0) { public void setEndOffset(@SuppressWarnings("unused") int arg0) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -108,7 +108,7 @@ public class LPGTokenAdapter implements lpg.lpgjavaruntime.IToken {
this.kind = kind; this.kind = kind;
} }
public void setStartOffset(int arg0) { public void setStartOffset(@SuppressWarnings("unused") int arg0) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

3
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/BuildASTParserAction.java
View file

@ -67,6 +67,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTCastExpression;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTLiteralExpression;
import org.eclipse.cdt.core.dom.lrparser.IParser; import org.eclipse.cdt.core.dom.lrparser.IParser;
import org.eclipse.cdt.core.dom.lrparser.IParserActionTokenProvider; import org.eclipse.cdt.core.dom.lrparser.IParserActionTokenProvider;
import org.eclipse.cdt.core.parser.IProblem;
import org.eclipse.cdt.core.parser.util.DebugUtil; import org.eclipse.cdt.core.parser.util.DebugUtil;
import org.eclipse.cdt.internal.core.dom.parser.ASTNode; import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
@ -1442,7 +1443,7 @@ public abstract class BuildASTParserAction {
private void consumeProblem(IASTProblemHolder problemHolder) { private void consumeProblem(IASTProblemHolder problemHolder) {
IASTProblem problem = nodeFactory.newProblem(IASTProblem.SYNTAX_ERROR, new char[0], true); IASTProblem problem = nodeFactory.newProblem(IProblem.SYNTAX_ERROR, new char[0], true);
problemHolder.setProblem(problem); problemHolder.setProblem(problem);
setOffsetAndLength(problem); setOffsetAndLength(problem);
setOffsetAndLength((ASTNode)problemHolder); setOffsetAndLength((ASTNode)problemHolder);

3
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99ASTNodeFactory.java
View file

@ -210,6 +210,9 @@ public class C99ASTNodeFactory implements IC99ASTNodeFactory {
return new CASTTypeIdInitializerExpression(typeId, list); return new CASTTypeIdInitializerExpression(typeId, list);
} }
/**
* @param operator
*/
public IASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand) { public IASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand) {
return new CASTCastExpression(typeId, operand); return new CASTCastExpression(typeId, operand);
} }

2
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/c99/C99BuildASTParserAction.java
View file

@ -760,7 +760,7 @@ public class C99BuildASTParserAction extends BuildASTParserAction {
IASTCompoundStatement body = (IASTCompoundStatement) astStack.pop(); IASTCompoundStatement body = (IASTCompoundStatement) astStack.pop();
IASTDeclaration[] declarations = (IASTDeclaration[]) astStack.topScope().toArray(new IASTDeclaration[0]); IASTDeclaration[] declarations = astStack.topScope().toArray(new IASTDeclaration[0]);
astStack.closeScope(); astStack.closeScope();
ICASTKnRFunctionDeclarator decl = (ICASTKnRFunctionDeclarator) astStack.pop(); ICASTKnRFunctionDeclarator decl = (ICASTKnRFunctionDeclarator) astStack.pop();

6
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/action/cpp/CPPBuildASTParserAction.java
View file

@ -104,6 +104,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.OverloadableOperator;
* *
* @author Mike Kucera * @author Mike Kucera
*/ */
@SuppressWarnings("restriction")
public class CPPBuildASTParserAction extends BuildASTParserAction { public class CPPBuildASTParserAction extends BuildASTParserAction {
@ -394,7 +395,7 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
} }
@SuppressWarnings("restriction")
private static OverloadableOperator getOverloadableOperator(List<IToken> tokens) { private static OverloadableOperator getOverloadableOperator(List<IToken> tokens) {
if(tokens.size() == 1) { if(tokens.size() == 1) {
// TODO this is a hack that I did to save time // TODO this is a hack that I did to save time
@ -486,7 +487,7 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
* | '::' operator_function_id * | '::' operator_function_id
* | '::' template_id * | '::' template_id
*/ */
@SuppressWarnings("restriction")
public void consumeGlobalQualifiedId() { public void consumeGlobalQualifiedId() {
if(TRACE_ACTIONS) DebugUtil.printMethodTrace(); if(TRACE_ACTIONS) DebugUtil.printMethodTrace();
@ -735,7 +736,6 @@ public class CPPBuildASTParserAction extends BuildASTParserAction {
* *
* @param names List of name nodes in reverse order * @param names List of name nodes in reverse order
*/ */
@SuppressWarnings("restriction")
private IASTName createQualifiedName(LinkedList<IASTName> names, int startOffset, int endOffset, boolean startsWithColonColon, boolean endsWithColonColon) { private IASTName createQualifiedName(LinkedList<IASTName> names, int startOffset, int endOffset, boolean startsWithColonColon, boolean endsWithColonColon) {
if(!endsWithColonColon && !startsWithColonColon && names.size() == 1) if(!endsWithColonColon && !startsWithColonColon && names.size() == 1)
return names.getFirst(); // its actually an unqualified name return names.getFirst(); // its actually an unqualified name

4
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/c99/C99Language.java
View file

@ -31,6 +31,7 @@ import org.eclipse.cdt.internal.core.dom.parser.c.CASTTranslationUnit;
* *
* @author Mike Kucera * @author Mike Kucera
*/ */
@SuppressWarnings("restriction")
public class C99Language extends BaseExtensibleLanguage { public class C99Language extends BaseExtensibleLanguage {
public static final String PLUGIN_ID = "org.eclipse.cdt.core.lrparser"; //$NON-NLS-1$ public static final String PLUGIN_ID = "org.eclipse.cdt.core.lrparser"; //$NON-NLS-1$
@ -57,7 +58,7 @@ public class C99Language extends BaseExtensibleLanguage {
return TOKEN_MAP; return TOKEN_MAP;
} }
public IContributedModelBuilder createModelBuilder(ITranslationUnit tu) { public IContributedModelBuilder createModelBuilder(@SuppressWarnings("unused") ITranslationUnit tu) {
return null; return null;
} }
@ -93,7 +94,6 @@ public class C99Language extends BaseExtensibleLanguage {
/** /**
* Gets the translation unit object and sets the index and the location resolver. * Gets the translation unit object and sets the index and the location resolver.
*/ */
@SuppressWarnings("restriction")
@Override @Override
protected IASTTranslationUnit createASTTranslationUnit(IIndex index, IScanner preprocessor) { protected IASTTranslationUnit createASTTranslationUnit(IIndex index, IScanner preprocessor) {
IASTTranslationUnit tu = C99ASTNodeFactory.DEFAULT_INSTANCE.newTranslationUnit(); IASTTranslationUnit tu = C99ASTNodeFactory.DEFAULT_INSTANCE.newTranslationUnit();

4
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/cpp/ISOCPPLanguage.java
View file

@ -31,6 +31,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPASTTranslationUnit;
* *
* @author Mike Kucera * @author Mike Kucera
*/ */
@SuppressWarnings("restriction")
public class ISOCPPLanguage extends BaseExtensibleLanguage { public class ISOCPPLanguage extends BaseExtensibleLanguage {
public static final String PLUGIN_ID = "org.eclipse.cdt.core.lrparser"; //$NON-NLS-1$ public static final String PLUGIN_ID = "org.eclipse.cdt.core.lrparser"; //$NON-NLS-1$
@ -57,7 +58,7 @@ public class ISOCPPLanguage extends BaseExtensibleLanguage {
return TOKEN_MAP; return TOKEN_MAP;
} }
public IContributedModelBuilder createModelBuilder(ITranslationUnit tu) { public IContributedModelBuilder createModelBuilder(@SuppressWarnings("unused") ITranslationUnit tu) {
return null; return null;
} }
@ -93,7 +94,6 @@ public class ISOCPPLanguage extends BaseExtensibleLanguage {
/** /**
* Gets the translation unit object and sets the index and the location resolver. * Gets the translation unit object and sets the index and the location resolver.
*/ */
@SuppressWarnings("restriction")
@Override @Override
protected IASTTranslationUnit createASTTranslationUnit(IIndex index, IScanner preprocessor) { protected IASTTranslationUnit createASTTranslationUnit(IIndex index, IScanner preprocessor) {
IASTTranslationUnit tu = CPPASTNodeFactory.DEFAULT_INSTANCE.newTranslationUnit(); IASTTranslationUnit tu = CPPASTNodeFactory.DEFAULT_INSTANCE.newTranslationUnit();

5
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/AbstractTrialUndoActionProvider.java
View file

@ -161,6 +161,7 @@ public abstract class AbstractTrialUndoActionProvider<ACT, RULE_DATA> extends Pr
public static class DeclaredAction<ACT, RULE_DATA> extends Action<ACT, RULE_DATA> { public static class DeclaredAction<ACT, RULE_DATA> extends Action<ACT, RULE_DATA> {
protected boolean hasUndo = false; protected boolean hasUndo = false;
@Override @Override
@SuppressWarnings("unused")
public boolean doTrial(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) { public boolean doTrial(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) {
return true; return true;
} }
@ -172,6 +173,7 @@ public abstract class AbstractTrialUndoActionProvider<ACT, RULE_DATA> extends Pr
*/ */
static final class NullAction<ACT, RULE_DATA> extends Action<ACT, RULE_DATA> { static final class NullAction<ACT, RULE_DATA> extends Action<ACT, RULE_DATA> {
@Override @Override
@SuppressWarnings("unused")
public void doFinal(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) { public void doFinal(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) {
// do nothing // do nothing
} }
@ -180,16 +182,19 @@ public abstract class AbstractTrialUndoActionProvider<ACT, RULE_DATA> extends Pr
static final class BadAction<ACT, RULE_DATA> extends Action<ACT, RULE_DATA> { static final class BadAction<ACT, RULE_DATA> extends Action<ACT, RULE_DATA> {
@Override @Override
@SuppressWarnings("unused")
public void doFinal(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) { public void doFinal(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) {
throw new Error(new BadActionException()); throw new Error(new BadActionException());
} }
@Override @Override
@SuppressWarnings("unused")
public boolean doTrial(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) { public boolean doTrial(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) {
throw new Error(new BadActionException()); throw new Error(new BadActionException());
} }
@Override @Override
@SuppressWarnings("unused")
public void doUndo(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) { public void doUndo(ITrialUndoActionProvider<RULE_DATA> provider, ACT action) {
throw new Error(new BadActionException()); throw new Error(new BadActionException());
} }

1
lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/core/dom/lrparser/lpgextensions/ParserState.java
View file

@ -48,6 +48,7 @@ class ParserState {
/** /**
* Trial actions that have been executed but not yet committed. * Trial actions that have been executed but not yet committed.
*/ */
@SuppressWarnings("unchecked")
public LinkedList pendingCommits; public LinkedList pendingCommits;
public ConfigurationStack configurationStack; public ConfigurationStack configurationStack;