diff options
author | Mike Kucera | 2009-01-13 20:28:15 +0000 |
---|---|---|
committer | Mike Kucera | 2009-01-13 20:28:15 +0000 |
commit | 07a63ee282883e072edaaa0b91afbf0ee0b566fa (patch) | |
tree | 36cea78330194ca1440ba017c5d2b75aea630676 /lrparser/org.eclipse.cdt.core.lrparser.tests | |
parent | ad36b7caa4c2dfea4345bb2733b6a261d66465b7 (diff) | |
download | org.eclipse.cdt-07a63ee282883e072edaaa0b91afbf0ee0b566fa.tar.gz org.eclipse.cdt-07a63ee282883e072edaaa0b91afbf0ee0b566fa.tar.xz org.eclipse.cdt-07a63ee282883e072edaaa0b91afbf0ee0b566fa.zip |
started adding support for GNU extensions to LR parsers
Diffstat (limited to 'lrparser/org.eclipse.cdt.core.lrparser.tests')
25 files changed, 155 insertions, 149 deletions
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java index c869f5e4b5b..04d58156a4e 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecFailingTest.java @@ -14,8 +14,8 @@ import junit.framework.TestSuite; 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.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPSpecFailingTest; @@ -57,11 +57,11 @@ public class LRCPPSpecFailingTest extends AST2CPPSpecFailingTest { protected BaseExtensibleLanguage getCLanguage() { - return C99Language.getDefault(); + return GCCLanguage.getDefault(); } protected BaseExtensibleLanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java index 250dad67b05..2a7daf2e2c8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPSpecTest.java @@ -14,8 +14,8 @@ import junit.framework.TestSuite; 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.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPSpecTest; @@ -78,11 +78,11 @@ public class LRCPPSpecTest extends AST2CPPSpecTest { protected BaseExtensibleLanguage getCLanguage() { - return C99Language.getDefault(); + return GCCLanguage.getDefault(); } protected BaseExtensibleLanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java index d9dcc563e9d..aeaa8017434 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCPPTests.java @@ -14,8 +14,8 @@ import junit.framework.AssertionFailedError; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPTests; @@ -40,7 +40,7 @@ public class LRCPPTests extends AST2CPPTests { @Override protected IASTTranslationUnit parse( String code, ParserLanguage lang, @SuppressWarnings("unused") boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -48,12 +48,12 @@ public class LRCPPTests extends AST2CPPTests { return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java index c5910b620a0..087c0fe0087 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCSpecTests.java @@ -14,8 +14,8 @@ import junit.framework.AssertionFailedError; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2CSpecTest; @@ -60,11 +60,11 @@ public class LRCSpecTests extends AST2CSpecTest { } protected ILanguage getCLanguage() { - return C99Language.getDefault(); + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java index 305d702508e..b6d3bd943e8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCommentTests.java @@ -15,8 +15,8 @@ import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTComment; import org.eclipse.cdt.core.dom.ast.IASTFileLocation; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.CommentTests; @@ -33,7 +33,7 @@ public class LRCommentTests extends CommentTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); return ParseHelper.parse(code, language, expectNoProblems); } @@ -44,7 +44,7 @@ public class LRCommentTests extends CommentTests { boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -52,12 +52,12 @@ public class LRCommentTests extends CommentTests { return ParseHelper.commentParse(code, language); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java index 58cb19126e4..1750188b9b8 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompleteParser2Tests.java @@ -14,8 +14,8 @@ import junit.framework.AssertionFailedError; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.CompleteParser2Tests; @@ -26,20 +26,27 @@ public class LRCompleteParser2Tests extends CompleteParser2Tests { return suite(LRCompleteParser2Tests.class); } + public LRCompleteParser2Tests() { + } + + public LRCompleteParser2Tests(String name) { + super(name); + } + @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse(String code, boolean expectedToPass, ParserLanguage lang, boolean gcc) throws Exception { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); return ParseHelper.parse(code, language, expectedToPass); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } @@ -72,13 +79,13 @@ public class LRCompleteParser2Tests extends CompleteParser2Tests { // } - @Override - public void testBug102376() throws Exception { // gcc extension - try { - super.testBug102376(); - fail(); - } catch(AssertionFailedError _) { } - } +// @Override +// public void testBug102376() throws Exception { // gcc extension +// try { +// super.testBug102376(); +// fail(); +// } catch(AssertionFailedError _) { } +// } @Override public void test158192_declspec_in_declarator() throws Exception { diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java index 9d51fd58623..b6b3db9a610 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionBasicTest.java @@ -16,8 +16,8 @@ import org.eclipse.cdt.core.dom.ast.IASTCompletionNode; import org.eclipse.cdt.core.dom.ast.IBinding; import org.eclipse.cdt.core.dom.ast.IFunction; import org.eclipse.cdt.core.dom.ast.ITypedef; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.prefix.BasicCompletionTest; @@ -39,17 +39,17 @@ public class LRCompletionBasicTest extends BasicCompletionTest { ParserLanguage lang, boolean useGNUExtensions) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); return ParseHelper.getCompletionNode(code, language); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java index bbca81ada20..ed56b0a6508 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRCompletionParseTest.java @@ -25,7 +25,7 @@ import org.eclipse.cdt.core.dom.ast.IEnumerator; import org.eclipse.cdt.core.dom.ast.IField; import org.eclipse.cdt.core.dom.ast.ITypedef; import org.eclipse.cdt.core.dom.ast.IVariable; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; import org.eclipse.cdt.core.model.ILanguage; @@ -45,7 +45,7 @@ public class LRCompletionParseTest extends TestCase { protected IASTCompletionNode parse(String code, int offset) throws Exception { - return ParseHelper.getCompletionNode(code, getC99Language(), offset); + return ParseHelper.getCompletionNode(code, getCLanguage(), offset); } @@ -72,8 +72,8 @@ public class LRCompletionParseTest extends TestCase { } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java index 976311aad32..d2698b83613 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationInclusionTests.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.ExtendedScannerInfo; @@ -45,7 +45,7 @@ public class LRDOMLocationInclusionTests 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(); //$NON-NLS-1$ + ILanguage lang = code.getName().endsWith("cc") ? getCPPLanguage() : getCLanguage(); //$NON-NLS-1$ CodeReader codeReader = new CodeReader(code.getLocation().toOSString()); IASTTranslationUnit tu = lang.getASTTranslationUnit(codeReader, s, SavedCodeReaderFactory.getInstance(), null, ILanguage.OPTION_ADD_COMMENTS, ParserUtil.getParserLogService()); @@ -60,12 +60,12 @@ public class LRDOMLocationInclusionTests extends DOMLocationInclusionTests { } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java index e498795b2e4..1c6c1bac978 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationMacroTests.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationMacroTests; @@ -34,18 +34,18 @@ public class LRDOMLocationMacroTests extends DOMLocationMacroTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options().setCheckSyntaxProblems(expectNoProblems).setCheckPreprocessorProblems(expectNoProblems); return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java index c4ae424ad8d..aa526b4811b 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMLocationTests.java @@ -14,8 +14,8 @@ import junit.framework.AssertionFailedError; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationTests; @@ -34,17 +34,17 @@ public class LRDOMLocationTests extends DOMLocationTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options().setCheckSyntaxProblems(expectNoProblems).setCheckPreprocessorProblems(expectNoProblems); return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java index 1d8a151a114..bd8ff6a6693 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDOMPreprocessorInformationTest.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.DOMPreprocessorInformationTest; @@ -30,18 +30,18 @@ public class LRDOMPreprocessorInformationTest extends DOMPreprocessorInformation @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options().setCheckSyntaxProblems(expectNoProblems).setCheckPreprocessorProblems(expectNoProblems); return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java index 4bfb085b178..f58e44a5f66 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRDigraphTrigraphTests.java @@ -32,7 +32,7 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration; import org.eclipse.cdt.core.dom.ast.IASTStatement; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; import org.eclipse.cdt.core.model.ILanguage; @@ -60,7 +60,7 @@ public class LRDigraphTrigraphTests extends TestCase { protected ILanguage getCLanguage() { - return C99Language.getDefault(); + return GCCLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java index bad5ea5b4dc..cb7ec016822 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRGCCTests.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.GCCTests; @@ -34,18 +34,18 @@ public class LRGCCTests extends GCCTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options().setCheckSyntaxProblems(expectNoProblems).setCheckPreprocessorProblems(expectNoProblems); return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java index 73966c7e981..054677189f3 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRImageLocationTests.java @@ -11,8 +11,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.ImageLocationTests; @@ -33,7 +33,7 @@ public class LRImageLocationTests extends ImageLocationTests { @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -41,12 +41,12 @@ public class LRImageLocationTests extends ImageLocationTests { return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java index 2dc57ce6679..dbc90fac7ec 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRKnRTests.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2KnRTests; @@ -33,17 +33,17 @@ public class LRKnRTests extends AST2KnRTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); return ParseHelper.parse(code, language, expectNoProblems); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } // LPG handles syntax errors differently than the DOM parser diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java index 790a53a5d5f..f32a38d7476 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRNodeSelectorTest.java @@ -15,8 +15,8 @@ import java.io.IOException; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.ASTNodeSelectorTest; @@ -35,7 +35,7 @@ public class LRNodeSelectorTest extends ASTNodeSelectorTest { @Override protected IASTTranslationUnit parse( String code, ParserLanguage lang, @SuppressWarnings("unused") boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializer) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -51,12 +51,12 @@ public class LRNodeSelectorTest extends ASTNodeSelectorTest { } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java index 7dff08ca8bf..d532fd19ad0 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRQuickParser2Tests.java @@ -10,8 +10,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.AssertionFailedError; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.QuickParser2Tests; @@ -25,7 +25,7 @@ public class LRQuickParser2Tests extends QuickParser2Tests { @Override protected void parse(String code, boolean expectedToPass, ParserLanguage lang, @SuppressWarnings("unused") boolean gcc) throws Exception { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); // don't check preprocessor problems for this test suite (causes tons of failures) ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectedToPass); @@ -34,12 +34,12 @@ public class LRQuickParser2Tests extends QuickParser2Tests { } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java index c7839c8144c..b9ecd5cb2d5 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSelectionParseTest.java @@ -15,8 +15,8 @@ import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ICodeReaderFactory; import org.eclipse.cdt.core.dom.ast.IASTNode; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.CodeReader; import org.eclipse.cdt.core.parser.IScannerInfo; @@ -55,7 +55,7 @@ public class LRSelectionParseTest extends AST2SelectionParseTest { @Override protected IASTNode parse(String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, int offset, int length) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckPreprocessorProblems(expectNoProblems); options.setCheckSyntaxProblems(expectNoProblems); @@ -65,7 +65,7 @@ public class LRSelectionParseTest extends AST2SelectionParseTest { protected IASTTranslationUnit parse( IFile file, ParserLanguage lang, IScannerInfo scanInfo, boolean useGNUExtensions, boolean expectNoProblems ) { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); String fileName = file.getLocation().toOSString(); ICodeReaderFactory fileCreator = SavedCodeReaderFactory.getInstance(); @@ -85,12 +85,12 @@ public class LRSelectionParseTest extends AST2SelectionParseTest { return parse(file, lang, new ScannerInfo(), useGNUExtensions, expectNoProblems); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java index 0064cb64247..ef89145845a 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRSemanticsTests.java @@ -11,8 +11,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.SemanticsTests; @@ -33,7 +33,7 @@ public class LRSemanticsTests extends SemanticsTests { @Override protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -41,11 +41,11 @@ public class LRSemanticsTests extends SemanticsTests { return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java index 2340cd3cddd..992ded299f2 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTaskParserTest.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.TaskParserTest; @@ -28,14 +28,13 @@ public class LRTaskParserTest extends TaskParserTest { } @Override - @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { return parse(code, lang, useGNUExtensions, expectNoProblems, false); } @Override - protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + protected IASTTranslationUnit parse( String code, ParserLanguage lang, @SuppressWarnings("unused") boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -43,11 +42,11 @@ public class LRTaskParserTest extends TaskParserTest { return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java index 03d977111fe..0b420f02153 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTemplateTests.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2TemplateTests; @@ -32,7 +32,7 @@ public class LRTemplateTests extends AST2TemplateTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -40,12 +40,12 @@ public class LRTemplateTests extends AST2TemplateTests { return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java index c0f1525beee..312607236bd 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRTests.java @@ -16,8 +16,8 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2Tests; @@ -48,7 +48,7 @@ public class LRTests extends AST2Tests { @Override protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems, boolean skipTrivialInitializers) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); ParseHelper.Options options = new ParseHelper.Options(); options.setCheckSyntaxProblems(expectNoProblems); options.setCheckPreprocessorProblems(expectNoProblems); @@ -56,12 +56,12 @@ public class LRTests extends AST2Tests { return ParseHelper.parse(code, language, options); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java index 04ed8d6bc2c..c46e304f267 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilOldTests.java @@ -14,8 +14,8 @@ import junit.framework.AssertionFailedError; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilOldTests; @@ -32,17 +32,17 @@ public class LRUtilOldTests extends AST2UtilOldTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); return ParseHelper.parse(code, language, expectNoProblems); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java index aeafe6ef149..3519fabfc19 100644 --- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java +++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRUtilTests.java @@ -13,8 +13,8 @@ package org.eclipse.cdt.core.lrparser.tests; import junit.framework.TestSuite; import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; -import org.eclipse.cdt.core.dom.lrparser.c99.C99Language; -import org.eclipse.cdt.core.dom.lrparser.cpp.ISOCPPLanguage; +import org.eclipse.cdt.core.dom.lrparser.gcc.GCCLanguage; +import org.eclipse.cdt.core.dom.lrparser.gpp.GPPLanguage; import org.eclipse.cdt.core.model.ILanguage; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.tests.ast2.AST2UtilTests; @@ -40,16 +40,16 @@ public class LRUtilTests extends AST2UtilTests { @Override @SuppressWarnings("unused") protected IASTTranslationUnit parse( String code, ParserLanguage lang, boolean useGNUExtensions, boolean expectNoProblems ) throws ParserException { - ILanguage language = lang.isCPP() ? getCPPLanguage() : getC99Language(); + ILanguage language = lang.isCPP() ? getCPPLanguage() : getCLanguage(); return ParseHelper.parse(code, language, expectNoProblems); } - protected ILanguage getC99Language() { - return C99Language.getDefault(); + protected ILanguage getCLanguage() { + return GCCLanguage.getDefault(); } protected ILanguage getCPPLanguage() { - return ISOCPPLanguage.getDefault(); + return GPPLanguage.getDefault(); } } |