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

Fix for Marcus - InternalASTServiceProvider now uses DOMScanner.

Browse source
This commit is contained in:
John Camelon 2005-02-03 18:54:49 +00:00
parent 761524840a
commit cffe17ee79
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/InternalASTServiceProvider.java
View file

@ -10,8 +10,6 @@
**********************************************************************/ **********************************************************************/
package org.eclipse.cdt.internal.core.dom; package org.eclipse.cdt.internal.core.dom;
import java.util.Collections;
import org.eclipse.cdt.core.CCProjectNature; import org.eclipse.cdt.core.CCProjectNature;
import org.eclipse.cdt.core.CCorePlugin; import org.eclipse.cdt.core.CCorePlugin;
import org.eclipse.cdt.core.dom.IASTServiceProvider; import org.eclipse.cdt.core.dom.IASTServiceProvider;
@ -24,8 +22,6 @@ import org.eclipse.cdt.core.parser.CodeReader;
import org.eclipse.cdt.core.parser.IScanner; import org.eclipse.cdt.core.parser.IScanner;
import org.eclipse.cdt.core.parser.IScannerInfo; import org.eclipse.cdt.core.parser.IScannerInfo;
import org.eclipse.cdt.core.parser.IScannerInfoProvider; import org.eclipse.cdt.core.parser.IScannerInfoProvider;
import org.eclipse.cdt.core.parser.ISourceElementRequestor;
import org.eclipse.cdt.core.parser.NullSourceElementRequestor;
import org.eclipse.cdt.core.parser.ParserFactory; import org.eclipse.cdt.core.parser.ParserFactory;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
@ -40,7 +36,6 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ANSICPPParserExtensionConfig
import org.eclipse.cdt.internal.core.dom.parser.cpp.GNUCPPSourceParser; 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.dom.parser.cpp.GPPParserExtensionConfiguration;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPParserExtensionConfiguration; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPParserExtensionConfiguration;
import org.eclipse.cdt.internal.core.parser.InternalParserUtil;
import org.eclipse.cdt.internal.core.parser.scanner2.DOMScanner; 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.GCCScannerExtensionConfiguration;
import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration; import org.eclipse.cdt.internal.core.parser.scanner2.GPPScannerExtensionConfiguration;
@ -61,7 +56,6 @@ public class InternalASTServiceProvider implements IASTServiceProvider {
"C++98", //$NON-NLS-1$ "C++98", //$NON-NLS-1$
"GNUC", //$NON-NLS-1$ "GNUC", //$NON-NLS-1$
"GNUC++" }; //$NON-NLS-1$ "GNUC++" }; //$NON-NLS-1$
private static final ISourceElementRequestor NULL_REQUESTOR = new NullSourceElementRequestor();
/* (non-Javadoc) /* (non-Javadoc)
@ -135,13 +129,13 @@ public class InternalASTServiceProvider implements IASTServiceProvider {
{ {
String dialect = configuration.getParserDialect(); String dialect = configuration.getParserDialect();
if( dialect.equals( dialects[0]) || dialect.equals( dialects[2])) if( dialect.equals( dialects[0]) || dialect.equals( dialects[2]))
scanner = ParserFactory.createScanner(reader, scanInfo, ParserMode.COMPLETE_PARSE, scanner = new DOMScanner(reader, scanInfo, ParserMode.COMPLETE_PARSE,
ParserLanguage.C, NULL_REQUESTOR, ParserLanguage.C,
ParserUtil.getScannerLogService(), Collections.EMPTY_LIST); ParserUtil.getScannerLogService(), C_GNU_SCANNER_EXTENSION, fileCreator );
else if( dialect.equals( dialects[1] ) || dialect.equals( dialects[3] )) else if( dialect.equals( dialects[1] ) || dialect.equals( dialects[3] ))
scanner = ParserFactory.createScanner(reader, scanInfo, ParserMode.COMPLETE_PARSE, scanner = new DOMScanner(reader, scanInfo, ParserMode.COMPLETE_PARSE,
ParserLanguage.CPP, NULL_REQUESTOR, ParserLanguage.CPP,
ParserUtil.getScannerLogService(), Collections.EMPTY_LIST); ParserUtil.getScannerLogService(), CPP_GNU_SCANNER_EXTENSION, fileCreator );
else else
throw new UnsupportedDialectException(); throw new UnsupportedDialectException();