mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Use DOMScanner rather than Scanner2.

Browse source
This commit is contained in:
John Camelon 2005-01-26 19:22:44 +00:00
parent 4d00261705
commit d7b97a7f42
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
View file

@ -39,6 +39,7 @@ import org.eclipse.cdt.core.parser.IScanner;
import org.eclipse.cdt.core.parser.ParserMode; import org.eclipse.cdt.core.parser.ParserMode;
import org.eclipse.cdt.core.parser.ScannerInfo; import org.eclipse.cdt.core.parser.ScannerInfo;
import org.eclipse.cdt.core.parser.ast.IASTEnumerator; import org.eclipse.cdt.core.parser.ast.IASTEnumerator;
import org.eclipse.cdt.core.dom.CDOM;
import org.eclipse.cdt.core.dom.ast.IASTArrayModifier; import org.eclipse.cdt.core.dom.ast.IASTArrayModifier;
import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
@ -67,6 +68,11 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction;
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.parser.InternalParserUtil;
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.cdt.internal.ui.editor.CEditor; import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
@ -104,7 +110,7 @@ public class DOMAST extends ViewPart {
private Action refreshAction; private Action refreshAction;
private IFile file = null; private IFile file = null;
private IEditorPart part = null; private IEditorPart part = null;
private ParserLanguage lang = null; ParserLanguage lang = null;
/* /*
* The content provider class is responsible for * The content provider class is responsible for
@ -205,14 +211,21 @@ public class DOMAST extends ViewPart {
String [] includePaths = new String[0]; String [] includePaths = new String[0];
IScannerInfo scannerInfo = new ScannerInfo( definitions, includePaths ); IScannerInfo scannerInfo = new ScannerInfo( definitions, includePaths );
IScanner scanner = ParserFactory.createScanner( IScannerExtensionConfiguration configuration = null;
reader, if( lang == ParserLanguage.CPP )
scannerInfo, configuration = new GPPScannerExtensionConfiguration();
mode, else
lang, configuration = new GCCScannerExtensionConfiguration();
new NullSourceElementRequestor(),
null, IScanner scanner = new DOMScanner( reader, scannerInfo, mode, lang, ParserFactory.createDefaultLogService(), configuration, CDOM.getInstance().getCodeReaderFactory( CDOM.PARSE_SAVED_RESOURCES) );
null );
// reader,
// scannerInfo,
// mode,
// lang,
// new NullSourceElementRequestor(),
// null,
// null );
AbstractGNUSourceCodeParser parser = null; AbstractGNUSourceCodeParser parser = null;
if ( lang == ParserLanguage.C ) { if ( lang == ParserLanguage.C ) {
parser = new GNUCSourceParser( parser = new GNUCSourceParser(