diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath b/lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath index 751c8f2e504..64c5e31b7a2 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs b/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs index 1257ffa3371..2a8aa999e37 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,16 @@ -#Tue Apr 08 11:15:28 EDT 2008 +#Fri Apr 25 15:22:29 EDT 2008 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -58,3 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF index cc7e403d766..12e535351b8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/META-INF/MANIFEST.MF @@ -10,9 +10,9 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.cdt.core, org.eclipse.core.resources, org.eclipse.cdt.core.lrparser;bundle-version="4.0.1" -Eclipse-LazyStart: true Export-Package: org.eclipse.cdt.core.lrparser.tests, org.eclipse.cdt.core.lrparser.tests.c99, org.eclipse.cdt.core.lrparser.tests.cpp Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java index 0b124cfaad8..d45b267a721 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/ParseHelper.java @@ -19,7 +19,6 @@ import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IProblemBinding; import org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor; -import org.eclipse.cdt.core.model.AbstractLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.IScannerInfo; @@ -33,6 +32,7 @@ import org.eclipse.core.runtime.CoreException; * * @author Mike Kucera */ +@SuppressWarnings("restriction") public class ParseHelper { static int testsRun = 0; @@ -120,7 +120,7 @@ public class ParseHelper { CodeReader codeReader = new CodeReader(code.toCharArray()); IASTTranslationUnit tu; try { - tu = language.getASTTranslationUnit(codeReader, new ScannerInfo(), null, null, AbstractLanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService()); + tu = language.getASTTranslationUnit(codeReader, new ScannerInfo(), null, null, ILanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService()); } catch (CoreException e) { throw new AssertionFailedError(e.toString()); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java index c4b48fd8096..71ba806c61f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/Activator.java @@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext; public class Activator extends Plugin { // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.cdt.core.parser.c99.tests"; + public static final String PLUGIN_ID = "org.eclipse.cdt.core.parser.c99.tests"; //$NON-NLS-1$ // The shared instance private static Activator plugin; @@ -30,19 +30,13 @@ public class Activator extends Plugin { public Activator() { } - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext) - */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin = this; } - /* - * (non-Javadoc) - * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) - */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CommentTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CommentTests.java index 68f3e0cd35a..75fcd70633b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CommentTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CommentTests.java @@ -21,10 +21,12 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.CommentTests; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99CommentTests extends CommentTests { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); @@ -32,6 +34,7 @@ public class C99CommentTests extends CommentTests { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse(String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean parseComments) throws ParserException { @@ -49,12 +52,12 @@ public class C99CommentTests extends CommentTests { } + @SuppressWarnings("nls") public void testBug191266() throws Exception { - StringBuffer sb = new StringBuffer(); - sb.append("#define MACRO 1000000000000 \n"); - sb.append("int x = MACRO; \n"); - sb.append("//comment\n"); - String code = sb.toString(); + String code = + "#define MACRO 1000000000000 \n" + + "int x = MACRO; \n" + + "//comment\n"; IASTTranslationUnit tu = parse(code, ParserLanguage.C, false, false, true); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java index 2d8520a0aa0..d5b05c3ee9a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompleteParser2Tests.java @@ -23,6 +23,7 @@ import org.eclipse.cdt.core.parser.tests.ast2.CompleteParser2Tests; public class C99CompleteParser2Tests extends CompleteParser2Tests { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse(String code, boolean expectedToPass, ParserLanguage lang, boolean gcc) throws Exception { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); @@ -40,6 +41,7 @@ public class C99CompleteParser2Tests extends CompleteParser2Tests { // Tests that are failing at this point + @Override public void testBug39676_tough() { // is this C99? try { super.testBug39676_tough(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionBasicTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionBasicTest.java index 5deb3e86f15..778a6d81bac 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionBasicTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99CompletionBasicTest.java @@ -23,12 +23,14 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.prefix.BasicCompletionTest; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99CompletionBasicTest extends BasicCompletionTest { public C99CompletionBasicTest() { } @Override + @SuppressWarnings("unused") protected IASTCompletionNode getCompletionNode(String code, ParserLanguage lang, boolean useGNUExtensions) throws ParserException { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationInclusionTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationInclusionTests.java index 022ac5ad6cc..ee74dbefa41 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationInclusionTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationInclusionTests.java @@ -11,7 +11,6 @@ package org.eclipse.cdt.core.lrparser.tests.c99; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; import org.eclipse.cdt.core.model.ILanguage; @@ -23,6 +22,7 @@ import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationInclusionTests; import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory; import org.eclipse.core.resources.IFile; +@SuppressWarnings("restriction") public class C99DOMLocationInclusionTests extends DOMLocationInclusionTests { public C99DOMLocationInclusionTests() { @@ -39,10 +39,10 @@ public class C99DOMLocationInclusionTests extends DOMLocationInclusionTests { @Override protected IASTTranslationUnit parse(IFile code, IScannerInfo s)throws Exception { // TODO: total freakin hack! the test suite needs to be refactored - ILanguage lang = code.getName().endsWith("cc") ? getCPPLanguage() : getC99Language(); + ILanguage lang = code.getName().endsWith("cc") ? getCPPLanguage() : getC99Language(); //$NON-NLS-1$ CodeReader codeReader = new CodeReader(code.getLocation().toOSString()); - IASTTranslationUnit tu = lang.getASTTranslationUnit(codeReader, s, SavedCodeReaderFactory.getInstance(), null, BaseExtensibleLanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService()); + IASTTranslationUnit tu = lang.getASTTranslationUnit(codeReader, s, SavedCodeReaderFactory.getInstance(), null, ILanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService()); return tu; } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationMacroTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationMacroTests.java index ac88f7204d4..481175f222b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationMacroTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationMacroTests.java @@ -19,6 +19,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationMacroTests; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99DOMLocationMacroTests extends DOMLocationMacroTests { @@ -32,6 +33,8 @@ public class C99DOMLocationMacroTests extends DOMLocationMacroTests { } + @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); @@ -50,7 +53,9 @@ public class C99DOMLocationMacroTests extends DOMLocationMacroTests { /** * Tests GCC specific stuff, not applicable at this point */ - public void testStdioBug() throws ParserException { + + @Override + public void testStdioBug() throws ParserException { try { super.testStdioBug(); fail(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationTests.java index 885ff3d454d..3d2a0a10c2c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMLocationTests.java @@ -21,12 +21,14 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationTests; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99DOMLocationTests extends DOMLocationTests { public C99DOMLocationTests() { } public C99DOMLocationTests(String name) { super(name); } @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMPreprocessorInformationTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMPreprocessorInformationTest.java index b01efc79cd5..a2508881d74 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMPreprocessorInformationTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DOMPreprocessorInformationTest.java @@ -19,9 +19,11 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMPreprocessorInformationTest; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99DOMPreprocessorInformationTest extends DOMPreprocessorInformationTest { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DigraphTrigraphTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DigraphTrigraphTests.java index ae73d6e95cd..62385cd1a91 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DigraphTrigraphTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99DigraphTrigraphTests.java @@ -35,6 +35,7 @@ import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage; import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; import org.eclipse.cdt.core.lrparser.tests.ParseHelper; +@SuppressWarnings("nls") public class C99DigraphTrigraphTests extends TestCase { @@ -140,6 +141,7 @@ public class C99DigraphTrigraphTests extends TestCase { } + public void testTrigraphAndDigraphSequecesInPreprocessorDirectives() { StringBuffer sb = new StringBuffer(); sb.append("%:define join1(a, b) a %:%: b \n"); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99GCCTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99GCCTests.java index f6b5f809b4c..8dfdcd62c4f 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99GCCTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99GCCTests.java @@ -19,6 +19,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.GCCTests; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99GCCTests extends GCCTests { public C99GCCTests() {} @@ -26,6 +27,7 @@ public class C99GCCTests extends GCCTests { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99KnRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99KnRTests.java index 71e4b04d2e7..20bef1e34ba 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99KnRTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99KnRTests.java @@ -22,10 +22,12 @@ import org.eclipse.cdt.internal.core.parser.ParserException; /** * @author Mike Kucera */ +@SuppressWarnings("restriction") public class C99KnRTests extends AST2KnRTests { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SelectionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SelectionParseTest.java index ce948d4bd79..b8293403cd3 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SelectionParseTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SelectionParseTest.java @@ -26,24 +26,29 @@ import org.eclipse.cdt.internal.core.dom.SavedCodeReaderFactory; import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.core.resources.IFile; +@SuppressWarnings("restriction") public class C99SelectionParseTest extends AST2SelectionParseTest { public C99SelectionParseTest() {} public C99SelectionParseTest(String name) { super(name); } + @Override protected IASTNode parse(String code, ParserLanguage lang, int offset, int length) throws ParserException { return parse(code, lang, false, false, offset, length); } + @Override protected IASTNode parse(IFile file, ParserLanguage lang, int offset, int length) throws ParserException { IASTTranslationUnit tu = parse(file, lang, false, false); return tu.selectNodeForLocation(tu.getFilePath(), offset, length); } + @Override protected IASTNode parse(String code, ParserLanguage lang, int offset, int length, boolean expectedToPass) throws ParserException { return parse(code, lang, false, expectedToPass, offset, length); } + @Override protected IASTNode parse(String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, int offset, int length) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); @@ -51,8 +56,7 @@ public class C99SelectionParseTest extends AST2SelectionParseTest { return tu.selectNodeForLocation(tu.getFilePath(), offset, length); } - protected IASTTranslationUnit parse( IFile file, ParserLanguage lang, IScannerInfo scanInfo, boolean useGNUExtensions, boolean expectNoProblems ) - throws ParserException { + protected IASTTranslationUnit parse( IFile file, ParserLanguage lang, IScannerInfo scanInfo, boolean useGNUExtensions, boolean expectNoProblems ) { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); @@ -62,6 +66,7 @@ public class C99SelectionParseTest extends AST2SelectionParseTest { return ParseHelper.parse(reader, language, scanInfo, fileCreator, expectNoProblems, true, 0); } + @Override protected IASTTranslationUnit parse( IFile file, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { return parse(file, lang, new ScannerInfo(), useGNUExtensions, expectNoProblems); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SpecTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SpecTests.java index c782f91f485..4292dec523c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SpecTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99SpecTests.java @@ -22,6 +22,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CSpecTest; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99SpecTests extends AST2CSpecTest { public C99SpecTests() { } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99TaskParserTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99TaskParserTest.java index a0da896b036..0f4cae94946 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99TaskParserTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99TaskParserTest.java @@ -19,9 +19,11 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.TaskParserTest; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99TaskParserTest extends TaskParserTest { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilOldTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilOldTests.java index fbf14919ea5..d3b0b0418e7 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilOldTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilOldTests.java @@ -21,10 +21,12 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilOldTests; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99UtilOldTests extends AST2UtilOldTests { @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); @@ -40,7 +42,8 @@ public class C99UtilOldTests extends AST2UtilOldTests { } - public void testCastExpression() throws Exception { // A not typedefed + @Override + public void testCastExpression() throws Exception { // A not typedefed try { super.testCastExpression(); fail(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilTests.java index 5e1e5ad4a06..d4521d6243e 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/c99/C99UtilTests.java @@ -19,6 +19,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilTests; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class C99UtilTests extends AST2UtilTests { @Override @@ -32,6 +33,7 @@ public class C99UtilTests extends AST2UtilTests { } @Override + @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); return ParseHelper.parse(code, language, expectNoProblems); diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPSpecTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPSpecTest.java index 4509e623d23..20a44949ab9 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPSpecTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPSpecTest.java @@ -10,6 +10,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPSpecTest; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class ISOCPPSpecTest extends AST2CPPSpecTest { public ISOCPPSpecTest() { } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPTests.java index 7fd13069afd..4080ef76ff5 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/cpp/ISOCPPTests.java @@ -12,6 +12,7 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPTests; import org.eclipse.cdt.internal.core.parser.ParserException; +@SuppressWarnings("restriction") public class ISOCPPTests extends AST2CPPTests { @@ -28,7 +29,6 @@ public class ISOCPPTests extends AST2CPPTests { } - @SuppressWarnings("restriction") @Override protected IASTTranslationUnit parse( String code, ParserLanguage lang, @SuppressWarnings("unused") boolean useGNUExtensions, boolean expectNoProblems, @SuppressWarnings("unused") boolean parseComments) throws ParserException { ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/.classpath b/lrparser/org.eclipse.cdt.core.lrparser/.classpath index b79a7b471bb..d207cd2c397 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/.classpath +++ b/lrparser/org.eclipse.cdt.core.lrparser/.classpath @@ -1,8 +1,8 @@ + + - - diff --git a/lrparser/org.eclipse.cdt.core.lrparser/.settings/org.eclipse.jdt.core.prefs b/lrparser/org.eclipse.cdt.core.lrparser/.settings/org.eclipse.jdt.core.prefs index 8eb738a5bd8..60a01491394 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/.settings/org.eclipse.jdt.core.prefs +++ b/lrparser/org.eclipse.cdt.core.lrparser/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,16 @@ -#Tue Apr 08 11:14:12 EDT 2008 +#Fri Apr 25 15:09:24 EDT 2008 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -58,3 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF index 907bb01f543..ed430c6531a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF +++ b/lrparser/org.eclipse.cdt.core.lrparser/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Export-Package: org.eclipse.cdt.core.dom.lrparser, org.eclipse.cdt.internal.core.dom.lrparser.c99;x-internal:=true Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ArrayType.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ArrayType.java index 398de9359ae..3c593f31df9 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ArrayType.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ArrayType.java @@ -17,6 +17,7 @@ import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.c.ICArrayType; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; +@SuppressWarnings("restriction") public class C99ArrayType implements ICArrayType, ITypeContainer { private boolean isConst; @@ -108,6 +109,7 @@ public class C99ArrayType implements ICArrayType, ITypeContainer { } + @Override public C99ArrayType clone() { C99ArrayType clone = null; try { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99BasicType.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99BasicType.java index 32d391ba56a..cf7cec8c0e4 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99BasicType.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99BasicType.java @@ -120,6 +120,7 @@ public class C99BasicType implements ICBasicType { bt.isLongLong == this.isLongLong; } + @Override public C99BasicType clone() { try { return (C99BasicType) super.clone(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99CompositeTypeScope.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99CompositeTypeScope.java index d7c30ac260c..50a1059c459 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99CompositeTypeScope.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99CompositeTypeScope.java @@ -29,7 +29,7 @@ public class C99CompositeTypeScope extends C99Scope implements ICCompositeTypeSc return struct; } - public IBinding getBinding(char[] name) throws DOMException { + public IBinding getBinding(@SuppressWarnings("unused") char[] name) throws DOMException { throw new UnsupportedOperationException(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumeration.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumeration.java index 0edb9bd1da8..de7210b3a13 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumeration.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumeration.java @@ -22,6 +22,7 @@ import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.core.runtime.PlatformObject; +@SuppressWarnings("restriction") public class C99Enumeration extends PlatformObject implements IC99Binding, IEnumeration, ITypeable { private List enumerators = new ArrayList(); @@ -71,6 +72,7 @@ public class C99Enumeration extends PlatformObject implements IC99Binding, IEnum return false; } + @Override public C99Enumeration clone() { try { C99Enumeration clone = (C99Enumeration) super.clone(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumerator.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumerator.java index f5c6fa23727..f0f3a8a2f50 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumerator.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Enumerator.java @@ -17,6 +17,7 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.core.runtime.PlatformObject; +@SuppressWarnings("restriction") public class C99Enumerator extends PlatformObject implements IC99Binding, IEnumerator, ITypeable { private String name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Field.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Field.java index 9404cc15053..502aed0de41 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Field.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Field.java @@ -35,6 +35,7 @@ public class C99Field extends C99Variable implements IC99Binding, IField, ITypea this.compositeTypeOwner = compositeTypeOwner; } + @Override public IScope getScope() { try { return compositeTypeOwner.getCompositeScope(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Function.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Function.java index 9e15f32cbf1..0570ea5b5ca 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Function.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Function.java @@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.core.runtime.PlatformObject; +@SuppressWarnings("restriction") public class C99Function extends PlatformObject implements IC99Binding, IFunction, ITypeable { private String name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionScope.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionScope.java index c4a11f2e9f7..ad32845f8cd 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionScope.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionScope.java @@ -25,7 +25,7 @@ public class C99FunctionScope extends C99Scope implements ICFunctionScope { private IScope bodyScope; - public IBinding getBinding(char[] name) throws DOMException { + public IBinding getBinding(@SuppressWarnings("unused") char[] name) throws DOMException { // TODO Auto-generated method stub return null; } diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionType.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionType.java index 51a7cf2e7aa..dca26f8098a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionType.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99FunctionType.java @@ -37,11 +37,12 @@ public class C99FunctionType implements IFunctionType { this.returnType = returnType; } - public boolean isSameType(IType type) { + public boolean isSameType(@SuppressWarnings("unused") IType type) { // TODO Auto-generated method stub return false; } + @Override public C99FunctionType clone() { try { C99FunctionType clone = (C99FunctionType) super.clone(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Label.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Label.java index 964e9bd820f..6182aab8dfa 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Label.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Label.java @@ -17,6 +17,7 @@ import org.eclipse.cdt.core.dom.ast.IScope; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.core.runtime.PlatformObject; +@SuppressWarnings("restriction") public class C99Label extends PlatformObject implements IC99Binding, ILabel { private String name; diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java index 3bd44ae4f25..97fd92596f5 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99PointerType.java @@ -16,6 +16,7 @@ import org.eclipse.cdt.core.dom.ast.c.ICPointerType; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; +@SuppressWarnings("restriction") public class C99PointerType implements ITypeContainer, ICPointerType { @@ -84,6 +85,7 @@ public class C99PointerType implements ITypeContainer, ICPointerType { + @Override public C99PointerType clone() { try { C99PointerType clone = (C99PointerType) super.clone(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ProblemBinding.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ProblemBinding.java index 97e822af261..1e21f93acb9 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ProblemBinding.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99ProblemBinding.java @@ -13,6 +13,7 @@ package org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings; import org.eclipse.cdt.core.dom.ast.IProblemBinding; import org.eclipse.cdt.internal.core.dom.parser.ProblemBinding; +@SuppressWarnings("restriction") public class C99ProblemBinding extends ProblemBinding implements IProblemBinding { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java index 97fd0fe92c8..f9454b0f1c4 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99QualifierType.java @@ -15,6 +15,7 @@ import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.c.ICQualifierType; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; +@SuppressWarnings("restriction") public class C99QualifierType implements ICQualifierType, ITypeContainer { private boolean isRestrict; @@ -88,6 +89,7 @@ public class C99QualifierType implements ICQualifierType, ITypeContainer { } + @Override public C99QualifierType clone() { try { C99QualifierType clone = (C99QualifierType) super.clone(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Scope.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Scope.java index 5addd5a865e..96f476ebb1a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Scope.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Scope.java @@ -23,6 +23,7 @@ import org.eclipse.cdt.internal.core.dom.parser.IASTInternalScope; * @author Mike Kucera * */ +@SuppressWarnings({"restriction","unused"}) public class C99Scope implements IC99Scope, IASTInternalScope { @@ -60,7 +61,7 @@ public class C99Scope implements IC99Scope, IASTInternalScope { } - public IBinding[] find(String name) { + public IBinding[] find( String name) { throw new UnsupportedOperationException(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Structure.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Structure.java index efe9ad89127..b6d315cb07c 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Structure.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Structure.java @@ -22,6 +22,7 @@ import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.core.runtime.PlatformObject; +@SuppressWarnings("restriction") public class C99Structure extends PlatformObject implements IC99Binding, ICompositeType, ITypeable { @@ -119,6 +120,7 @@ public class C99Structure extends PlatformObject implements IC99Binding, ICompos //private IScope scope; + @Override public C99Structure clone() { try { C99Structure clone = (C99Structure) super.clone(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Typedef.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Typedef.java index 967d027b60c..458697bfa7a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Typedef.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Typedef.java @@ -19,6 +19,7 @@ import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; import org.eclipse.core.runtime.PlatformObject; +@SuppressWarnings("restriction") public class C99Typedef extends PlatformObject implements IC99Binding, ITypedef, ITypeContainer, ITypeable { private IType type; @@ -68,13 +69,13 @@ public class C99Typedef extends PlatformObject implements IC99Binding, ITypedef, try { if(t instanceof ITypedef) return type.isSameType(((ITypedef)t).getType()); - else - return type.isSameType(t); + return type.isSameType(t); } catch(DOMException _) { return false; } } + @Override public C99Typedef clone() { try { C99Typedef clone = (C99Typedef) super.clone(); diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Variable.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Variable.java index 3ce77ab6785..d93ecdd74e1 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Variable.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/c99/bindings/C99Variable.java @@ -17,6 +17,7 @@ import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.internal.core.dom.Linkage; import org.eclipse.core.runtime.PlatformObject; +@SuppressWarnings("restriction") public class C99Variable extends PlatformObject implements IC99Binding, IVariable, ITypeable { diff --git a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/symboltable/SymbolTableTests.java b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/symboltable/SymbolTableTests.java index 1222eeab09a..5226ff445f5 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/symboltable/SymbolTableTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser/old/org/eclipse/cdt/internal/core/dom/lrparser/symboltable/SymbolTableTests.java @@ -7,10 +7,11 @@ import org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings.C99Label; import org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings.C99Structure; import org.eclipse.cdt.internal.core.dom.lrparser.c99.bindings.C99Variable; -@SuppressWarnings("deprecation") +@SuppressWarnings("nls") public class SymbolTableTests {//extends TestCase { // TODO write tests for imperative symbol table + private final String[] KEYS = { "pantera", "soulfly", "inflames", "megadeth", "archenemy", "carcass" }; public void testPersistence() { @@ -41,28 +42,31 @@ public class SymbolTableTests {//extends TestCase { } + // these are here just to get the tests to compile + // JUnit is not available in this plugin, this is old code that I just didn't want to delete - private void assertEquals(Integer integer, Integer lookup) { + @SuppressWarnings("unused") + private void assertEquals( Integer integer, Integer lookup) { // TODO Auto-generated method stub } - + @SuppressWarnings("unused") private void assertFalse(boolean empty) { // TODO Auto-generated method stub } - + @SuppressWarnings("unused") private void assertNull(Integer lookup) { // TODO Auto-generated method stub } - + @SuppressWarnings("unused") private void assertTrue(boolean empty) { // TODO Auto-generated method stub @@ -87,6 +91,7 @@ public class SymbolTableTests {//extends TestCase { } + @SuppressWarnings("unchecked") private static void assertMap(FunctionalMap map, Comparable[] keys, Object[] vals) { assert keys.length == vals.length; @@ -98,14 +103,14 @@ public class SymbolTableTests {//extends TestCase { } } - + @SuppressWarnings("unused") private static void assertTrue(String string, boolean containsKey) { // TODO Auto-generated method stub } - + @SuppressWarnings("unused") private static void assertEquals(String string, Object object, Object lookup) { // TODO Auto-generated method stub @@ -164,14 +169,14 @@ public class SymbolTableTests {//extends TestCase { } } - + @SuppressWarnings("unused") private void assertEquals(String key, String name) { // TODO Auto-generated method stub } - + @SuppressWarnings("unused") private void assertNotNull(IBinding b) { // TODO Auto-generated method stub diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/.classpath b/upc/org.eclipse.cdt.core.parser.upc.tests/.classpath index 751c8f2e504..64c5e31b7a2 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/.classpath +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs b/upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs index 35841cd7f47..f88f26df757 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,16 @@ -#Tue Apr 08 11:17:49 EDT 2008 +#Fri Apr 25 15:24:03 EDT 2008 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -58,3 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF b/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF index e24ddeeb9ed..36da2534711 100644 --- a/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF +++ b/upc/org.eclipse.cdt.core.parser.upc.tests/META-INF/MANIFEST.MF @@ -11,6 +11,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.cdt.core.parser.upc, org.eclipse.cdt.core.lrparser;bundle-version="4.0.1", org.eclipse.cdt.core.lrparser.tests;bundle-version="4.0.0" -Eclipse-LazyStart: false Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/upc/org.eclipse.cdt.core.parser.upc/.classpath b/upc/org.eclipse.cdt.core.parser.upc/.classpath index 751c8f2e504..64c5e31b7a2 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/.classpath +++ b/upc/org.eclipse.cdt.core.parser.upc/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/upc/org.eclipse.cdt.core.parser.upc/.settings/org.eclipse.jdt.core.prefs b/upc/org.eclipse.cdt.core.parser.upc/.settings/org.eclipse.jdt.core.prefs index 12a2d7f64f7..17fcd01cce6 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/.settings/org.eclipse.jdt.core.prefs +++ b/upc/org.eclipse.cdt.core.parser.upc/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,16 @@ -#Tue Apr 08 17:05:16 EDT 2008 +#Fri Apr 25 15:23:35 EDT 2008 eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore @@ -58,3 +62,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF b/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF index 86e2baf533a..584311bdcf7 100644 --- a/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF +++ b/upc/org.eclipse.cdt.core.parser.upc/META-INF/MANIFEST.MF @@ -14,3 +14,4 @@ Export-Package: org.eclipse.cdt.core.dom.upc, org.eclipse.cdt.internal.core.dom.parser.upc.ast;x-internal:=true Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor.0 +Bundle-RequiredExecutionEnvironment: J2SE-1.5