diff options
author | Jonah Graham | 2018-11-20 16:20:42 +0000 |
---|---|---|
committer | Jonah Graham | 2018-11-22 21:51:31 +0000 |
commit | 8985c7b63f04ad139e8b93160798e642d2addc55 (patch) | |
tree | f47208be3bf39983209f2433f307bf73a3474952 /xlc | |
parent | a923614c73274179d56e78d35d17aef149c23a03 (diff) | |
download | org.eclipse.cdt-8985c7b63f04ad139e8b93160798e642d2addc55.tar.gz org.eclipse.cdt-8985c7b63f04ad139e8b93160798e642d2addc55.tar.xz org.eclipse.cdt-8985c7b63f04ad139e8b93160798e642d2addc55.zip |
Bug 540373: Cleanup: Add missing annotations
This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Add missing Annotations - and selecting all three types:
- @Override
- @Override on interface methods
- @Deprecated
and completing the wizard
Change-Id: I5d367dacb04327107f25e147edc08efc4eb1c2fe
Diffstat (limited to 'xlc')
45 files changed, 209 insertions, 0 deletions
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java index bb97050bbfa..b6bdfef9014 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java @@ -26,16 +26,20 @@ public class XlcCompletionHangingTest extends LRCompletionHangingTest { } //TODO ??? overwrite some failed test cases + @Override public void testCompletionTemplateClassForCPP() throws Exception { } + @Override public void testCompletionGnuCPP() throws Exception { } + @Override protected XlcCLanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected XlcCPPLanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java index 77913611368..47f0aa25cef 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java @@ -25,10 +25,12 @@ public class XlcLRCPPImplicitNameTests extends LRCPPImplicitNameTests { return suite(XlcLRCPPImplicitNameTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java index 0d19effc016..9936cdfd898 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java @@ -25,10 +25,12 @@ public class XlcLRCPPSpecTest extends LRCPPSpecTest { return suite(XlcLRCPPSpecTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java index 3809dec9731..b9d4cbb7587 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java @@ -27,16 +27,19 @@ public class XlcLRCPPTests extends LRCPPTests { } //CDT_70_FIX_FROM_50-#9 + @Override public void testStaticAssertions_294730() throws Exception { String code = getAboveComment(); code = code.replaceAll("static_assert", "__static_assert"); parseAndCheckBindings(code, ParserLanguage.CPP); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java index 1f69df714bb..d6498da5229 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java @@ -25,10 +25,12 @@ public class XlcLRCSpecTests extends LRCSpecTests { return suite(XlcLRCSpecTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java index 934671cbff4..6e0a818e472 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java @@ -26,10 +26,12 @@ public class XlcLRCommentTests extends LRCommentTests { return suite(XlcLRCommentTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java index 92b9f6901a9..9606a171601 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java @@ -26,10 +26,12 @@ public class XlcLRCompleteParser2Tests extends LRCompleteParser2Tests { return suite(XlcLRCompleteParser2Tests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java index 35520a46219..0a53f887e7b 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java @@ -25,10 +25,12 @@ public class XlcLRCompletionBasicTest extends LRCompletionBasicTest { return suite(XlcLRCompletionBasicTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java index 24aee9daeb5..a943b3032a0 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java @@ -25,6 +25,7 @@ public class XlcLRCompletionParseTest extends LRCompletionParseTest { return new TestSuite(XlcLRCompletionParseTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java index faca238b206..2be4bce40ff 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java @@ -25,10 +25,12 @@ public class XlcLRDOMLocationMacroTests extends LRDOMLocationMacroTests { return suite(XlcLRDOMLocationMacroTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java index f51f20fdd25..9920a915e09 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java @@ -25,10 +25,12 @@ public class XlcLRDOMLocationTests extends LRDOMLocationTests { return suite(XlcLRDOMLocationTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java index 558e8869e14..0ea3ab34d23 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java @@ -25,10 +25,12 @@ public class XlcLRDOMPreprocessorInformationTest extends LRDOMPreprocessorInform return suite(XlcLRDOMPreprocessorInformationTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java index 5885f34dbd6..bfb7b3083d3 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java @@ -26,6 +26,7 @@ public class XlcLRDigraphTrigraphTests extends LRDigraphTrigraphTests { return new TestSuite(XlcLRDigraphTrigraphTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java index e28c164d39e..593c137e193 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java @@ -25,10 +25,12 @@ public class XlcLRGCCCompleteParseExtensionsTest extends LRGCCCompleteParseExten return suite(XlcLRGCCCompleteParseExtensionsTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java index 9af5eee2f95..f21a19a567d 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java @@ -25,10 +25,12 @@ public class XlcLRGCCTests extends LRGCCTests { return suite(XlcLRGCCTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java index 8d13d3dab8f..f77ab28e359 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java @@ -25,10 +25,12 @@ public class XlcLRImageLocationTests extends LRImageLocationTests { return suite(XlcLRImageLocationTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java index a39d7b9c8ae..4c39e6a024d 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java @@ -25,10 +25,12 @@ public class XlcLRInactiveCodeTests extends LRInactiveCodeTests { return suite(XlcLRInactiveCodeTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java index e054628c7f0..9e1f5d2957f 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java @@ -25,10 +25,12 @@ public class XlcLRKnRTests extends LRKnRTests { return suite(XlcLRKnRTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java index d9af3c8d38b..6d394b7e3f1 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java @@ -25,10 +25,12 @@ public class XlcLRNodeSelectorTest extends LRNodeSelectorTest { return suite(XlcLRNodeSelectorTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java index 9dc5d5f89be..76538c7f922 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java @@ -25,10 +25,12 @@ public class XlcLRQuickParser2Tests extends LRQuickParser2Tests { return new TestSuite(XlcLRQuickParser2Tests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java index 7963c6f8dae..0ac2dc498bb 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java @@ -33,10 +33,12 @@ public class XlcLRSelectionParseTest extends LRSelectionParseTest { return new TestSuite(XlcLRSelectionParseTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java index 84ce6ddf89c..051df1b1f7e 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java @@ -25,10 +25,12 @@ public class XlcLRSemanticsTests extends LRSemanticsTests { return suite(XlcLRSemanticsTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java index c4c3ccac1d6..b2998bdb60a 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java @@ -25,10 +25,12 @@ public class XlcLRTaskParserTest extends LRTaskParserTest { return suite(XlcLRTaskParserTest.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java index 84acb881f70..d6f5e0fb11b 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java @@ -25,10 +25,12 @@ public class XlcLRTemplateTests extends LRTemplateTests { return suite(XlcLRTemplateTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java index c0ee1cef8c7..c8a2d9617d2 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java @@ -31,10 +31,12 @@ public class XlcLRTests extends LRTests { return suite(XlcLRTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java index 309116002f9..65d13626662 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java @@ -25,10 +25,12 @@ public class XlcLRUtilOldTests extends LRUtilOldTests { return suite(XlcLRUtilOldTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java index 4c32284313a..c6076bddb4e 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java @@ -25,10 +25,12 @@ public class XlcLRUtilTests extends LRUtilTests { return suite(XlcLRUtilTests.class); } + @Override protected ILanguage getCLanguage() { return XlcCLanguage.getDefault(); } + @Override protected ILanguage getCPPLanguage() { return XlcCPPLanguage.getDefault(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java index 62573bcccc1..f53098c7778 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java @@ -53,6 +53,7 @@ public class XlcCLanguage extends GCCLanguage { index, properties); } + @Override public String getId() { return ID; } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java index 3504a824e2e..7c19b023dee 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java @@ -77,6 +77,7 @@ public class XlcCPPLanguage extends GPPLanguage { return parser; } + @Override public String getId() { return ID; } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java index c0a5992a9a9..6e8a4495a8c 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java @@ -294,14 +294,17 @@ public class XlcCPPTokenMap implements IDOMTokenMap { supportStaticAssert); } + @Override public int getEOFTokenKind() { return TK_EOF_TOKEN; } + @Override public int getEOCTokenKind() { return TK_EndOfCompletion; } + @Override public int mapKind(IToken token) { switch (token.getType()) { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java index c7d026c46d5..0234fc794fc 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java @@ -230,14 +230,17 @@ public final class XlcCTokenMap implements IDOMTokenMap { keywordMap = XlcKeywords.createC(supportVectors, supportDecimalFloatingPoint); } + @Override public int getEOFTokenKind() { return TK_EOF_TOKEN; } + @Override public int getEOCTokenKind() { return TK_EndOfCompletion; } + @Override public int mapKind(IToken token) { switch (token.getType()) { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java index f2e19a0a5fa..d5aacc9675f 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java @@ -98,6 +98,7 @@ public interface IXlcCPPASTModifiedArrayModifier extends IASTArrayModifier { /** */ + @Override public IXlcCPPASTModifiedArrayModifier copy(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java index 6bad31d60b5..daafff40eac 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java @@ -38,18 +38,22 @@ public class XlcCASTVectorTypeSpecifier extends CASTSimpleDeclSpecifier implemen return copy(copy, style); } + @Override public boolean isPixel() { return isPixel; } + @Override public void setPixel(boolean isPixel) { this.isPixel = isPixel; } + @Override public boolean isBool() { return isBool; } + @Override public void setBool(boolean isBool) { this.isBool = isBool; } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java index 3da0095254c..694cdccc238 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java @@ -26,6 +26,7 @@ public class XlcCNodeFactory extends CNodeFactory implements IXlcCNodeFactory { return DEFAULT_INSTANCE; } + @Override public IXlcCASTVectorTypeSpecifier newVectorTypeSpecifier() { return new XlcCASTVectorTypeSpecifier(); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java index f6857b5f59f..3d311bfbfdd 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java @@ -50,46 +50,56 @@ public class XlcCPPASTModifiedArrayModifier extends CPPASTArrayModifier implemen return copy(copy, style); } + @Override public boolean isConst() { return isConst; } + @Override public boolean isStatic() { return isStatic; } + @Override public boolean isRestrict() { return isRestrict; } + @Override public boolean isVolatile() { return isVolatile; } + @Override public void setConst(boolean value) { assertNotFrozen(); this.isConst = value; } + @Override public void setVolatile(boolean value) { assertNotFrozen(); this.isVolatile = value; } + @Override public void setRestrict(boolean value) { assertNotFrozen(); this.isRestrict = value; } + @Override public void setStatic(boolean value) { assertNotFrozen(); this.isStatic = value; } + @Override public boolean isVariableSized() { return varSized; } + @Override public void setVariableSized(boolean value) { assertNotFrozen(); varSized = value; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java index 3da2bbc8393..d1681f89a5a 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java @@ -37,10 +37,12 @@ public class XlcCPPASTVectorTypeSpecifier extends CPPASTSimpleDeclSpecifier impl return copy(copy, style); } + @Override public boolean isPixel() { return isPixel; } + @Override public void setPixel(boolean isPixel) { this.isPixel = isPixel; } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java index 0be792d68ae..720d71076cb 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java @@ -28,10 +28,12 @@ public class XlcCPPNodeFactory extends CPPNodeFactory implements IXlcCPPNodeFact return DEFAULT_INSTANCE; } + @Override public IXlcCPPASTVectorTypeSpecifier newVectorTypeSpecifier() { return new XlcCPPASTVectorTypeSpecifier(); } + @Override public IXlcCPPASTModifiedArrayModifier newModifiedArrayModifier(IASTExpression expr) { return new XlcCPPASTModifiedArrayModifier(expr); } diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java index cc4230a4305..b886f2f2b4c 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java @@ -108,6 +108,7 @@ public class XlcCParser extends PrsStream return btParser.getFirstToken(); } + @Override public IToken getLeftIToken() { return super.getIToken(getLeftSpan()); } @@ -116,6 +117,7 @@ public class XlcCParser extends PrsStream return btParser.getLastToken(); } + @Override public IToken getRightIToken() { return super.getIToken(getRightSpan()); } @@ -153,6 +155,7 @@ public class XlcCParser extends PrsStream } } + @Override public String[] orderedTerminalSymbols() { return XlcCParsersym.orderedTerminalSymbols; } @@ -236,11 +239,13 @@ public class XlcCParser extends PrsStream } + @Override public void addToken(IToken token) { token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called? super.addToken(token); } + @Override public IASTTranslationUnit parse() { // this has to be done, or... kaboom! setStreamLength(getSize()); @@ -253,19 +258,23 @@ public class XlcCParser extends PrsStream return (IASTTranslationUnit) action.getParseResult(); } + @Override public IASTCompletionNode getCompletionNode() { return compNode; } // uncomment this method to use with backtracking parser + @Override public List<IToken> getRuleTokens() { return getTokens().subList(getLeftSpan(), getRightSpan() + 1); } + @Override public String[] getOrderedTerminalSymbols() { return XlcCParsersym.orderedTerminalSymbols; } + @Override @SuppressWarnings("nls") public String getName() { return "XlcCParser"; @@ -273,6 +282,7 @@ public class XlcCParser extends PrsStream private GNUBuildASTParserAction gnuAction; + @Override public void ruleAction(int ruleNumber) { switch (ruleNumber) { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java index 2b3cdd11a3c..ff229aede9d 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java @@ -149,12 +149,14 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static short baseCheck[] = BaseCheck.baseCheck; + @Override public final int baseCheck(int index) { return baseCheck[index]; } public final static short rhs[] = baseCheck; + @Override public final int rhs(int index) { return rhs[index]; }; @@ -353,12 +355,14 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char baseAction[] = BaseAction.baseAction; + @Override public final int baseAction(int index) { return baseAction[index]; } public final static char lhs[] = baseAction; + @Override public final int lhs(int index) { return lhs[index]; }; @@ -475,6 +479,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static byte termCheck[] = TermCheck.termCheck; + @Override public final int termCheck(int index) { return termCheck[index]; } @@ -637,6 +642,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char termAction[] = TermAction.termAction; + @Override public final int termAction(int index) { return termAction[index]; } @@ -665,6 +671,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char asb[] = Asb.asb; + @Override public final int asb(int index) { return asb[index]; } @@ -705,6 +712,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static byte asr[] = Asr.asr; + @Override public final int asr(int index) { return asr[index]; } @@ -731,6 +739,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char nasb[] = Nasb.nasb; + @Override public final int nasb(int index) { return nasb[index]; } @@ -748,6 +757,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char nasr[] = Nasr.nasr; + @Override public final int nasr(int index) { return nasr[index]; } @@ -762,6 +772,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char terminalIndex[] = TerminalIndex.terminalIndex; + @Override public final int terminalIndex(int index) { return terminalIndex[index]; } @@ -778,6 +789,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; + @Override public final int nonterminalIndex(int index) { return nonterminalIndex[index]; } @@ -792,6 +804,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char scopePrefix[] = ScopePrefix.scopePrefix; + @Override public final int scopePrefix(int index) { return scopePrefix[index]; } @@ -806,6 +819,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; + @Override public final int scopeSuffix(int index) { return scopeSuffix[index]; } @@ -820,6 +834,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char scopeLhs[] = ScopeLhs.scopeLhs; + @Override public final int scopeLhs(int index) { return scopeLhs[index]; } @@ -833,6 +848,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static byte scopeLa[] = ScopeLa.scopeLa; + @Override public final int scopeLa(int index) { return scopeLa[index]; } @@ -847,6 +863,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; + @Override public final int scopeStateSet(int index) { return scopeStateSet[index]; } @@ -875,6 +892,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char scopeRhs[] = ScopeRhs.scopeRhs; + @Override public final int scopeRhs(int index) { return scopeRhs[index]; } @@ -898,6 +916,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char scopeState[] = ScopeState.scopeState; + @Override public final int scopeState(int index) { return scopeState[index]; } @@ -925,6 +944,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static char inSymb[] = InSymb.inSymb; + @Override public final int inSymb(int index) { return inSymb[index]; } @@ -970,24 +990,29 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static String name[] = Name.name; + @Override public final String name(int index) { return name[index]; } public final static int ERROR_SYMBOL = 38, SCOPE_UBOUND = 94, SCOPE_SIZE = 95, MAX_NAME_LENGTH = 38; + @Override public final int getErrorSymbol() { return ERROR_SYMBOL; } + @Override public final int getScopeUbound() { return SCOPE_UBOUND; } + @Override public final int getScopeSize() { return SCOPE_SIZE; } + @Override public final int getMaxNameLength() { return MAX_NAME_LENGTH; } @@ -998,42 +1023,52 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers public final static boolean BACKTRACK = true; + @Override public final int getNumStates() { return NUM_STATES; } + @Override public final int getNtOffset() { return NT_OFFSET; } + @Override public final int getLaStateOffset() { return LA_STATE_OFFSET; } + @Override public final int getMaxLa() { return MAX_LA; } + @Override public final int getNumRules() { return NUM_RULES; } + @Override public final int getNumNonterminals() { return NUM_NONTERMINALS; } + @Override public final int getNumSymbols() { return NUM_SYMBOLS; } + @Override public final int getSegmentSize() { return SEGMENT_SIZE; } + @Override public final int getStartState() { return START_STATE; } + @Override public final int getStartSymbol() { return lhs[0]; } @@ -1042,55 +1077,68 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers return IDENTIFIER_SYMBOL; } + @Override public final int getEoftSymbol() { return EOFT_SYMBOL; } + @Override public final int getEoltSymbol() { return EOLT_SYMBOL; } + @Override public final int getAcceptAction() { return ACCEPT_ACTION; } + @Override public final int getErrorAction() { return ERROR_ACTION; } + @Override public final boolean isValidForParser() { return isValidForParser; } + @Override public final boolean getBacktrack() { return BACKTRACK; } + @Override public final int originalState(int state) { return -baseCheck[state]; } + @Override public final int asi(int state) { return asb[originalState(state)]; } + @Override public final int nasi(int state) { return nasb[originalState(state)]; } + @Override public final int inSymbol(int state) { return inSymb[originalState(state)]; } + @Override public final int ntAction(int state, int sym) { return baseAction[state + sym]; } + @Override public final int tAction(int state, int sym) { int i = baseAction[state], k = i + sym; return termAction[termCheck[k] == sym ? k : i]; } + @Override public final int lookAhead(int la_state, int sym) { int k = la_state + sym; return termAction[termCheck[k] == sym ? k : la_state]; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java index 4841efa0c9c..bdd9032c9ed 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java @@ -110,6 +110,7 @@ public class XlcCPPParser extends PrsStream return btParser.getFirstToken(); } + @Override public IToken getLeftIToken() { return super.getIToken(getLeftSpan()); } @@ -118,6 +119,7 @@ public class XlcCPPParser extends PrsStream return btParser.getLastToken(); } + @Override public IToken getRightIToken() { return super.getIToken(getRightSpan()); } @@ -155,6 +157,7 @@ public class XlcCPPParser extends PrsStream } } + @Override public String[] orderedTerminalSymbols() { return XlcCPPParsersym.orderedTerminalSymbols; } @@ -238,11 +241,13 @@ public class XlcCPPParser extends PrsStream } + @Override public void addToken(IToken token) { token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called? super.addToken(token); } + @Override public IASTTranslationUnit parse() { // this has to be done, or... kaboom! setStreamLength(getSize()); @@ -255,19 +260,23 @@ public class XlcCPPParser extends PrsStream return (IASTTranslationUnit) action.getParseResult(); } + @Override public IASTCompletionNode getCompletionNode() { return compNode; } // uncomment this method to use with backtracking parser + @Override public List<IToken> getRuleTokens() { return getTokens().subList(getLeftSpan(), getRightSpan() + 1); } + @Override public String[] getOrderedTerminalSymbols() { return XlcCPPParsersym.orderedTerminalSymbols; } + @Override @SuppressWarnings("nls") public String getName() { return "XlcCPPParser"; @@ -275,6 +284,7 @@ public class XlcCPPParser extends PrsStream private GNUBuildASTParserAction gnuAction; + @Override public void ruleAction(int ruleNumber) { switch (ruleNumber) { diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java index 2182dbd1aa4..96919217523 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java @@ -318,12 +318,14 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar System.arraycopy(BaseCheck1.baseCheck1, 0, baseCheck, index, BaseCheck1.baseCheck1.length); }; + @Override public final int baseCheck(int index) { return baseCheck[index]; } public final static short rhs[] = baseCheck; + @Override public final int rhs(int index) { return rhs[index]; }; @@ -843,12 +845,14 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar System.arraycopy(BaseAction1.baseAction1, 0, baseAction, index, BaseAction1.baseAction1.length); }; + @Override public final int baseAction(int index) { return baseAction[index]; } public final static char lhs[] = baseAction; + @Override public final int lhs(int index) { return lhs[index]; }; @@ -1092,6 +1096,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char termCheck[] = TermCheck.termCheck; + @Override public final int termCheck(int index) { return termCheck[index]; } @@ -1446,6 +1451,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char termAction[] = TermAction.termAction; + @Override public final int termAction(int index) { return termAction[index]; } @@ -1492,6 +1498,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char asb[] = Asb.asb; + @Override public final int asb(int index) { return asb[index]; } @@ -1563,6 +1570,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char asr[] = Asr.asr; + @Override public final int asr(int index) { return asr[index]; } @@ -1605,6 +1613,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char nasb[] = Nasb.nasb; + @Override public final int nasb(int index) { return nasb[index]; } @@ -1628,6 +1637,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char nasr[] = Nasr.nasr; + @Override public final int nasr(int index) { return nasr[index]; } @@ -1643,6 +1653,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char terminalIndex[] = TerminalIndex.terminalIndex; + @Override public final int terminalIndex(int index) { return terminalIndex[index]; } @@ -1663,6 +1674,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex; + @Override public final int nonterminalIndex(int index) { return nonterminalIndex[index]; } @@ -1680,6 +1692,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char scopePrefix[] = ScopePrefix.scopePrefix; + @Override public final int scopePrefix(int index) { return scopePrefix[index]; } @@ -1697,6 +1710,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix; + @Override public final int scopeSuffix(int index) { return scopeSuffix[index]; } @@ -1714,6 +1728,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char scopeLhs[] = ScopeLhs.scopeLhs; + @Override public final int scopeLhs(int index) { return scopeLhs[index]; } @@ -1730,6 +1745,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char scopeLa[] = ScopeLa.scopeLa; + @Override public final int scopeLa(int index) { return scopeLa[index]; } @@ -1747,6 +1763,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet; + @Override public final int scopeStateSet(int index) { return scopeStateSet[index]; } @@ -1790,6 +1807,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char scopeRhs[] = ScopeRhs.scopeRhs; + @Override public final int scopeRhs(int index) { return scopeRhs[index]; } @@ -1830,6 +1848,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char scopeState[] = ScopeState.scopeState; + @Override public final int scopeState(int index) { return scopeState[index]; } @@ -1872,6 +1891,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static char inSymb[] = InSymb.inSymb; + @Override public final int inSymb(int index) { return inSymb[index]; } @@ -1934,24 +1954,29 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static String name[] = Name.name; + @Override public final String name(int index) { return name[index]; } public final static int ERROR_SYMBOL = 81, SCOPE_UBOUND = 161, SCOPE_SIZE = 162, MAX_NAME_LENGTH = 43; + @Override public final int getErrorSymbol() { return ERROR_SYMBOL; } + @Override public final int getScopeUbound() { return SCOPE_UBOUND; } + @Override public final int getScopeSize() { return SCOPE_SIZE; } + @Override public final int getMaxNameLength() { return MAX_NAME_LENGTH; } @@ -1962,42 +1987,52 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar public final static boolean BACKTRACK = true; + @Override public final int getNumStates() { return NUM_STATES; } + @Override public final int getNtOffset() { return NT_OFFSET; } + @Override public final int getLaStateOffset() { return LA_STATE_OFFSET; } + @Override public final int getMaxLa() { return MAX_LA; } + @Override public final int getNumRules() { return NUM_RULES; } + @Override public final int getNumNonterminals() { return NUM_NONTERMINALS; } + @Override public final int getNumSymbols() { return NUM_SYMBOLS; } + @Override public final int getSegmentSize() { return SEGMENT_SIZE; } + @Override public final int getStartState() { return START_STATE; } + @Override public final int getStartSymbol() { return lhs[0]; } @@ -2006,55 +2041,68 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar return IDENTIFIER_SYMBOL; } + @Override public final int getEoftSymbol() { return EOFT_SYMBOL; } + @Override public final int getEoltSymbol() { return EOLT_SYMBOL; } + @Override public final int getAcceptAction() { return ACCEPT_ACTION; } + @Override public final int getErrorAction() { return ERROR_ACTION; } + @Override public final boolean isValidForParser() { return isValidForParser; } + @Override public final boolean getBacktrack() { return BACKTRACK; } + @Override public final int originalState(int state) { return -baseCheck[state]; } + @Override public final int asi(int state) { return asb[originalState(state)]; } + @Override public final int nasi(int state) { return nasb[originalState(state)]; } + @Override public final int inSymbol(int state) { return inSymb[originalState(state)]; } + @Override public final int ntAction(int state, int sym) { return baseAction[state + sym]; } + @Override public final int tAction(int state, int sym) { int i = baseAction[state], k = i + sym; return termAction[termCheck[k] == sym ? k : i]; } + @Override public final int lookAhead(int la_state, int sym) { int k = la_state + sym; return termAction[termCheck[k] == sym ? k : la_state]; diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java index a088097f086..141b70c57d9 100644 --- a/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java +++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java @@ -62,6 +62,7 @@ public class XlcLanguageOptionsPreferencePage extends PreferencePage Link link = new Link(page, SWT.NONE); link.setText(PreferenceMessages.XlcLanguageOptionsPreferencePage_link); link.addListener(SWT.Selection, new Listener() { + @Override public void handleEvent(Event event) { PreferencesUtil.createPreferenceDialogOn(getShell(), event.text, null, null).open(); } @@ -104,10 +105,12 @@ public class XlcLanguageOptionsPreferencePage extends PreferencePage return isPropertyPage() ? (IProject) element.getAdapter(IProject.class) : null; } + @Override public IAdaptable getElement() { return element; } + @Override public void setElement(IAdaptable element) { this.element = element; } @@ -116,6 +119,7 @@ public class XlcLanguageOptionsPreferencePage extends PreferencePage return element != null; } + @Override public void init(IWorkbench workbench) { // TODO Auto-generated method stub } diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java index b3d238b791d..00fa2c7161a 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java @@ -41,6 +41,7 @@ public class TestsPlugin extends AbstractUIPlugin { /** * This method is called upon plug-in activation */ + @Override public void start(BundleContext context) throws Exception { super.start(context); } @@ -48,6 +49,7 @@ public class TestsPlugin extends AbstractUIPlugin { /** * This method is called when the plug-in is stopped */ + @Override public void stop(BundleContext context) throws Exception { super.stop(context); plugin = null; diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java index f6a7fdb10e7..217943ebd27 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java @@ -67,10 +67,12 @@ public class XlcErrorParserTester { */ private class MockMarkerGenerator implements IMarkerGenerator { + @Override public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) { // dummy } + @Override public void addMarker(ProblemMarkerInfo problemMarkerInfo) { // dummy } diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java b/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java index e455e15efe8..ac1b18573fa 100644 --- a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java +++ b/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java @@ -39,6 +39,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); } @@ -47,6 +48,7 @@ public class Activator extends AbstractUIPlugin { * (non-Javadoc) * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) */ + @Override public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); |