Attachment 62252 Details for Bug 179393 – proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch

bug_179393_patch.txt (text/plain), 11.49 KB, created by Mike Kucera

on 2007-03-28 13:10:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Kucera

Created: 2007-03-28 13:10:47 EDT

Size: 11.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.core
>Index: parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java,v
>retrieving revision 1.7
>diff -u -r1.7 FileCodeReaderFactory.java
>--- parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java	14 Jun 2006 12:16:10 -0000	1.7
>+++ parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java	28 Mar 2007 17:08:27 -0000
>@@ -11,10 +11,10 @@
> package org.eclipse.cdt.internal.core.parser.scanner2;
> 
> import org.eclipse.cdt.core.dom.ICodeReaderFactory;
>+import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
> import org.eclipse.cdt.core.model.ITranslationUnit;
> import org.eclipse.cdt.core.parser.CodeReader;
> import org.eclipse.cdt.core.parser.ICodeReaderCache;
>-import org.eclipse.cdt.core.parser.IScanner;
> import org.eclipse.cdt.internal.core.dom.parser.EmptyCodeReaderCache;
> 
> /**
>@@ -49,9 +49,9 @@
>     }
>     
>     /* (non-Javadoc)
>-     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String)
>+     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
>      */
>-    public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {
>+    public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
> 		return cache.get(path);
> 	}
> 
>Index: src/org/eclipse/cdt/internal/core/dom/NullCodeReaderFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/NullCodeReaderFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 NullCodeReaderFactory.java
>--- src/org/eclipse/cdt/internal/core/dom/NullCodeReaderFactory.java	5 Feb 2007 15:44:28 -0000	1.1
>+++ src/org/eclipse/cdt/internal/core/dom/NullCodeReaderFactory.java	28 Mar 2007 17:08:27 -0000
>@@ -11,9 +11,9 @@
> package org.eclipse.cdt.internal.core.dom;
> 
> import org.eclipse.cdt.core.dom.ICodeReaderFactory;
>+import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
> import org.eclipse.cdt.core.parser.CodeReader;
> import org.eclipse.cdt.core.parser.ICodeReaderCache;
>-import org.eclipse.cdt.core.parser.IScanner;
> 
> /**
>  * A <code>ICodeReaderFactory</code> which creates dummy <code>CodeReader</code>s without content.
>@@ -34,9 +34,9 @@
> 	}
> 
> 	/*
>-	 * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.parser.IScanner, java.lang.String)
>+	 * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
> 	 */
>-	public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {
>+	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
> 		return new CodeReader(path, EMPTY_CHARS);
> 	}
> 
>Index: src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java,v
>retrieving revision 1.9
>diff -u -r1.9 SavedCodeReaderFactory.java
>--- src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java	14 Jun 2006 12:16:13 -0000	1.9
>+++ src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java	28 Mar 2007 17:08:27 -0000
>@@ -13,11 +13,11 @@
> import org.eclipse.cdt.core.CCorePlugin;
> import org.eclipse.cdt.core.dom.CDOM;
> import org.eclipse.cdt.core.dom.ICodeReaderFactory;
>+import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
> import org.eclipse.cdt.core.model.ITranslationUnit;
> import org.eclipse.cdt.core.parser.CodeReader;
> import org.eclipse.cdt.core.parser.CodeReaderCache;
> import org.eclipse.cdt.core.parser.ICodeReaderCache;
>-import org.eclipse.cdt.core.parser.IScanner;
> import org.eclipse.core.runtime.Preferences;
> 
> /**
>@@ -84,9 +84,9 @@
>     }
> 
>     /* (non-Javadoc)
>-     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String)
>+     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
>      */
>-    public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {
>+    public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
> 		return cache.get(path);
>     }
> 	
>Index: src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java,v
>retrieving revision 1.9
>diff -u -r1.9 PartialWorkingCopyCodeReaderFactory.java
>--- src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java	14 Jun 2006 12:16:13 -0000	1.9
>+++ src/org/eclipse/cdt/internal/core/dom/PartialWorkingCopyCodeReaderFactory.java	28 Mar 2007 17:08:27 -0000
>@@ -15,11 +15,11 @@
> 
> import org.eclipse.cdt.core.dom.CDOM;
> import org.eclipse.cdt.core.dom.ICodeReaderFactory;
>+import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
> import org.eclipse.cdt.core.model.ITranslationUnit;
> import org.eclipse.cdt.core.model.IWorkingCopyProvider;
> import org.eclipse.cdt.core.parser.CodeReader;
> import org.eclipse.cdt.core.parser.ICodeReaderCache;
>-import org.eclipse.cdt.core.parser.IScanner;
> import org.eclipse.cdt.core.parser.ParserUtil;
> import org.eclipse.cdt.internal.core.parser.ast.EmptyIterator;
> 
>@@ -70,9 +70,9 @@
> 	}
> 
>     /* (non-Javadoc)
>-     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String)
>+     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
>      */
>-    public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {
>+    public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
>         return cache.get( path );
>     }
> 
>Index: parser/org/eclipse/cdt/core/dom/ICodeReaderFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ICodeReaderFactory.java,v
>retrieving revision 1.9
>diff -u -r1.9 ICodeReaderFactory.java
>--- parser/org/eclipse/cdt/core/dom/ICodeReaderFactory.java	14 Jun 2006 12:16:13 -0000	1.9
>+++ parser/org/eclipse/cdt/core/dom/ICodeReaderFactory.java	28 Mar 2007 17:08:27 -0000
>@@ -12,7 +12,6 @@
> 
> import org.eclipse.cdt.core.parser.CodeReader;
> import org.eclipse.cdt.core.parser.ICodeReaderCache;
>-import org.eclipse.cdt.core.parser.IScanner;
> 
> /**
>  * This is the interface that an AST Service uses to delegate the construction
>@@ -43,7 +42,7 @@
> 	 * @param path
> 	 * @return CodeReader for contents at that path.
> 	 */
>-	public CodeReader createCodeReaderForInclusion(IScanner scanner, String path);
>+	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback callback, String path);
> 	
> 	/**
> 	 * Returns the ICodeReaderCache used for this ICodeReaderFacotry.
>Index: parser/org/eclipse/cdt/internal/core/index/IndexBasedCodeReaderFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexBasedCodeReaderFactory.java,v
>retrieving revision 1.8
>diff -u -r1.8 IndexBasedCodeReaderFactory.java
>--- parser/org/eclipse/cdt/internal/core/index/IndexBasedCodeReaderFactory.java	21 Feb 2007 12:26:51 -0000	1.8
>+++ parser/org/eclipse/cdt/internal/core/index/IndexBasedCodeReaderFactory.java	28 Mar 2007 17:08:27 -0000
>@@ -26,6 +26,7 @@
> 
> import org.eclipse.cdt.core.CCorePlugin;
> import org.eclipse.cdt.core.dom.ICodeReaderFactory;
>+import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
> import org.eclipse.cdt.core.index.IIndex;
> import org.eclipse.cdt.core.index.IIndexFile;
> import org.eclipse.cdt.core.index.IIndexFileLocation;
>@@ -35,7 +36,6 @@
> import org.eclipse.cdt.core.parser.CodeReader;
> import org.eclipse.cdt.core.parser.ICodeReaderCache;
> import org.eclipse.cdt.core.parser.IMacro;
>-import org.eclipse.cdt.core.parser.IScanner;
> import org.eclipse.cdt.core.parser.ParserUtil;
> import org.eclipse.cdt.internal.core.parser.scanner2.ObjectStyleMacro;
> import org.eclipse.cdt.internal.core.pdom.dom.PDOMMacro;
>@@ -103,7 +103,7 @@
> 		return ParserUtil.createReader(path, null);
> 	}
> 	
>-	public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {
>+	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
> 		// if the file is in the index, we skip it
> 		File location= new File(path);
> 		String canonicalPath= path;
>Index: parser/org/eclipse/cdt/core/parser/IScanner.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IScanner.java,v
>retrieving revision 1.37
>diff -u -r1.37 IScanner.java
>--- parser/org/eclipse/cdt/core/parser/IScanner.java	28 Feb 2007 15:52:22 -0000	1.37
>+++ parser/org/eclipse/cdt/core/parser/IScanner.java	28 Mar 2007 17:08:27 -0000
>@@ -12,6 +12,7 @@
> 
> import java.util.Map;
> 
>+import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
> import org.eclipse.cdt.core.parser.ast.IASTFactory;
> import org.eclipse.cdt.core.parser.util.CharArrayObjectMap;
> import org.eclipse.cdt.internal.core.parser.scanner2.ILocationResolver;
>@@ -20,7 +21,7 @@
>  * @author jcamelon
>  *
>  */
>-public interface IScanner {
>+public interface IScanner extends ICodeReaderFactoryCallback {
> 	
> 	public static final int tPOUNDPOUND = -6;
> 	public static final int tPOUND      = -7;
>Index: parser/org/eclipse/cdt/core/dom/ICodeReaderFactoryCallback.java
>===================================================================
>RCS file: parser/org/eclipse/cdt/core/dom/ICodeReaderFactoryCallback.java
>diff -N parser/org/eclipse/cdt/core/dom/ICodeReaderFactoryCallback.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ parser/org/eclipse/cdt/core/dom/ICodeReaderFactoryCallback.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,23 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ * IBM - Initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.cdt.core.dom;
>+
>+import org.eclipse.cdt.core.parser.IMacro;
>+
>+/**
>+ * Allows an ICodeReaderFactory to retrieve macro definitions from the index, 
>+ * and then add these definitions to the scanner.
>+ *
>+ */
>+public interface ICodeReaderFactoryCallback {
>+	
>+	public void addDefinition(IMacro macro);
>+}

Flags:

cdtdoug: iplog+

Actions: View | Diff

Attachments on bug 179393: 62252