From 2a48843261d032500fe1ac1634cbe0419d543d6a Mon Sep 17 00:00:00 2001 From: John Camelon Date: Wed, 19 Jan 2005 15:21:38 +0000 Subject: [PATCH] Some refactoring of class names. Consistency is key. --- .../core/parser/tests/ParserTestSuite.java | 4 +- .../core/parser/tests/ast2/AST2BaseTest.java | 12 +-- .../CompleteParser2Tests.java | 18 ++-- .../tests/ast2/DOMLocationInclusionTests.java | 100 ++++++++++++++++++ .../{parser2 => ast2}/QuickParser2Tests.java | 18 ++-- .../tests/scanner2/BaseScanner2Test.java | 12 +-- .../parser/tests/scanner2/SpeedTest2.java | 12 +-- .../cdt/core/parser/ParserFactory.java | 12 +-- ...a => GPPParserExtensionConfiguration.java} | 2 +- .../core/parser/scanner2/BaseScanner.java | 4 +- .../core/parser/scanner2/DOMScanner.java | 2 +- ... => GCCScannerExtensionConfiguration.java} | 2 +- ... => GNUScannerExtensionConfiguration.java} | 2 +- ... => GPPScannerExtensionConfiguration.java} | 4 +- ...va => IScannerExtensionConfiguration.java} | 2 +- .../core/parser/scanner2/Scanner2.java | 2 +- .../core/dom/InternalASTServiceProvider.java | 6 +- 17 files changed, 157 insertions(+), 57 deletions(-) rename core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/{parser2 => ast2}/CompleteParser2Tests.java (99%) create mode 100644 core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java rename core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/{parser2 => ast2}/QuickParser2Tests.java (99%) rename core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/{GNUCPPParserExtensionConfiguration.java => GPPParserExtensionConfiguration.java} (97%) rename core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/{GCCScannerConfiguration.java => GCCScannerExtensionConfiguration.java} (95%) rename core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/{GNUScannerConfiguration.java => GNUScannerExtensionConfiguration.java} (98%) rename core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/{GPPScannerConfiguration.java => GPPScannerExtensionConfiguration.java} (92%) rename core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/{IScannerConfiguration.java => IScannerExtensionConfiguration.java} (95%) diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java index 635b24294b7..2745a415e6d 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ParserTestSuite.java @@ -18,10 +18,10 @@ import org.eclipse.cdt.core.model.tests.CModelElementsTests; import org.eclipse.cdt.core.model.tests.StructuralCModelElementsTests; import org.eclipse.cdt.core.parser.tests.ast2.AST2CPPTests; import org.eclipse.cdt.core.parser.tests.ast2.AST2Tests; +import org.eclipse.cdt.core.parser.tests.ast2.CompleteParser2Tests; import org.eclipse.cdt.core.parser.tests.ast2.DOMLocationTests; import org.eclipse.cdt.core.parser.tests.ast2.GCCTests; -import org.eclipse.cdt.core.parser.tests.parser2.CompleteParser2Tests; -import org.eclipse.cdt.core.parser.tests.parser2.QuickParser2Tests; +import org.eclipse.cdt.core.parser.tests.ast2.QuickParser2Tests; import org.eclipse.cdt.core.parser.tests.scanner2.ObjectMapTest; import org.eclipse.cdt.core.parser.tests.scanner2.Scanner2Test; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java index bdc2e9b5f3c..96941b7f600 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java @@ -53,9 +53,9 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; -import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.IScannerExtensionConfiguration; /** * @author aniefer @@ -74,11 +74,11 @@ public class AST2BaseTest extends TestCase { CodeReader codeReader = new CodeReader(code .toCharArray()); ScannerInfo scannerInfo = new ScannerInfo(); - IScannerConfiguration configuration = null; + IScannerExtensionConfiguration configuration = null; if( lang == ParserLanguage.C ) - configuration = new GCCScannerConfiguration(); + configuration = new GCCScannerExtensionConfiguration(); else - configuration = new GPPScannerConfiguration(); + configuration = new GPPScannerExtensionConfiguration(); IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, SavedCodeReaderFactory.getInstance() ); ISourceCodeParser parser2 = null; diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/parser2/CompleteParser2Tests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java similarity index 99% rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/parser2/CompleteParser2Tests.java rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java index 094318ba55f..ff7ab47da88 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/parser2/CompleteParser2Tests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/CompleteParser2Tests.java @@ -8,7 +8,7 @@ * Contributors: * IBM - Initial API and implementation **********************************************************************/ -package org.eclipse.cdt.core.parser.tests.parser2; +package org.eclipse.cdt.core.parser.tests.ast2; import java.io.StringWriter; import java.io.Writer; @@ -67,14 +67,14 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; import org.eclipse.cdt.internal.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; -import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPParserExtensionConfiguration; +import org.eclipse.cdt.internal.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; -import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.IScannerExtensionConfiguration; /** * @author jcamelon @@ -138,17 +138,17 @@ public class CompleteParser2Tests extends TestCase { CodeReader codeReader = new CodeReader(code .toCharArray()); ScannerInfo scannerInfo = new ScannerInfo(); - IScannerConfiguration configuration = null; + IScannerExtensionConfiguration configuration = null; if( lang == ParserLanguage.C ) - configuration = new GCCScannerConfiguration(); + configuration = new GCCScannerExtensionConfiguration(); else - configuration = new GPPScannerConfiguration(); + configuration = new GPPScannerExtensionConfiguration(); ISourceCodeParser parser2 = null; IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, SavedCodeReaderFactory.getInstance() ); if (lang == ParserLanguage.CPP) { ICPPParserExtensionConfiguration config = null; if (gcc) - config = new GNUCPPParserExtensionConfiguration(); + config = new GPPParserExtensionConfiguration(); else config = new ANSICPPParserExtensionConfiguration(); parser2 = new GNUCPPSourceParser(scanner, ParserMode.COMPLETE_PARSE, diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java new file mode 100644 index 00000000000..642d9677f34 --- /dev/null +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/DOMLocationInclusionTests.java @@ -0,0 +1,100 @@ +/********************************************************************** + * Copyright (c) 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM - Initial API and implementation + **********************************************************************/ +package org.eclipse.cdt.core.parser.tests.ast2; + +import java.io.InputStream; + +import org.eclipse.cdt.core.dom.CDOM; +import org.eclipse.cdt.core.dom.ICodeReaderFactory; +import org.eclipse.cdt.core.dom.ast.IASTProblem; +import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit; +import org.eclipse.cdt.core.parser.CodeReader; +import org.eclipse.cdt.core.parser.IParserLogService; +import org.eclipse.cdt.core.parser.IScanner; +import org.eclipse.cdt.core.parser.IScannerInfo; +import org.eclipse.cdt.core.parser.NullLogService; +import org.eclipse.cdt.core.parser.ParserLanguage; +import org.eclipse.cdt.core.parser.ParserMode; +import org.eclipse.cdt.core.parser.ScannerInfo; +import org.eclipse.cdt.core.parser.tests.FileBasePluginTest; +import org.eclipse.cdt.internal.core.dom.parser.ISourceCodeParser; +import org.eclipse.cdt.internal.core.dom.parser.c.CVisitor; +import org.eclipse.cdt.internal.core.dom.parser.c.GCCParserExtensionConfiguration; +import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; +import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; +import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; +import org.eclipse.cdt.internal.core.dom.parser.cpp.GPPParserExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.ParserException; +import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; +import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.IScannerExtensionConfiguration; +import org.eclipse.core.resources.IFile; + +/** + * @author jcamelon + */ +public class DOMLocationInclusionTests extends FileBasePluginTest { + + private static final IScannerInfo SCANNER_INFO = new ScannerInfo(); + private static final IParserLogService NULL_LOG = new NullLogService(); + private static final ICodeReaderFactory factory = CDOM + .getInstance() + .getCodeReaderFactory( + CDOM.PARSE_SAVED_RESOURCES); + + /** + * @param name + * @param className + */ + public DOMLocationInclusionTests(String name) { + super(name, DOMLocationInclusionTests.class); + } + + protected IASTTranslationUnit parse(IFile code, ParserLanguage language) + throws Exception { + InputStream stream = code.getContents(); + IScanner scanner = new DOMScanner(new CodeReader(code.getLocation() + .toOSString(), stream), SCANNER_INFO, ParserMode.COMPLETE_PARSE, + language, NULL_LOG, getScannerConfig(language), factory); + ISourceCodeParser parser = null; + if (language == ParserLanguage.CPP) { + parser = new GNUCPPSourceParser( scanner, ParserMode.COMPLETE_PARSE, NULL_LOG, new GPPParserExtensionConfiguration() ); + } else { + parser = new GNUCSourceParser( scanner, ParserMode.COMPLETE_PARSE, NULL_LOG, new GCCParserExtensionConfiguration() ); + } + stream.close(); + IASTTranslationUnit parseResult = parser.parse(); + + if (parser.encounteredError()) + throw new ParserException("FAILURE"); //$NON-NLS-1$ + + if (language == ParserLanguage.C) { + IASTProblem[] problems = CVisitor.getProblems(parseResult); + assertEquals(problems.length, 0); + } else if (language == ParserLanguage.CPP) { + IASTProblem[] problems = CPPVisitor.getProblems(parseResult); + assertEquals(problems.length, 0); + } + + return parseResult; + } + + /** + * @param language + * @return + */ + private IScannerExtensionConfiguration getScannerConfig(ParserLanguage language) { + if (language == ParserLanguage.CPP) + return new GPPScannerExtensionConfiguration(); + return new GCCScannerExtensionConfiguration(); + } +} \ No newline at end of file diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/parser2/QuickParser2Tests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java similarity index 99% rename from core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/parser2/QuickParser2Tests.java rename to core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java index f3bc03648f4..18b6f4e30fc 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/parser2/QuickParser2Tests.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/QuickParser2Tests.java @@ -7,7 +7,7 @@ * * Contributors: * IBM Rational Software - Initial API and implementation */ -package org.eclipse.cdt.core.parser.tests.parser2; +package org.eclipse.cdt.core.parser.tests.ast2; import java.io.IOException; import java.io.StringWriter; @@ -33,14 +33,14 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; import org.eclipse.cdt.internal.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor; -import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPParserExtensionConfiguration; +import org.eclipse.cdt.internal.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.parser.ParserException; import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; -import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.IScannerExtensionConfiguration; /** * @author jcamelon @@ -1362,17 +1362,17 @@ public class QuickParser2Tests extends TestCase { CodeReader codeReader = new CodeReader( code.toCharArray() ); IScannerInfo scannerInfo = new ScannerInfo(); - IScannerConfiguration configuration = null; + IScannerExtensionConfiguration configuration = null; if( lang == ParserLanguage.C ) - configuration = new GCCScannerConfiguration(); + configuration = new GCCScannerExtensionConfiguration(); else - configuration = new GPPScannerConfiguration(); + configuration = new GPPScannerExtensionConfiguration(); IScanner scanner = new DOMScanner( codeReader, scannerInfo, ParserMode.COMPLETE_PARSE, lang, NULL_LOG, configuration, SavedCodeReaderFactory.getInstance() ); ISourceCodeParser parser2 = null; if (lang == ParserLanguage.CPP) { ICPPParserExtensionConfiguration config = null; if (gcc) - config = new GNUCPPParserExtensionConfiguration(); + config = new GPPParserExtensionConfiguration(); else config = new ANSICPPParserExtensionConfiguration(); parser2 = new GNUCPPSourceParser(scanner, ParserMode.QUICK_PARSE, diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/BaseScanner2Test.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/BaseScanner2Test.java index 78ba08074ef..6ebf7f7a1b8 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/BaseScanner2Test.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/BaseScanner2Test.java @@ -30,9 +30,9 @@ import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ScannerInfo; import org.eclipse.cdt.core.parser.util.CharArrayUtils; -import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.IScannerExtensionConfiguration; import org.eclipse.cdt.internal.core.parser.scanner2.ObjectStyleMacro; import org.eclipse.cdt.internal.core.parser.scanner2.Scanner2; @@ -78,11 +78,11 @@ public class BaseScanner2Test extends TestCase { IParserLogService logService = ( log == null ) ? ParserFactory.createDefaultLogService() : log; ParserMode ourMode = ( (mode == null )? ParserMode.COMPLETE_PARSE : mode ); ISourceElementRequestor ourRequestor = (( requestor == null) ? new NullSourceElementRequestor() : requestor ); - IScannerConfiguration configuration = null; + IScannerExtensionConfiguration configuration = null; if( language == ParserLanguage.C ) - configuration = new GCCScannerConfiguration(); + configuration = new GCCScannerExtensionConfiguration(); else - configuration = new GPPScannerConfiguration(); + configuration = new GPPScannerExtensionConfiguration(); return new Scanner2( code, config, ourRequestor, ourMode, language, logService, workingCopies, configuration ); } diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/SpeedTest2.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/SpeedTest2.java index 7d4acf872ac..c3933b2327f 100644 --- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/SpeedTest2.java +++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/scanner2/SpeedTest2.java @@ -19,9 +19,9 @@ import org.eclipse.cdt.core.parser.ParserFactoryError; import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ScannerInfo; -import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.IScannerExtensionConfiguration; import org.eclipse.cdt.internal.core.parser.scanner2.Scanner2; // A test that just calculates the speed of the parser @@ -84,11 +84,11 @@ public class SpeedTest2 extends TestCase { IParserLogService logService = ( log == null ) ? ParserFactory.createDefaultLogService() : log; ParserMode ourMode = ( (mode == null )? ParserMode.COMPLETE_PARSE : mode ); ISourceElementRequestor ourRequestor = (( requestor == null) ? new NullSourceElementRequestor() : requestor ); - IScannerConfiguration configuration = null; + IScannerExtensionConfiguration configuration = null; if( language == ParserLanguage.C ) - configuration = new GCCScannerConfiguration(); + configuration = new GCCScannerExtensionConfiguration(); else - configuration = new GPPScannerConfiguration(); + configuration = new GPPScannerExtensionConfiguration(); return new Scanner2( code, config, ourRequestor, ourMode, language, logService, workingCopies, configuration ); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ParserFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ParserFactory.java index 2748bd98265..d1ccdef08b3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ParserFactory.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ParserFactory.java @@ -24,9 +24,9 @@ import org.eclipse.cdt.internal.core.parser.QuickParseCallback; import org.eclipse.cdt.internal.core.parser.StructuralParseCallback; import org.eclipse.cdt.internal.core.parser.ast.complete.CompleteParseASTFactory; import org.eclipse.cdt.internal.core.parser.ast.quick.QuickParseASTFactory; -import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerConfiguration; -import org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GCCScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; +import org.eclipse.cdt.internal.core.parser.scanner2.IScannerExtensionConfiguration; import org.eclipse.cdt.internal.core.parser.scanner2.Scanner2; import org.eclipse.cdt.internal.core.parser.token.KeywordSets; @@ -87,11 +87,11 @@ public class ParserFactory { IParserLogService logService = ( log == null ) ? createDefaultLogService() : log; ParserMode ourMode = ( (mode == null )? ParserMode.COMPLETE_PARSE : mode ); ISourceElementRequestor ourRequestor = (( requestor == null) ? new NullSourceElementRequestor() : requestor ); - IScannerConfiguration configuration = null; + IScannerExtensionConfiguration configuration = null; if( language == ParserLanguage.C ) - configuration = new GCCScannerConfiguration(); + configuration = new GCCScannerExtensionConfiguration(); else - configuration = new GPPScannerConfiguration(); + configuration = new GPPScannerExtensionConfiguration(); return new Scanner2( code, config, ourRequestor, ourMode, language, logService, workingCopies, configuration ); } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPParserExtensionConfiguration.java similarity index 97% rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPParserExtensionConfiguration.java rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPParserExtensionConfiguration.java index 0bc38bfe87c..b38f1e25d30 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPParserExtensionConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPParserExtensionConfiguration.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp; /** * @author jcamelon */ -public class GNUCPPParserExtensionConfiguration implements +public class GPPParserExtensionConfiguration implements ICPPParserExtensionConfiguration { /* (non-Javadoc) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java index 9d644c0b193..1ef931b3bac 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java @@ -1120,7 +1120,7 @@ abstract class BaseScanner implements IScanner { public BaseScanner(CodeReader reader, IScannerInfo info, ParserMode parserMode, ParserLanguage language, IParserLogService log, - IScannerConfiguration configuration) { + IScannerExtensionConfiguration configuration) { this.parserMode = parserMode; this.language = language; @@ -4298,7 +4298,7 @@ abstract class BaseScanner implements IScanner { protected int offsetBoundary = -1; - protected void setupBuiltInMacros(IScannerConfiguration config) { + protected void setupBuiltInMacros(IScannerExtensionConfiguration config) { definitions.put(__STDC__.name, __STDC__); definitions.put(__FILE__.name, __FILE__); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java index 37c5411b1df..32614ec5893 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java @@ -59,7 +59,7 @@ public class DOMScanner extends BaseScanner { * @param readerFactory TODO * @param requestor */ - public DOMScanner(CodeReader reader, IScannerInfo info, ParserMode parserMode, ParserLanguage language, IParserLogService log, IScannerConfiguration configuration, ICodeReaderFactory readerFactory) { + public DOMScanner(CodeReader reader, IScannerInfo info, ParserMode parserMode, ParserLanguage language, IParserLogService log, IScannerExtensionConfiguration configuration, ICodeReaderFactory readerFactory) { super(reader, info, parserMode, language, log, configuration); this.expressionEvaluator = new ExpressionEvaluator(null, null); this.codeReaderFactory = readerFactory; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GCCScannerConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GCCScannerExtensionConfiguration.java similarity index 95% rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GCCScannerConfiguration.java rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GCCScannerExtensionConfiguration.java index d895812cb96..7ab6b7f9d19 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GCCScannerConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GCCScannerExtensionConfiguration.java @@ -19,7 +19,7 @@ import org.eclipse.cdt.internal.core.parser.scanner2.BaseScanner.ExpressionEvalu /** * @author jcamelon */ -public class GCCScannerConfiguration extends GNUScannerConfiguration implements IScannerConfiguration { +public class GCCScannerExtensionConfiguration extends GNUScannerExtensionConfiguration implements IScannerExtensionConfiguration { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration#supportMinAndMaxOperators() diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GNUScannerConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GNUScannerExtensionConfiguration.java similarity index 98% rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GNUScannerConfiguration.java rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GNUScannerExtensionConfiguration.java index e6760a467c2..3d62316a09e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GNUScannerConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GNUScannerExtensionConfiguration.java @@ -15,7 +15,7 @@ import org.eclipse.cdt.core.parser.util.CharArrayObjectMap; /** * @author jcamelon */ -public abstract class GNUScannerConfiguration implements IScannerConfiguration { +public abstract class GNUScannerExtensionConfiguration implements IScannerExtensionConfiguration { protected static final char[] emptyCharArray = "".toCharArray(); //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GPPScannerConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GPPScannerExtensionConfiguration.java similarity index 92% rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GPPScannerConfiguration.java rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GPPScannerExtensionConfiguration.java index 56d0113e7f5..2f275f5f6f3 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GPPScannerConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/GPPScannerExtensionConfiguration.java @@ -19,8 +19,8 @@ import org.eclipse.cdt.core.parser.util.CharArrayIntMap; /** * @author jcamelon */ -public class GPPScannerConfiguration extends GNUScannerConfiguration implements - IScannerConfiguration { +public class GPPScannerExtensionConfiguration extends GNUScannerExtensionConfiguration implements + IScannerExtensionConfiguration { /* (non-Javadoc) * @see org.eclipse.cdt.internal.core.parser.scanner2.IScannerConfiguration#supportMinAndMaxOperators() diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/IScannerConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/IScannerExtensionConfiguration.java similarity index 95% rename from core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/IScannerConfiguration.java rename to core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/IScannerExtensionConfiguration.java index 875a21385a8..134e20b8895 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/IScannerConfiguration.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/IScannerExtensionConfiguration.java @@ -16,7 +16,7 @@ import org.eclipse.cdt.core.parser.util.CharArrayObjectMap; /** * @author jcamelon */ -public interface IScannerConfiguration { +public interface IScannerExtensionConfiguration { public boolean initializeMacroValuesTo1(); public boolean support$InIdentifiers(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java index 524825483dd..0a3684eb098 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/Scanner2.java @@ -47,7 +47,7 @@ public class Scanner2 extends BaseScanner { public Scanner2(CodeReader reader, IScannerInfo info, ISourceElementRequestor requestor, ParserMode parserMode, ParserLanguage language, IParserLogService log, List workingCopies, - IScannerConfiguration configuration) { + IScannerExtensionConfiguration configuration) { super(reader, info, parserMode, language, log, configuration); this.requestor = requestor; this.callbackManager = new ScannerCallbackManager(requestor); diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java index 2d8c9b8f7ea..b5b7a9a8460 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java @@ -37,7 +37,7 @@ import org.eclipse.cdt.internal.core.dom.parser.c.GCCParserExtensionConfiguratio import org.eclipse.cdt.internal.core.dom.parser.c.GNUCSourceParser; import org.eclipse.cdt.internal.core.dom.parser.c.ICParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.ANSICPPParserExtensionConfiguration; -import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPParserExtensionConfiguration; +import org.eclipse.cdt.internal.core.dom.parser.cpp.GPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.core.resources.IFile; @@ -117,7 +117,7 @@ public class InternalASTServiceProvider implements IASTServiceProvider { if( l == ParserLanguage.C ) parser = new GNUCSourceParser( scanner, ParserMode.COMPLETE_PARSE, ParserUtil.getParserLogService(), new GCCParserExtensionConfiguration() ); else - parser = new GNUCPPSourceParser( scanner, ParserMode.COMPLETE_PARSE, ParserUtil.getParserLogService(), new GNUCPPParserExtensionConfiguration() ); + parser = new GNUCPPSourceParser( scanner, ParserMode.COMPLETE_PARSE, ParserUtil.getParserLogService(), new GPPParserExtensionConfiguration() ); } else { @@ -150,7 +150,7 @@ public class InternalASTServiceProvider implements IASTServiceProvider { } else if( dialect.equals( dialects[3])) { - ICPPParserExtensionConfiguration config = new GNUCPPParserExtensionConfiguration(); + ICPPParserExtensionConfiguration config = new GPPParserExtensionConfiguration(); parser = new GNUCPPSourceParser( scanner, ParserMode.COMPLETE_PARSE, ParserUtil.getParserLogService(), config ); } }