Attachment #62252 for bug #179393

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

View | Details | Raw Unified | Return to bug 179393
Collapse All | Expand All




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;

/**

    }
    
    /* (non-Javadoc)
     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
     */
    public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
		return cache.get(path);
	}





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.

	}

	/*
	 * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
	 */
	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
		return new CodeReader(path, EMPTY_CHARS);
	}





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;

/**

    }

    /* (non-Javadoc)
     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
     */
    public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
		return cache.get(path);
    }
	





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;


	}

    /* (non-Javadoc)
     * @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
     */
    public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
        return cache.get( path );
    }


Lines 12-18 Link Here

(-)parser/org/eclipse/cdt/core/dom/ICodeReaderFactory.java (-2 / +1 lines)
12		12
13	import org.eclipse.cdt.core.parser.CodeReader;	13	import org.eclipse.cdt.core.parser.CodeReader;
14	import org.eclipse.cdt.core.parser.ICodeReaderCache;	14	import org.eclipse.cdt.core.parser.ICodeReaderCache;
15	import org.eclipse.cdt.core.parser.IScanner;
16		15
17	/**	16	/**
18	* This is the interface that an AST Service uses to delegate the construction	17	* This is the interface that an AST Service uses to delegate the construction
Lines 43-49 Link Here
43	* @param path	42	* @param path
44	* @return CodeReader for contents at that path.	43	* @return CodeReader for contents at that path.
45	*/	44	*/
46	public CodeReader createCodeReaderForInclusion(IScanner scanner, String path);	45	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback callback, String path);
47		46
48	/**	47	/**
49	* Returns the ICodeReaderCache used for this ICodeReaderFacotry.	48	* Returns the ICodeReaderCache used for this ICodeReaderFacotry.





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;

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;

		return ParserUtil.createReader(path, null);
	}
	
	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;

Lines 12-17 Link Here

(-)parser/org/eclipse/cdt/core/parser/IScanner.java (-1 / +2 lines)
12		12
13	import java.util.Map;	13	import java.util.Map;
14		14
		15	import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
15	import org.eclipse.cdt.core.parser.ast.IASTFactory;	16	import org.eclipse.cdt.core.parser.ast.IASTFactory;
16	import org.eclipse.cdt.core.parser.util.CharArrayObjectMap;	17	import org.eclipse.cdt.core.parser.util.CharArrayObjectMap;
17	import org.eclipse.cdt.internal.core.parser.scanner2.ILocationResolver;	18	import org.eclipse.cdt.internal.core.parser.scanner2.ILocationResolver;
Lines 20-26 Link Here
20	* @author jcamelon	21	* @author jcamelon
21	*	22	*
22	*/	23	*/
23	public interface IScanner {	24	public interface IScanner extends ICodeReaderFactoryCallback {
24		25
25	public static final int tPOUNDPOUND = -6;	26	public static final int tPOUNDPOUND = -6;
26	public static final int tPOUND = -7;	27	public static final int tPOUND = -7;




/*******************************************************************************
 * 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);
}

Return to bug 179393

Lines 11-20 Link Here

(-)parser/org/eclipse/cdt/internal/core/parser/scanner2/FileCodeReaderFactory.java (-3 / +3 lines)
11	package org.eclipse.cdt.internal.core.parser.scanner2;	11	package org.eclipse.cdt.internal.core.parser.scanner2;
12		12
13	import org.eclipse.cdt.core.dom.ICodeReaderFactory;	13	import org.eclipse.cdt.core.dom.ICodeReaderFactory;
		14	import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
14	import org.eclipse.cdt.core.model.ITranslationUnit;	15	import org.eclipse.cdt.core.model.ITranslationUnit;
15	import org.eclipse.cdt.core.parser.CodeReader;	16	import org.eclipse.cdt.core.parser.CodeReader;
16	import org.eclipse.cdt.core.parser.ICodeReaderCache;	17	import org.eclipse.cdt.core.parser.ICodeReaderCache;
17	import org.eclipse.cdt.core.parser.IScanner;
18	import org.eclipse.cdt.internal.core.dom.parser.EmptyCodeReaderCache;	18	import org.eclipse.cdt.internal.core.dom.parser.EmptyCodeReaderCache;
19		19
20	/**	20	/**
Lines 49-57 Link Here
49	}	49	}
50		50
51	/* (non-Javadoc)	51	/* (non-Javadoc)
52	* @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String)	52	* @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
53	*/	53	*/
54	public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {	54	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
55	return cache.get(path);	55	return cache.get(path);
56	}	56	}
57		57

Lines 11-19 Link Here

(-)src/org/eclipse/cdt/internal/core/dom/NullCodeReaderFactory.java (-3 / +3 lines)
11	package org.eclipse.cdt.internal.core.dom;	11	package org.eclipse.cdt.internal.core.dom;
12		12
13	import org.eclipse.cdt.core.dom.ICodeReaderFactory;	13	import org.eclipse.cdt.core.dom.ICodeReaderFactory;
		14	import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
14	import org.eclipse.cdt.core.parser.CodeReader;	15	import org.eclipse.cdt.core.parser.CodeReader;
15	import org.eclipse.cdt.core.parser.ICodeReaderCache;	16	import org.eclipse.cdt.core.parser.ICodeReaderCache;
16	import org.eclipse.cdt.core.parser.IScanner;
17		17
18	/**	18	/**
19	* A <code>ICodeReaderFactory</code> which creates dummy <code>CodeReader</code>s without content.	19	* A <code>ICodeReaderFactory</code> which creates dummy <code>CodeReader</code>s without content.
Lines 34-42 Link Here
34	}	34	}
35		35
36	/*	36	/*
37	* @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.parser.IScanner, java.lang.String)	37	* @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
38	*/	38	*/
39	public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {	39	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
40	return new CodeReader(path, EMPTY_CHARS);	40	return new CodeReader(path, EMPTY_CHARS);
41	}	41	}
42		42

Lines 13-23 Link Here

(-)src/org/eclipse/cdt/internal/core/dom/SavedCodeReaderFactory.java (-3 / +3 lines)
13	import org.eclipse.cdt.core.CCorePlugin;	13	import org.eclipse.cdt.core.CCorePlugin;
14	import org.eclipse.cdt.core.dom.CDOM;	14	import org.eclipse.cdt.core.dom.CDOM;
15	import org.eclipse.cdt.core.dom.ICodeReaderFactory;	15	import org.eclipse.cdt.core.dom.ICodeReaderFactory;
		16	import org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback;
16	import org.eclipse.cdt.core.model.ITranslationUnit;	17	import org.eclipse.cdt.core.model.ITranslationUnit;
17	import org.eclipse.cdt.core.parser.CodeReader;	18	import org.eclipse.cdt.core.parser.CodeReader;
18	import org.eclipse.cdt.core.parser.CodeReaderCache;	19	import org.eclipse.cdt.core.parser.CodeReaderCache;
19	import org.eclipse.cdt.core.parser.ICodeReaderCache;	20	import org.eclipse.cdt.core.parser.ICodeReaderCache;
20	import org.eclipse.cdt.core.parser.IScanner;
21	import org.eclipse.core.runtime.Preferences;	21	import org.eclipse.core.runtime.Preferences;
22		22
23	/**	23	/**
Lines 84-92 Link Here
84	}	84	}
85		85
86	/* (non-Javadoc)	86	/* (non-Javadoc)
87	* @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(java.lang.String)	87	* @see org.eclipse.cdt.core.dom.ICodeReaderFactory#createCodeReaderForInclusion(org.eclipse.cdt.core.dom.ICodeReaderFactoryCallback, java.lang.String)
88	*/	88	*/
89	public CodeReader createCodeReaderForInclusion(IScanner scanner, String path) {	89	public CodeReader createCodeReaderForInclusion(ICodeReaderFactoryCallback scanner, String path) {
90	return cache.get(path);	90	return cache.get(path);
91	}	91	}
92		92

Added Link Here

(-)parser/org/eclipse/cdt/core/dom/ICodeReaderFactoryCallback.java (+23 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM - Initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.cdt.core.dom;
12
13	import org.eclipse.cdt.core.parser.IMacro;
14
15	/**
16	* Allows an ICodeReaderFactory to retrieve macro definitions from the index,
17	* and then add these definitions to the scanner.
18	*
19	*/
20	public interface ICodeReaderFactoryCallback {
21
22	public void addDefinition(IMacro macro);
23	}