Merge remote-tracking branch 'cdt/master' into sd90

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/language/settings/providers/AbstractBuiltinSpecsDetector.java

@@ -596,7 +596,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
 		// with UTF-8 encoding since GNU compilers can handle only UTF-8 characters.
 		// Include paths with locale characters will be handled properly regardless
 		// of the language as long as the encoding is set to UTF-8.
-		// Default language is set for parser because it relies on English messages
+		// English language is set for parser because it relies on English messages
 		// in the output of the 'gcc -v' command.
 
 		List<String> envp = new ArrayList<String>(Arrays.asList(BuildRunnerHelper.getEnvp(currentCfgDescription)));
@@ -606,7 +606,7 @@ public abstract class AbstractBuiltinSpecsDetector extends AbstractLanguageSetti
 				iterator.remove();
 			}
 		}
-		envp.add(ENV_LANGUAGE + "=C");        // override for GNU gettext //$NON-NLS-1$
+		envp.add(ENV_LANGUAGE + "=en");    // override for GNU gettext //$NON-NLS-1$
 		envp.add(ENV_LC_ALL + "=C.UTF-8"); // for other parts of the system libraries //$NON-NLS-1$
 
 		return envp.toArray(new String[envp.size()]);

core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/errorparsers/tests/ErrorParserFileMatchingTest.java

@@ -1206,7 +1206,7 @@ public class ErrorParserFileMatchingTest extends TestCase {
 	}
 
 	/**
-	 * Checks if output of '-n'/'--just-print' or '-w'/'--print-directory' options of make can be recognized.
+	 * Checks if output of -w or --print-directory options of make can be recognized.
 	 *
 	 * @throws Exception...
 	 */

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2BaseTest.java

@@ -10,6 +10,7 @@
  *     Markus Schorn (Wind River Systems)
  *     Andrew Ferguson (Symbian)
  *     Mike Kucera (IBM)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.tests.ast2;
 
@@ -376,9 +377,10 @@ public class AST2BaseTest extends BaseTestCase {
 
     protected void assertInstances(CPPNameCollector collector, IBinding binding, int num) throws Exception {
         int count = 0;
-        for (int i = 0; i < collector.size(); i++)
+        for (int i = 0; i < collector.size(); i++) {
             if (collector.getName(i).resolveBinding() == binding)
                 count++;
+        }
         
         assertEquals(num, count);
     }
@@ -627,6 +629,23 @@ public class AST2BaseTest extends BaseTestCase {
     		return selector.findImplicitName(offset, len);
     	}
 
+    	public <T extends IASTNode> T assertNode(String context, String nodeText, Class<T> type, Class... cs) {
+    		if (context == null) {
+    			context = contents;
+    		}
+    		int offset = contents.indexOf(context);
+    		assertTrue("Context \"" + context + "\" not found", offset >= 0);
+    		int nodeOffset = context.indexOf(nodeText);
+    		assertTrue("Node \"" + nodeText + "\" not found", nodeOffset >= 0);
+    		IASTNodeSelector selector = tu.getNodeSelector(null);
+    		IASTNode node = selector.findNode(offset + nodeOffset, nodeText.length());
+    		return assertType(node, type, cs);
+    	}
+
+    	public <T extends IASTNode> T assertNode(String nodeText, Class<T> type, Class... cs) {
+    		return assertNode(contents, nodeText, type, cs);
+    	}
+
     	private String renderProblemID(int i) {
     		try {
     			for (Field field : IProblemBinding.class.getDeclaredFields()) {
@@ -651,17 +670,31 @@ public class AST2BaseTest extends BaseTestCase {
     		IBinding binding= binding(section, len);
     		assertTrue("ProblemBinding for name: " + section.substring(0, len),
     				!(binding instanceof IProblemBinding));
-    		assertInstance(binding, type);
+    		return assertType(binding, type, cs);
-    		for (Class c : cs) {
-    			assertInstance(binding, c);
     	}
-    		return type.cast(binding);
+
+    	public <T extends IBinding> T assertNonProblem(String section, Class<T> type, Class... cs) {
+    		return assertNonProblem(section, section.length(), type, cs);
+    	}
+
+    	public <T extends IBinding> T assertNonProblem(String context, String name, Class<T> type, Class... cs) {
+    		IBinding binding= binding(context, name);
+    		assertTrue("ProblemBinding for name: " + name, !(binding instanceof IProblemBinding));
+    		return assertType(binding, type, cs);
+    	}
+
+		public <T, U extends T> U assertType(T obj, Class<U> type, Class... cs) {
+			assertInstance(obj, type);
+    		for (Class c : cs) {
+    			assertInstance(obj, c);
+    		}
+    		return type.cast(obj);
 		}
 
     	private IBinding binding(String section, int len) {
     		IASTName name = findName(section, len);
     		final String selection = section.substring(0, len);
-			assertNotNull("did not find \""+selection+"\"", name);
+			assertNotNull("Did not find \"" + selection + "\"", name);
     		assertEquals(selection, name.getRawSignature());
     			
     		IBinding binding = name.resolveBinding();
@@ -669,6 +702,16 @@ public class AST2BaseTest extends BaseTestCase {
     		
     		return name.resolveBinding();
     	}
+
+    	private IBinding binding(String context, String name) {
+    		IASTName astName = findName(context, name);
+    		assertEquals(name, astName.getRawSignature());
+    			
+    		IBinding binding = astName.resolveBinding();
+    		assertNotNull("No binding for " + astName.getRawSignature(), binding);
+    		
+    		return astName.resolveBinding();
+    	}
 	}
 
 	final protected IASTTranslationUnit parseAndCheckBindings(String code, ParserLanguage lang) throws Exception {

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPTests.java

@@ -4705,6 +4705,33 @@ public class AST2CPPTests extends AST2BaseTest {
 		assertSame(i, col.getName(7).resolveBinding());
 	}
 
+	//	template<typename T>
+	//	class basic_string {
+	//	  basic_string& operator+=(const T* s);
+	//	};
+	//
+	//	template<typename T>
+	//	basic_string<T> operator+(const T* cs, const basic_string<T>& s);
+	//
+	//	template<typename T>
+	//	basic_string<T> operator+(const basic_string<T>& s, const T* cs);
+	//
+	//	typedef basic_string<char> string;
+	//
+	//	void test(const string& s) {
+	//	  auto s1 = "" + s + "";
+	//	  auto s2 = s1 += "";
+	//	}
+    public void testTypedefPreservation_380498() throws Exception {
+		BindingAssertionHelper ba= getAssertionHelper();
+		ICPPVariable s1 = ba.assertNonProblem("s1", ICPPVariable.class);
+		assertTrue(s1.getType() instanceof ITypedef);
+		assertEquals("string", ((ITypedef) s1.getType()).getName());
+		ICPPVariable s2 = ba.assertNonProblem("s2", ICPPVariable.class);
+		assertTrue(s2.getType() instanceof ITypedef);
+		assertEquals("string", ((ITypedef) s2.getType()).getName());
+	}
+
 	// int f() {
 	//     return 5;
 	// }

core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java

@@ -9,6 +9,7 @@
  *     Doug Schaefer (IBM) - Initial API and implementation
  *     Markus Schorn (Wind River Systems)
  *     Andrew Ferguson (Symbian)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.tests.ast2;
 
@@ -127,7 +128,6 @@ import org.eclipse.cdt.internal.core.parser.ParserException;
  * Testcases on the AST.
  */
 public class AST2Tests extends AST2BaseTest {
-	
 	private static final int NUM_TESTS = 3;
 
 	public static TestSuite suite() {
@@ -2229,18 +2229,12 @@ public class AST2Tests extends AST2BaseTest {
 
 		assertTrue(tu.isFrozen());
 		for (int i = 0; i < NUM_TESTS; i++) {
-			IASTFunctionDefinition def1 = (IASTFunctionDefinition) tu
+			IASTFunctionDefinition def1 = (IASTFunctionDefinition) tu.getDeclarations()[0];
-			.getDeclarations()[0];
+			IFunction f = (IFunction) def1.getDeclarator().getName().resolveBinding();
-			IFunction f = (IFunction) def1.getDeclarator().getName()
+			IASTFunctionDefinition def2 = (IASTFunctionDefinition) tu.getDeclarations()[1];
-			.resolveBinding();
+			IFunction f2 = (IFunction) def2.getDeclarator().getName().resolveBinding();
-			IASTFunctionDefinition def2 = (IASTFunctionDefinition) tu
+			IASTFunctionDefinition def3 = (IASTFunctionDefinition) tu.getDeclarations()[2];
-			.getDeclarations()[1];
+			IFunction f3 = (IFunction) def3.getDeclarator().getName().resolveBinding();
-			IFunction f2 = (IFunction) def2.getDeclarator().getName()
-			.resolveBinding();
-			IASTFunctionDefinition def3 = (IASTFunctionDefinition) tu
-			.getDeclarations()[2];
-			IFunction f3 = (IFunction) def3.getDeclarator().getName()
-			.resolveBinding();
 
 			IFunctionType ft = f.getType();
 			IFunctionType ft2 = f2.getType();
@@ -2251,17 +2245,15 @@ public class AST2Tests extends AST2BaseTest {
 			assertTrue(((IPointerType) ft2.getReturnType()).getType() instanceof IBasicType);
 			assertTrue(ft3.getReturnType() instanceof IPointerType);
 			assertTrue(((IPointerType) ft3.getReturnType()).getType() instanceof IFunctionType);
-			assertTrue(((IFunctionType) ((IPointerType) ft3.getReturnType())
+			assertTrue(((IFunctionType) ((IPointerType) ft3.getReturnType()).getType()).getReturnType()
-					.getType()).getReturnType() instanceof IBasicType);
+					instanceof IBasicType);
 
 			// test tu.getDeclarationsInAST(IBinding)
-			IASTName[] decls = tu.getDeclarationsInAST(def1.getDeclarator().getName()
+			IASTName[] decls = tu.getDeclarationsInAST(def1.getDeclarator().getName().resolveBinding());
-					.resolveBinding());
 			assertEquals(decls.length, 1);
 			assertEquals(decls[0], def1.getDeclarator().getName());
 
-			decls = tu.getDeclarationsInAST(def2.getDeclarator().getName()
+			decls = tu.getDeclarationsInAST(def2.getDeclarator().getName().resolveBinding());
-					.resolveBinding());
 			assertEquals(decls.length, 1);
 			assertEquals(decls[0], def2.getDeclarator().getName());
 
@@ -2276,8 +2268,7 @@ public class AST2Tests extends AST2BaseTest {
 	// any parameter to type function returning T is adjusted to be pointer to
 	// function returning T
 	public void testParmToFunction() throws Exception {
-		IASTTranslationUnit tu = parse(
+		IASTTranslationUnit tu = parse("int f(int g(void)) { return g();}", ParserLanguage.C);
-				"int f(int g(void)) { return g();}", ParserLanguage.C); //$NON-NLS-1$
 		assertTrue(tu.isFrozen());
 		for (int i = 0; i < NUM_TESTS; i++) {
 			IASTFunctionDefinition def = (IASTFunctionDefinition) tu.getDeclarations()[0];
@@ -2300,7 +2291,8 @@ public class AST2Tests extends AST2BaseTest {
 			assertTrue(def.getDeclarator() instanceof IASTStandardFunctionDeclarator);
 			IASTName name_g = ((IASTStandardFunctionDeclarator) def.getDeclarator())
 					.getParameters()[0].getDeclarator().getName();
-			IASTName name_g_call = ((IASTIdExpression) ((IASTFunctionCallExpression) ((IASTReturnStatement) ((IASTCompoundStatement) def
+			IASTName name_g_call =
+					((IASTIdExpression) ((IASTFunctionCallExpression) ((IASTReturnStatement) ((IASTCompoundStatement) def
 					.getBody()).getStatements()[0]).getReturnValue())
 					.getFunctionNameExpression()).getName();
 			IASTName[] decls = tu.getDeclarationsInAST(name_g_call.resolveBinding());
@@ -2312,15 +2304,13 @@ public class AST2Tests extends AST2BaseTest {
 	}
 
 	public void testArrayPointerFunction() throws Exception {
-		IASTTranslationUnit tu = parse(
+		IASTTranslationUnit tu = parse("int (*v[])(int *x, int *y);", ParserLanguage.C);
-				"int (*v[])(int *x, int *y);", ParserLanguage.C); //$NON-NLS-1$
 
 		assertTrue(tu.isFrozen());
 		for (int i = 0; i < NUM_TESTS; i++) {
 			IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
-			IVariable v = (IVariable) ((IASTStandardFunctionDeclarator) decl
+			IVariable v = (IVariable) ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0])
-					.getDeclarators()[0]).getNestedDeclarator().getName()
+					.getNestedDeclarator().getName().resolveBinding();
-					.resolveBinding();
 
 			IType vt_1 = v.getType();
 			assertTrue(vt_1 instanceof IArrayType);
@@ -2348,8 +2338,8 @@ public class AST2Tests extends AST2BaseTest {
 					.getDeclarators()[0]).getNestedDeclarator().getName()
 					.resolveBinding());
 			assertEquals(decls.length, 1);
-			assertEquals(decls[0], ((IASTStandardFunctionDeclarator) decl
+			assertEquals(decls[0], ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0])
-					.getDeclarators()[0]).getNestedDeclarator().getName());
+					.getNestedDeclarator().getName());
 
 			tu = validateCopy(tu);
 		}
@@ -2396,8 +2386,8 @@ public class AST2Tests extends AST2BaseTest {
 			assertEquals(decls.length, 1);
 			assertEquals(decls[0], name_DWORD);
 
-			decls = tu.getDeclarationsInAST(((IASTNamedTypeSpecifier) decl2
+			decls = tu.getDeclarationsInAST(((IASTNamedTypeSpecifier) decl2.getDeclSpecifier())
-					.getDeclSpecifier()).getName().resolveBinding());
+					.getName().resolveBinding());
 			assertEquals(decls.length, 1);
 			assertEquals(decls[0], name_DWORD);
 
@@ -6092,6 +6082,29 @@ public class AST2Tests extends AST2BaseTest {
 		}
 	}
 
+	//	typedef long unsigned int size_t;
+	//	
+    //	size_t a = 0;
+    //	size_t x = a + 5;
+    //	size_t y = 2 + a;
+    //	size_t y = a * 2;
+    public void testTypeOfExpressionWithTypedef_380498() throws Exception {
+    	final boolean[] isCpps= { false, true };
+    	String code= getAboveComment();
+    	for (boolean isCpp : isCpps) {
+    		BindingAssertionHelper ba= new BindingAssertionHelper(code, isCpp);
+    		IASTExpression exp = ba.assertNode("a + 5", IASTExpression.class);
+    		assertTrue(exp.getExpressionType() instanceof ITypedef);
+    		assertEquals("size_t", ((ITypedef) exp.getExpressionType()).getName());
+    		exp = ba.assertNode("2 + a", IASTExpression.class);
+    		assertTrue(exp.getExpressionType() instanceof ITypedef);
+    		assertEquals("size_t", ((ITypedef) exp.getExpressionType()).getName());
+    		exp = ba.assertNode("a * 2", IASTExpression.class);
+    		assertTrue(exp.getExpressionType() instanceof ITypedef);
+    		assertEquals("size_t", ((ITypedef) exp.getExpressionType()).getName());
+    	}
+	}
+
     // typedef int TInt;
     // int a= TInt; //ref
     public void testTypeAsExpressionIsProblem_261175() throws Exception {
@@ -7347,7 +7360,6 @@ public class AST2Tests extends AST2BaseTest {
 		assertFalse(((IASTPreprocessorIfdefStatement) stmts[1]).taken());
 	}
 
-	
 	//	void a() {
 	//	    typedef float size_t;
 	//	    sizeof(10); // wrong - getExpressionType returns float

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/extension/CLanguageData.java

@@ -13,8 +13,8 @@ package org.eclipse.cdt.core.settings.model.extension;
 import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry;
 
 public abstract class CLanguageData extends CDataObject {
-	protected CLanguageData() {
 
+	protected CLanguageData() {
 	}
 
 //	public abstract CDataObject[] getChildrenOfKind(int kind);

core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CProjectDescription.java

@@ -328,7 +328,6 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 	 * This occurs during the SetCProjectDescription Operation
 	 */
 	void switchToCachedConfigurationDescriptions() throws CoreException {
-
 		for (Map.Entry<String, ICConfigurationDescription> e : fCfgMap.entrySet()) {
 			if (e.getValue() instanceof CConfigurationDescription) {
 				CConfigurationDescription cfgDes = (CConfigurationDescription) e.getValue();
@@ -401,7 +400,6 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 		if (cfgDes != null) {
 			cfgDes.removeConfiguration();
 		}
-
 	}
 
 	void configurationRemoved(CConfigurationDescription des) {
@@ -432,7 +430,6 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 
 		if (getConfigurationRelations() == CONFIGS_LINK_SETTINGS_AND_ACTIVE)
 			fSettingCfgInfo.setConfiguration(cfg);
-
 	}
 
 	@Override
@@ -559,9 +556,10 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 		if (fStorage.isModified())
 			return true;
 
-		for(ICConfigurationDescription cfgDes : fCfgMap.values())
+		for (ICConfigurationDescription cfgDes : fCfgMap.values()) {
 			if (cfgDes.isModified())
 				return true;
+		}
 
 		return false;
 	}
@@ -641,10 +639,11 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 
 	@Override
 	public void setSessionProperty(QualifiedName name, Object value) {
-		if(value != null)
+		if (value != null) {
 			fPropertiesMap.put(name, value);
-		else
+		} else {
 			fPropertiesMap.remove(name);
+		}
 
 		fIsModified = true;
 	}
@@ -735,6 +734,4 @@ public class CProjectDescription implements ICProjectDescription, ICDataProxyCon
 
 		fIsModified = true;
 	}
-
-
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java

@@ -45,8 +45,8 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil;
 
 /**
- * This is a utility class to help convert AST elements to Strings corresponding to the
+ * This is a utility class to help convert AST elements to Strings corresponding to
- * AST element's type.
+ * the AST element's type.
  * 
  * @noextend This class is not intended to be subclassed by clients.
  * @noinstantiate This class is not intended to be instantiated by clients.
@@ -58,9 +58,9 @@ public class ASTTypeUtil {
 	private static final int DEAULT_ITYPE_SIZE = 2;
 
 	/**
-	 * Returns a string representation for the parameters of the given function type. The 
+	 * Returns a string representation for the parameters of the given function type. 
-	 * representation contains the comma-separated list of the normalized parameter type
+	 * The representation contains the comma-separated list of the normalized parameter
-	 * representations wrapped in parentheses. 
+	 * type representations wrapped in parentheses. 
 	 */
 	public static String getParameterTypeString(IFunctionType type) {
 		StringBuilder result = new StringBuilder();
@@ -599,12 +599,13 @@ public class ASTTypeUtil {
 	 *  
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
-	public static String getType(IASTDeclarator decltor) {
+	public static String getType(IASTDeclarator declarator) {
 		// get the most nested declarator
-		while (decltor.getNestedDeclarator() != null)
+		while (declarator.getNestedDeclarator() != null) {
-			decltor = decltor.getNestedDeclarator();
+			declarator = declarator.getNestedDeclarator();
+		}
 		
-		IBinding binding = decltor.getName().resolveBinding();
+		IBinding binding = declarator.getName().resolveBinding();
 		IType type = null;
 		
 		try {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNodeSelector.java

@@ -20,7 +20,6 @@ package org.eclipse.cdt.core.dom.ast;
  * @since 5.0
  */
 public interface IASTNodeSelector {
-
 	/**
 	 * Returns the name for the exact given range, or <code>null</code> if there is no such node.
      * Will not return an implicit name.

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java

@@ -21,15 +21,15 @@ public interface IASTTypeId extends IASTNode {
 	public static final IASTTypeId[] EMPTY_TYPEID_ARRAY = new IASTTypeId[0];
 
 	/**
-	 * <code>DECL_SPECIFIER</code> represents the relationship between an <code>IASTTypeId</code> and
+	 * <code>DECL_SPECIFIER</code> represents the relationship between an <code>IASTTypeId</code>
-	 * it's nested <code>IASTDeclSpecifier</code>.
+	 * and it's nested <code>IASTDeclSpecifier</code>.
 	 */
 	public static final ASTNodeProperty DECL_SPECIFIER = new ASTNodeProperty(
 			"IASTTypeId.DECL_SPECIFIER - IASTDeclSpecifier for IASTTypeId"); //$NON-NLS-1$
 
 	/**
-	 * <code>ABSTRACT_DECLARATOR</code> represents the relationship between an <code>IASTTypeId</code> and
+	 * <code>ABSTRACT_DECLARATOR</code> represents the relationship between an <code>IASTTypeId</code>
-	 * it's nested <code>IASTDeclarator</code>.
+	 * and it's nested <code>IASTDeclarator</code>.
 	 */
 	public static final ASTNodeProperty ABSTRACT_DECLARATOR = new ASTNodeProperty(
 			"IASTTypeId.ABSTRACT_DECLARATOR - IASTDeclarator for IASTTypeId"); //$NON-NLS-1$

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IProblemType.java

@@ -22,5 +22,4 @@ package org.eclipse.cdt.core.dom.ast;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IProblemType extends IType, ISemanticProblem {
-
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IType.java

@@ -22,7 +22,7 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IType extends Cloneable {
-	public static final IType[] EMPTY_TYPE_ARRAY = new IType[0];
+	public static final IType[] EMPTY_TYPE_ARRAY = {};
 	public static final ASTTypeMatcher TYPE_MATCHER = new ASTTypeMatcher();
 
     public Object clone();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ITypedef.java

@@ -15,7 +15,6 @@ package org.eclipse.cdt.core.dom.ast;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ITypedef extends IBinding, IType {
-
 	/**
 	 * Returns the type that this thing is a typedef of
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPPointerToMemberType.java

@@ -19,9 +19,8 @@ import org.eclipse.cdt.core.dom.ast.IType;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ICPPPointerToMemberType extends IPointerType {
-
 	/**
-	 * Get the class to whose members this points to.
+	 * Returns the class to whose members this points to.
 	 * @return Either ICPPClassType or ICPPTeplateTypeParameter.
 	 */
 	public IType getMemberOfClass();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ArithmeticConversion.java

@@ -190,7 +190,8 @@ public abstract class ArithmeticConversion {
 			return signedType;
 		}
 		
-		return createBasicType(signedType.getKind(), changeModifier(signedType.getModifiers(), IBasicType.IS_SIGNED, IBasicType.IS_UNSIGNED));
+		return createBasicType(signedType.getKind(),
+				changeModifier(signedType.getModifiers(), IBasicType.IS_SIGNED, IBasicType.IS_UNSIGNED));
 	}
 	
 	private IBasicType promote(IType type, Domain domain) {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java

@@ -9,9 +9,12 @@
  *     John Camelon (IBM Rational Software) - Initial API and implementation
  *     Yuan Zhang / Beth Tibbitts (IBM Research)
  *     Markus Schorn (Wind River Systems)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.c;
 
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.restoreTypedefs;
+
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
 import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
 import org.eclipse.cdt.core.dom.ast.IASTExpression;
@@ -54,11 +57,7 @@ public class CASTBinaryExpression extends ASTNode
 		copy.op = op;
 		copy.setOperand1(operand1 == null ? null : operand1.copy(style));
 		copy.setOperand2(operand2 == null ? null : operand2.copy(style));
-		copy.setOffsetAndLength(this);
+		return copy(copy, style);
-		if (style == CopyStyle.withLocations) {
-			copy.setCopyLocation(this);
-		}
-		return copy;
 	}
 
 	@Override
@@ -211,11 +210,13 @@ public class CASTBinaryExpression extends ASTNode
     @Override
 	public IType getExpressionType() {
         final int op = getOperator();
-        final IType t1= CVisitor.unwrapTypedefs(getOperand1().getExpressionType());
+        IType originalType1 = getOperand1().getExpressionType();
-    	final IType t2= CVisitor.unwrapTypedefs(getOperand2().getExpressionType());
+    	IType originalType2 = getOperand2().getExpressionType();
-    	IType type= CArithmeticConversion.convertCOperandTypes(op, t1, t2);
+		final IType type1= CVisitor.unwrapTypedefs(originalType1);
+		final IType type2= CVisitor.unwrapTypedefs(originalType2);
+    	IType type= CArithmeticConversion.convertCOperandTypes(op, type1, type2);
     	if (type != null) {
-    		return type;
+    		return restoreTypedefs(type, originalType1, originalType2);
     	}
 
 		switch (op) {
@@ -230,25 +231,25 @@ public class CASTBinaryExpression extends ASTNode
 			return new CBasicType(Kind.eInt, 0, this);
 
         case IASTBinaryExpression.op_plus:
-        	if (t1 instanceof IArrayType) {
+        	if (type1 instanceof IArrayType) {
-        		return arrayTypeToPointerType((ICArrayType) t1);
+        		return arrayTypeToPointerType((ICArrayType) type1);
-        	} else if (t2 instanceof IPointerType) {
+        	} else if (type2 instanceof IPointerType) {
-        		return t2;
+        		return restoreTypedefs(type2, originalType2);
-        	} else if (t2 instanceof IArrayType) {
+        	} else if (type2 instanceof IArrayType) {
-        		return arrayTypeToPointerType((ICArrayType) t2);
+        		return arrayTypeToPointerType((ICArrayType) type2);
         	}
         	break;
 
 		case IASTBinaryExpression.op_minus:
-			if (t2 instanceof IPointerType || t2 instanceof IArrayType) {
+			if (type2 instanceof IPointerType || type2 instanceof IArrayType) {
-				if (t1 instanceof IPointerType || t1 instanceof IArrayType) {
+				if (type1 instanceof IPointerType || type1 instanceof IArrayType) {
 	    			return CVisitor.getPtrDiffType(this);
 				}
-				return t1;
+        		return restoreTypedefs(type1, originalType1);
 			}
 			break;
 		}
-		return t1;
+		return restoreTypedefs(type1, originalType1);
     }
 
 	private IType arrayTypeToPointerType(ICArrayType type) {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java

@@ -9,9 +9,12 @@
  *     John Camelon (IBM Rational Software) - Initial API and implementation
  *     Yuan Zhang / Beth Tibbitts (IBM Research)
  *     Markus Schorn (Wind River Systems)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.c;
 
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.restoreTypedefs;
+
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
 import org.eclipse.cdt.core.dom.ast.IASTExpression;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
@@ -30,7 +33,6 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
     private int operator;
     private IASTExpression operand;
     
-    
     public CASTUnaryExpression() {
 	}
 
@@ -46,13 +48,9 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
 	
 	@Override
 	public CASTUnaryExpression copy(CopyStyle style) {
-		CASTUnaryExpression copy = new CASTUnaryExpression(operator, operand == null ? null
+		CASTUnaryExpression copy =
-				: operand.copy(style));
+				new CASTUnaryExpression(operator, operand == null ? null : operand.copy(style));
-		copy.setOffsetAndLength(this);
+		return copy(copy, style);
-		if (style == CopyStyle.withLocations) {
-			copy.setCopyLocation(this);
-		}
-		return copy;
 	}
 
 	@Override
@@ -91,7 +89,7 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
 	        }
 		}
       
-        if( operand != null ) if( !operand.accept( action ) ) return false;
+        if (operand != null && !operand.accept(action)) return false;
 
         if (action.shouldVisitExpressions) {
 		    switch (action.leave(this)) {
@@ -105,8 +103,7 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
     
     @Override
 	public void replace(IASTNode child, IASTNode other) {
-        if( child == operand )
+        if (child == operand) {
-        {
             other.setPropertyInParent(child.getPropertyInParent());
             other.setParent(child.getParent());
             operand = (IASTExpression) other;
@@ -128,17 +125,17 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
 			}
 			break;
 		case op_amper:
-			return new CPointerType(type, 0);
+			return new CPointerType(exprType, 0);
 		case op_minus:
 		case op_plus:
 		case op_tilde:
 			IType t= CArithmeticConversion.promoteCType(type);
 			if (t != null) {
-				return t;
+				return restoreTypedefs(t, exprType);
 			}
 			break;
 		}
-		return exprType; // return the original
+		return exprType; // Return the original.
 	}
 
 	@Override

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java

@@ -9,12 +9,17 @@
  *     John Camelon (IBM) - Initial API and implementation
  *     Mike Kucera (IBM)
  *     Markus Schorn (Wind River Systems)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
 import static org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory.LVALUE;
 import static org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory.PRVALUE;
-import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.*;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.glvalueType;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.prvalueType;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.restoreTypedefs;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.typeFromFunctionCall;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.valueCategoryFromFunctionCall;
 
 import org.eclipse.cdt.core.dom.ast.ASTVisitor;
 import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
@@ -37,14 +42,13 @@ import org.eclipse.cdt.internal.core.dom.parser.ProblemType;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPSemantics;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
 
-
 public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpression, IASTAmbiguityParent {
 	private int op;
     private IASTExpression operand1;
     private IASTInitializerClause operand2;
     private IType type;
     private ICPPFunction overload= UNINITIALIZED_FUNCTION;
-    private IASTImplicitName[] implicitNames = null;
+    private IASTImplicitName[] implicitNames;
 
     public CPPASTBinaryExpression() {
 	}
@@ -66,11 +70,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		copy.op = op;
 		copy.setOperand1(operand1 == null ? null : operand1.copy(style));
 		copy.setInitOperand2(operand2 == null ? null : operand2.copy(style));
-		copy.setOffsetAndLength(this);
+		return copy(copy, style);
-		if (style == CopyStyle.withLocations) {
-			copy.setCopyLocation(this);
-		}
-		return copy;
 	}
 
 	@Override
@@ -314,21 +314,26 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 	}
 	
 	private IType createExpressionType() {
+		IType originalType1 = operand1.getExpressionType();
+		IType originalType2 = operand2 instanceof IASTExpression ?
+				((IASTExpression) operand2).getExpressionType() : null;
+
 		// Check for overloaded operator.
 		ICPPFunction o= getOverload();
 		if (o != null) {
-			return typeFromFunctionCall(o);
+			IType type = typeFromFunctionCall(o);
+    		return restoreTypedefs(type, originalType1, originalType2);
 		}
 		
         final int op = getOperator();
-		IType type1 = prvalueType(operand1.getExpressionType());
+		IType type1 = prvalueType(originalType1);
 		if (type1 instanceof ISemanticProblem) {
 			return type1;
 		}
 
 		IType type2 = null;
-		if (operand2 instanceof IASTExpression) {
+		if (originalType2 != null) {
-			type2= prvalueType(((IASTExpression) operand2).getExpressionType());
+			type2= prvalueType(originalType2);
 			if (type2 instanceof ISemanticProblem) {
 				return type2;
 			}
@@ -336,7 +341,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		
     	IType type= CPPArithmeticConversion.convertCppOperandTypes(op, type1, type2);
     	if (type != null) {
-    		return type;
+    		return restoreTypedefs(type, originalType1, originalType2);
     	}
 
         switch (op) {
@@ -352,10 +357,10 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 
         case IASTBinaryExpression.op_plus:
         	if (type1 instanceof IPointerType) {
-        		return type1;
+        		return restoreTypedefs(type1, originalType1);
         	} 
         	if (type2 instanceof IPointerType) {
-        		return type2;
+        		return restoreTypedefs(type2, originalType2);
         	} 
         	break;
 
@@ -364,7 +369,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
             	if (type2 instanceof IPointerType) {
             		return CPPVisitor.getPointerDiffType(this);
         		}
-        		return type1;
+        		return restoreTypedefs(type1, originalType1);
         	}
         	break;
 
@@ -381,6 +386,6 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
         	}
     		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
         }
-        return type1;
+		return restoreTypedefs(type1, originalType1);
 	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeId.java

@@ -43,12 +43,8 @@ public class CPPASTTypeId extends ASTNode implements ICPPASTTypeId {
 		CPPASTTypeId copy = new CPPASTTypeId();
 		copy.setDeclSpecifier(declSpec == null ? null : declSpec.copy(style));
 		copy.setAbstractDeclarator(absDecl == null ? null : absDecl.copy(style));
-		copy.setOffsetAndLength(this);
 		copy.isPackExpansion = isPackExpansion;
-		if (style == CopyStyle.withLocations) {
+		return copy(copy, style);
-			copy.setCopyLocation(this);
-		}
-		return copy;
 	}
 
 	@Override

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java

@@ -72,13 +72,9 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 	
 	@Override
 	public CPPASTUnaryExpression copy(CopyStyle style) {
-		CPPASTUnaryExpression copy = new CPPASTUnaryExpression(op, operand == null ? null
+		CPPASTUnaryExpression copy =
-				: operand.copy(style));
+				new CPPASTUnaryExpression(op, operand == null ? null : operand.copy(style));
-		copy.setOffsetAndLength(this);
+		return copy(copy, style);
-		if (style == CopyStyle.withLocations) {
-			copy.setCopyLocation(this);
-		}
-		return copy;
 	}
 
 	@Override

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArithmeticConversion.java

@@ -11,8 +11,8 @@
 package org.eclipse.cdt.internal.core.dom.parser.cpp;
 
 import org.eclipse.cdt.core.dom.ast.IBasicType;
-import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.IBasicType.Kind;
+import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.internal.core.dom.parser.ArithmeticConversion;
 
 public class CPPArithmeticConversion extends ArithmeticConversion {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitTypedef.java

@@ -23,9 +23,9 @@ import org.eclipse.cdt.core.dom.ast.ITypedef;
  * An example is the GCC built-in typedef:  typedef char * __builtin_va_list;
  */
 public class CPPImplicitTypedef extends CPPTypedef {
-    private IType type=null;
+    private IType type;
-    private char[] name=null;
+    private char[] name;
-    private IScope scope=null;
+    private IScope scope;
     
     public CPPImplicitTypedef(IType type, char[] name, IScope scope) {
         super(null);
@@ -135,5 +135,4 @@ public class CPPImplicitTypedef extends CPPTypedef {
 	public boolean isGloballyQualified() {
         return true;
     }
-    
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java

@@ -38,20 +38,20 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
 import org.eclipse.core.runtime.PlatformObject;
 
 /**
- * Binding for a c++ function parameter
+ * Binding for a c++ function parameter.
  */
 public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPInternalBinding, ICPPTwoPhaseBinding {
+
     public static class CPPParameterProblem extends ProblemBinding implements ICPPParameter {
         public CPPParameterProblem(IASTNode node, int id, char[] arg) {
             super(node, id, arg);
         }
     }
 
-	private IType fType = null;
+	private IType fType;
-	private IASTName[] fDeclarations = null;
+	private IASTName[] fDeclarations;
 	private int fPosition;
 
-	
 	public CPPParameter(IASTName name, int pos) {
 		this.fDeclarations = new IASTName[] { name };
 		fPosition= pos;
@@ -67,17 +67,11 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 		return getType() instanceof ICPPParameterPackType;
 	}
 
-	/* (non-Javadoc)
-     * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDeclarations()
-     */
     @Override
 	public IASTNode[] getDeclarations() {
         return fDeclarations;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDefinition()
-     */
     @Override
 	public IASTNode getDefinition() {
         return null;
@@ -121,17 +115,12 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	    }
 	    return null;
 	}
-	/* (non-Javadoc)
+
-	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
-	 */
 	@Override
 	public String getName() {
 		return new String(getNameCharArray());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
-	 */
 	@Override
 	public char[] getNameCharArray() {
 	    IASTName name = getPrimaryDeclaration();
@@ -140,26 +129,17 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	    return CharArrayUtils.EMPTY;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
-	 */
 	@Override
 	public IScope getScope() {
 		return CPPVisitor.getContainingScope(getPrimaryDeclaration());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getPhysicalNode()
-	 */
 	public IASTNode getPhysicalNode() {
 	    if (fDeclarations != null)
 	        return fDeclarations[0];
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.core.dom.ast.IVariable#getType()
-	 */
 	@Override
 	public IType getType() {
 		if (fType == null && fDeclarations != null) {
@@ -175,75 +155,48 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 		return fType;
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic()
-     */
     @Override
 	public boolean isStatic() {
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedName()
-     */
     @Override
 	public String[] getQualifiedName() {
         return new String[] { getName() };
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedNameCharArray()
-     */
     @Override
 	public char[][] getQualifiedNameCharArray() {
         return new char[][] { getNameCharArray() };
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified()
-     */
     @Override
 	public boolean isGloballyQualified() {
         return false;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode)
-	 */
 	@Override
 	public void addDefinition(IASTNode node) {
 		addDeclaration(node);
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern()
-     */
     @Override
 	public boolean isExtern() {
         // 7.1.1-5 extern can not be used in the declaration of a parameter
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable#isMutable()
-     */
     @Override
 	public boolean isMutable() {
         // 7.1.1-8 mutable can only apply to class members
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto()
-     */
     @Override
 	public boolean isAuto() {
         return hasStorageClass(IASTDeclSpecifier.sc_auto);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister()
-     */
     @Override
 	public boolean isRegister() {
         return hasStorageClass(IASTDeclSpecifier.sc_register);

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java

@@ -35,7 +35,7 @@ public class CPPTypedef extends PlatformObject implements ITypedef, ITypeContain
 	private IType type;
 
 	public CPPTypedef(IASTName name) {
-		// bug 223020 even though qualified names are not legal, we need to deal with them.
+		// Bug 223020 even though qualified names are not legal, we need to deal with them.
 		if (name != null && name.getParent() instanceof ICPPASTQualifiedName) {
 			name= (IASTName) name.getParent();
 		}
@@ -105,7 +105,7 @@ public class CPPTypedef extends PlatformObject implements ITypedef, ITypeContain
    		try {
             t = (IType) super.clone();
         } catch (CloneNotSupportedException e) {
-            //not going to happen
+            // Not going to happen
         }
         return t;
     }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java

@@ -1762,10 +1762,9 @@ public class CPPVisitor extends ASTQueries {
 	 * Creates the type for a parameter declaration.
 	 */
 	public static IType createType(final ICPPASTParameterDeclaration pdecl, boolean forFuncType) {
-		IType pt;
 		IASTDeclSpecifier pDeclSpec = pdecl.getDeclSpecifier();
 		ICPPASTDeclarator pDtor = pdecl.getDeclarator();
-		pt = createType(pDeclSpec);
+		IType pt = createType(pDeclSpec);
 		if (pDtor != null) {
 			pt = createType(pt, pDtor);
 		}
@@ -2017,7 +2016,8 @@ public class CPPVisitor extends ASTQueries {
 		return createAutoType(autoInitClause, declSpec, declarator);
 	}
 
-	private static IType createAutoType(IASTInitializerClause initClause, IASTDeclSpecifier declSpec, IASTDeclarator declarator) {
+	private static IType createAutoType(IASTInitializerClause initClause, IASTDeclSpecifier declSpec,
+			IASTDeclarator declarator) {
 		//  C++0x: 7.1.6.4
 		if (initClause == null || !autoTypeDeclSpecs.get().add(declSpec)) {
 			// Detected a self referring auto type, e.g.: auto x = x;
@@ -2064,6 +2064,9 @@ public class CPPVisitor extends ASTQueries {
 			return new ProblemType(ISemanticProblem.TYPE_CANNOT_DEDUCE_AUTO_TYPE);
 		}
 		type = argument.getTypeValue();
+		IType t = SemanticUtil.substituteTypedef(type, initType);
+		if (t != null)
+			type = t;
 		if (initClause instanceof ICPPASTInitializerList) {
 			type = (IType) CPPTemplates.instantiate(initializer_list_template,
 					new ICPPTemplateArgument[] { new CPPTemplateArgument(type) });

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/Conversions.java

@@ -16,7 +16,16 @@ package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
 import static org.eclipse.cdt.core.dom.ast.IASTExpression.ValueCategory.LVALUE;
 import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.ExpressionTypes.valueCategoryFromReturnType;
-import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.*;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.ALLCVQ;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.COND_TDEF;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.CVTYPE;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.REF;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.TDEF;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.addQualifiers;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.calculateInheritanceDepth;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.getCVQualifier;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.getNestedType;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.isVoidType;
 
 import java.util.Collections;
 
@@ -179,7 +188,7 @@ public class Conversions {
 						return cost;
 					}
 				}
-				// — otherwise, the program is ill-formed.
+				// � otherwise, the program is ill-formed.
 				return Cost.NO_CONVERSION;
 			}
 			
@@ -1147,18 +1156,18 @@ public class Conversions {
 	 * 4.1, 4.2, 4.3
 	 */
 	public static IType lvalue_to_rvalue(IType type) {
-		type= SemanticUtil.getNestedType(type, TDEF | REF);
+		IType t= SemanticUtil.getNestedType(type, TDEF | REF);
-		if (type instanceof IArrayType) {
+		if (t instanceof IArrayType) {
-			return new CPPPointerType(((IArrayType) type).getType());
+			return new CPPPointerType(((IArrayType) t).getType());
 		}
-		if (type instanceof IFunctionType) {
+		if (t instanceof IFunctionType) {
-			return new CPPPointerType(type);
+			return new CPPPointerType(t);
 		}
-		IType uqType= SemanticUtil.getNestedType(type, TDEF | REF | ALLCVQ);
+		IType uqType= SemanticUtil.getNestedType(t, TDEF | REF | ALLCVQ);
 		if (uqType instanceof ICPPClassType) {
-			return type;
+			return SemanticUtil.getNestedType(type, COND_TDEF | REF);
 		}
-		return uqType;
+		return SemanticUtil.getNestedType(t, COND_TDEF | REF | ALLCVQ);
 	}
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/ExpressionTypes.java

@@ -7,9 +7,11 @@
  *
  * Contributors:
  *     Markus Schorn - initial API and implementation
+ *     Sergey Prigogin (Google)
  *******************************************************************************/ 
 package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.COND_TDEF;
 import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.CVTYPE;
 import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.REF;
 import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.SemanticUtil.TDEF;
@@ -26,22 +28,20 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunction;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPFunctionType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPReferenceType;
 
-
 /**
- * Methods for computing the type of an expression
+ * Methods for computing the type of an expression.
  */
 public class ExpressionTypes {
 	
 	public static IType glvalueType(IType type) {
 		// Reference types are removed.
-		return SemanticUtil.getNestedType(type, TDEF | REF);
+		return SemanticUtil.getNestedType(type, COND_TDEF | REF);
 	}
 	
 	public static IType prvalueType(IType type) {
 		return Conversions.lvalue_to_rvalue(type);
 	}
 
-
 	public static ValueCategory valueCategoryFromFunctionCall(ICPPFunction function) {
 		final ICPPFunctionType ft = function.getType();
 		return valueCategoryFromReturnType(ft.getReturnType());
@@ -67,46 +67,46 @@ public class ExpressionTypes {
 		return typeFromReturnType(ft.getReturnType());
 	}
 	
-	public static IType typeFromReturnType(IType r) {
+	public static IType typeFromReturnType(IType type) {
-		r= SemanticUtil.getNestedType(r, TDEF);
+		IType t= SemanticUtil.getNestedType(type, TDEF);
-		if (r instanceof ICPPReferenceType) {
+		if (t instanceof ICPPReferenceType) {
-			return glvalueType(r);
+			return glvalueType(type);
 		}
-		return prvalueType(r);
+		return prvalueType(type);
 	}
 
-	public static IType typeOrFunctionSet(IASTExpression e) {
+	public static IType typeOrFunctionSet(IASTExpression exp) {
-		FunctionSetType fs= getFunctionSetType(e);
+		FunctionSetType fs= getFunctionSetType(exp);
 		if (fs != null) {
 			return fs;
 		} 
-		return e.getExpressionType();
+		return exp.getExpressionType();
 	} 
 	
-	public static ValueCategory valueCat(IASTExpression e) {
+	public static ValueCategory valueCat(IASTExpression exp) {
-		FunctionSetType fs= getFunctionSetType(e);
+		FunctionSetType fs= getFunctionSetType(exp);
 		if (fs != null)
 			return fs.getValueCategory();
-		return e.getValueCategory();
+		return exp.getValueCategory();
 	}
 			
-	private static FunctionSetType getFunctionSetType(IASTExpression e) {
+	private static FunctionSetType getFunctionSetType(IASTExpression exp) {
 		boolean addressOf= false;
-    	while (e instanceof IASTUnaryExpression) {
+    	while (exp instanceof IASTUnaryExpression) {
-    		final IASTUnaryExpression unary = (IASTUnaryExpression) e;
+    		final IASTUnaryExpression unary = (IASTUnaryExpression) exp;
 			final int op= unary.getOperator();
 			if (op == IASTUnaryExpression.op_bracketedPrimary) {
-    			e= unary.getOperand();
+    			exp= unary.getOperand();
     		} else if (!addressOf && op == IASTUnaryExpression.op_amper) {
     			addressOf= true;
-    			e= unary.getOperand();
+    			exp= unary.getOperand();
     		} else {
     			break;
     		}
     	}
     	
-    	if (e instanceof IASTIdExpression) {
+    	if (exp instanceof IASTIdExpression) {
-    		IASTIdExpression idexpr= (IASTIdExpression) e;
+    		IASTIdExpression idexpr= (IASTIdExpression) exp;
     		final IASTName name = idexpr.getName();
 			IBinding b= name.resolvePreBinding();
     		if (b instanceof CPPFunctionSet) {
@@ -115,4 +115,23 @@ public class ExpressionTypes {
     	}
     	return null;
 	}
+
+	public static IType restoreTypedefs(IType type, IType originalType) {
+		IType t = SemanticUtil.substituteTypedef(type, originalType);
+		if (t != null)
+			return t;
+		return type;
+	}
+
+	public static IType restoreTypedefs(IType type, IType originalType1, IType originalType2) {
+		IType t = SemanticUtil.substituteTypedef(type, originalType1);
+		if (t != null)
+			return t;
+		if (originalType2 != null) {
+			t = SemanticUtil.substituteTypedef(type, originalType2);
+			if (t != null)
+				return t;
+		}
+		return type;
+	}
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/SemanticUtil.java

@@ -14,7 +14,14 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
 
-import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.*;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.CONST;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.CONST_RESTRICT;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.CONST_VOLATILE;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.CONST_VOLATILE_RESTRICT;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.NONE;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.RESTRICT;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.VOLATILE;
+import static org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CVQualifier.VOLATILE_RESTRICT;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -60,20 +67,23 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPDeferredClassInstance;
 import org.eclipse.cdt.internal.core.dom.parser.cpp.OverloadableOperator;
 
 /**
- *
+ * Collection of static methods operating on C++ bindings.
  */
 public class SemanticUtil {
 	private static final char[] OPERATOR_CHARS = Keywords.OPERATOR.toCharArray();
 	// Cache of overloadable operator names for fast lookup. Used by isConversionOperator.
 	private static final CharArraySet cas= new CharArraySet(OverloadableOperator.values().length);
 
+	// Resolve typedefs.
 	public static final int TDEF =      0x01;
-	public static final int REF =     0x02;
+	// Resolve typedefs, but only if necessary for a nested type transformation.
-	public static final int CVTYPE =  0x04;
+	public static final int COND_TDEF = 0x02; 
-	public static final int ALLCVQ=   0x08;
+	public static final int REF =       0x04;
-	public static final int PTR=      0x10;
+	public static final int CVTYPE =    0x08;
-	public static final int MPTR=     0x20;
+	public static final int ALLCVQ =    0x10;
-	public static final int ARRAY=    0x40;
+	public static final int PTR =       0x20;
+	public static final int MPTR =      0x40;
+	public static final int ARRAY =     0x80;
 	
 	static {
 		final int OPERATOR_SPC= OPERATOR_CHARS.length + 1;
@@ -221,14 +231,25 @@ public class SemanticUtil {
 	 */
 	public static IType getNestedType(IType type, int options) {
 		final boolean tdef= (options & TDEF) != 0;
+		final boolean cond_tdef= (options & COND_TDEF) != 0;
 		final boolean ptr= (options & PTR) != 0;
 		final boolean mptr= (options & MPTR) != 0;
 		final boolean allcvq= (options & ALLCVQ) != 0;
 		final boolean cvtype = (options & CVTYPE) != 0;
 
+		IType beforeTypedefs = null;
+
 		while (true) {
 			IType t= null;
-			if (type instanceof IPointerType) {
+			if (type instanceof ITypedef) {
+				if (tdef || cond_tdef) {
+					if (beforeTypedefs == null && cond_tdef) {
+						beforeTypedefs = type;
+					}
+					t= ((ITypedef) type).getType();
+				}
+			} else if (type instanceof IPointerType) {
+				beforeTypedefs = null;
 				final boolean isMbrPtr = type instanceof ICPPPointerToMemberType;
 				if ((ptr && !isMbrPtr) || (mptr && isMbrPtr)) {
 					t= ((IPointerType) type).getType();
@@ -244,20 +265,20 @@ public class SemanticUtil {
 					}
 					return pt;
 				}
-			} else if (tdef && type instanceof ITypedef) {
-				t= ((ITypedef) type).getType();
 			} else if (type instanceof IQualifierType) {
+				beforeTypedefs = null;
 				final IQualifierType qt = (IQualifierType) type;
 				final IType qttgt = qt.getType();
 				if (allcvq || cvtype) {
 					t= qttgt;
-				} else if (tdef) {
+				} else if (tdef || cond_tdef) {
 					t= getNestedType(qttgt, options);
 					if (t == qttgt) 
 						return qt;
 					return addQualifiers(t, qt.isConst(), qt.isVolatile(), false);
 				} 
 			} else if (type instanceof IArrayType) {
+				beforeTypedefs = null;
 				final IArrayType atype= (IArrayType) type;
 				if ((options & ARRAY) != 0) {
 					t= atype.getType();
@@ -269,11 +290,12 @@ public class SemanticUtil {
 					return replaceNestedType((ITypeContainer) atype, newNested);
 				}
 			} else if (type instanceof ICPPReferenceType) {
+				beforeTypedefs = null;
 				final ICPPReferenceType rt = (ICPPReferenceType) type;
 				if ((options & REF) != 0) {
 					t= rt.getType();
 				} else if (tdef) {
-					// a typedef within the reference type can influence whether the reference is lvalue or rvalue
+					// A typedef within the reference type can influence whether the reference is lvalue or rvalue
 					IType nested= rt.getType();
 					IType newNested = getNestedType(nested, TDEF);
 					if (nested == newNested) 
@@ -282,8 +304,12 @@ public class SemanticUtil {
 				}
 			}
 			// Pack expansion types are dependent types, there is no need to descend into those.
-			if (t == null)
+			if (t == null) {
+				if (beforeTypedefs != null) {
+					return beforeTypedefs;
+				}
 				return type;
+			}
 			
 			type= t;
 		}
@@ -354,7 +380,7 @@ public class SemanticUtil {
 		if (newNestedType == null)
 			return type;
 		
-		// bug 249085 make sure not to add unnecessary qualifications
+		// Bug 249085 make sure not to add unnecessary qualifications
 		if (type instanceof IQualifierType) {
 			IQualifierType qt= (IQualifierType) type;
 			return addQualifiers(newNestedType, qt.isConst(), qt.isVolatile(), false);
@@ -365,6 +391,40 @@ public class SemanticUtil {
 		return type;
 	}
 
+	/**
+	 * Replaces the given type or its nested type with a typedef if that type is the same as
+	 * the type the typedef resolves to. 
+	 * 
+	 * @param type the type subject to substitution 
+	 * @param typedefType the type possibly containing the typedef as its nested type.
+	 * @return the given type with the nested type replaced by the typedef, or {@code null} if
+	 *	   the typedefType doesn't contain a typedef or the nested type doesn't match the typedef.
+	 */
+	public static IType substituteTypedef(IType type, IType typedefType) {
+		typedefType = getNestedType(typedefType, REF | ALLCVQ | PTR | ARRAY);
+		if (!(typedefType instanceof ITypedef))
+			return null;
+		IType nestedType = getNestedType(type, REF | ALLCVQ | PTR | ARRAY);
+		if (!nestedType.isSameType(((ITypedef) typedefType).getType()))
+			return null;
+
+		IType result = null;
+		ITypeContainer containerType = null;
+		for (IType t = type; ; t = containerType.getType()) {
+			IType newType = t == nestedType ? typedefType : (IType) t.clone();
+			if (result == null)
+				result = newType;
+			if (containerType != null) {
+				containerType.setType(newType);
+			}
+			if (t == nestedType)
+				return result;
+			if (!(t instanceof ITypeContainer))
+				return null;
+			containerType = (ITypeContainer) t;
+		}
+	}
+
 	public static IType mapToAST(IType type, IASTNode node) {
 		if (type instanceof IFunctionType) {
 			final ICPPFunctionType ft = (ICPPFunctionType) type;

core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/CWDLocator.java

@@ -76,7 +76,7 @@ public class CWDLocator extends AbstractErrorParser {
 				return true;
 			}
 		},
-		// This is emitted by GNU make using options -n, --just-print or -w, --print-directory.
+		// This is emitted by GNU make using options -w or --print-directory.
 		new ErrorPattern("make: Entering directory `(.*)'", 0, 0) { //$NON-NLS-1$
 			@Override
 			protected boolean recordError(Matcher matcher, ErrorParserManager eoParser) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractlocalvariable/ExtractLocalVariableRefactoring.java

@@ -100,7 +100,7 @@ public class ExtractLocalVariableRefactoring extends CRefactoring {
 	@Override
 	public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
 			throws CoreException, OperationCanceledException {
-		SubMonitor sm = SubMonitor.convert(pm, 9);
+		SubMonitor sm = SubMonitor.convert(pm, 10);
 
 		RefactoringStatus status = super.checkInitialConditions(sm.newChild(6));
 		if (status.hasError()) {
@@ -128,11 +128,6 @@ public class ExtractLocalVariableRefactoring extends CRefactoring {
 		if (isProgressMonitorCanceled(sm, initStatus))
 			return initStatus;
 
-		sm.worked(1);
-
-		container.getNames(); //XXX Is this needed?
-		sm.worked(1);
-
 		info.addNamesToUsedNames(findAllDeclaredNames());
 		sm.worked(1);
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/CSearchMessages.properties

@@ -110,4 +110,4 @@ OccurrencesFinder_label_singular=''{0}'' - 1 occurrence in ''{1}''
 # The first argument will be replaced by the element name, the second by the count and the last by the file name
 OccurrencesFinder_label_plural=''{0}'' - {1} occurrences in ''{2}''
 OccurrencesFinder_occurrence_description=Occurrence of ''{0}''
-OccurrencesFinder_occurrence_write_description=Write Occurrence of ''{0}''
+OccurrencesFinder_occurrence_write_description=Write occurrence of ''{0}''

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/AbstractCEditorTextHover.java

@@ -10,7 +10,6 @@
  *     IBM Corporation
  *     Anton Leherbauer (Wind River Systems)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.ui.text.c.hover;
 
 import org.eclipse.jface.text.DefaultInformationControl;
@@ -32,12 +31,10 @@ import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover;
 import org.eclipse.cdt.internal.ui.text.CWordFinder;
 
 /**
- * Abstract class for providing hover information for C
+ * Abstract class for providing hover information for C elements.
- * elements.
- * 
  */
-public abstract class AbstractCEditorTextHover implements ICEditorTextHover, ITextHoverExtension, ITextHoverExtension2, IInformationProviderExtension2 {
+public abstract class AbstractCEditorTextHover implements ICEditorTextHover, ITextHoverExtension,
-
+		ITextHoverExtension2, IInformationProviderExtension2 {
 	private IEditorPart fEditor;
 
 	/*
@@ -102,7 +99,7 @@ public abstract class AbstractCEditorTextHover implements ICEditorTextHover, ITe
 	}
 
 	/*
-	 * @see org.eclipse.jface.text.ITextHoverExtension2#getInformationPresenterControlCreator()
+	 * @see ITextHoverExtension2#getInformationPresenterControlCreator()
 	 * @since 5.0
 	 */
 	@Override

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/BestMatchHover.java

@@ -10,7 +10,6 @@
  *     Anton Leherbauer (Wind River Systems)
  *     Ericsson             - Fix improper hover order (Bug 294812)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.ui.text.c.hover;
 
 import java.util.ArrayList;
@@ -39,10 +38,8 @@ import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover;
  * hovers being placed before less specific ones.
  */
 public class BestMatchHover extends AbstractCEditorTextHover {
-
 	/*
-	 * Note that hover ordering is very important to be preserved by this
+	 * Note that hover ordering is very important to be preserved by this class (bug 294812).
-	 * class. (Bug 294812)
 	 */
 	private List<CEditorTextHoverDescriptor> fTextHoverSpecifications;
 	private List<ITextHover> fInstantiatedTextHovers;
@@ -63,16 +60,16 @@ public class BestMatchHover extends AbstractCEditorTextHover {
 	private void installTextHovers() {
 		CEditorTextHoverDescriptor[] hoverDescs= CUIPlugin.getDefault().getCEditorTextHoverDescriptors();
 		
-		// initialize lists - indicates that the initialization happened
+		// Initialize lists - indicates that the initialization happened
 		fTextHoverSpecifications= new ArrayList<CEditorTextHoverDescriptor>(hoverDescs.length-1);
 		fInstantiatedTextHovers= new ArrayList<ITextHover>(hoverDescs.length-1);
 
-		// populate list
+		// Populate list
 		for (int i= 0; i < hoverDescs.length; i++) {
-			// ensure that we don't add ourselves to the list
+			// Ensure that we don't add ourselves to the list
 			if (!PreferenceConstants.ID_BESTMATCH_HOVER.equals(hoverDescs[i].getId())) {
 				fTextHoverSpecifications.add(hoverDescs[i]);
-				// add place-holder for hover instance
+				// Add place-holder for hover instance
 				fInstantiatedTextHovers.add(null);
 			}
 		}
@@ -90,7 +87,7 @@ public class BestMatchHover extends AbstractCEditorTextHover {
 			ICEditorTextHover hover= spec.createTextHover();
 			if (hover != null) {
 				hover.setEditor(getEditor());
-				// remember instance and mark as created
+				// Remember instance and mark as created
 				fInstantiatedTextHovers.set(i, hover);
 				fTextHoverSpecifications.set(i, null);
 			} else {
@@ -109,7 +106,6 @@ public class BestMatchHover extends AbstractCEditorTextHover {
 	@SuppressWarnings("deprecation")
 	@Override
 	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-
 		checkTextHovers();
 		fBestHover= null;
 
@@ -130,12 +126,11 @@ public class BestMatchHover extends AbstractCEditorTextHover {
 	}
 
 	/*
-	 * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+	 * @see ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)
 	 */
 	@SuppressWarnings("deprecation")
 	@Override
 	public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
-		
 		checkTextHovers();
 		fBestHover= null;
 		
@@ -164,7 +159,7 @@ public class BestMatchHover extends AbstractCEditorTextHover {
 	}
 
 	/*
-	 * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
+	 * @see ITextHoverExtension#getHoverControlCreator()
 	 * @since 3.0
 	 */
 	@Override
@@ -176,16 +171,15 @@ public class BestMatchHover extends AbstractCEditorTextHover {
 	}
 
 	/*
-	 * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator()
+	 * @see IInformationProviderExtension2#getInformationPresenterControlCreator()
 	 * @since 3.0
 	 */
 	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
-		// this is wrong, but left here for backwards compatibility
+		// This is wrong, but left here for backwards compatibility
 		if (fBestHover instanceof IInformationProviderExtension2)
 			return ((IInformationProviderExtension2) fBestHover).getInformationPresenterControlCreator();
 
 		return null;
 	}
-
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CDocHover.java

@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.text.c.hover;
 
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
@@ -22,8 +21,8 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.cdt.ui.IRequiredInclude;
 import org.eclipse.cdt.ui.IFunctionSummary.IFunctionPrototypeSummary;
+import org.eclipse.cdt.ui.IRequiredInclude;
 import org.eclipse.cdt.ui.text.ICHelpInvocationContext;
 import org.eclipse.cdt.ui.text.IHoverHelpInvocationContext;
 
@@ -34,14 +33,11 @@ import org.eclipse.cdt.internal.ui.text.HTMLPrinter;
 
 public class CDocHover extends AbstractCEditorTextHover {
 
-	/**
-	 * Constructor for DefaultCEditorTextHover
-	 */
 	public CDocHover() {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+	 * @see ITextHover#getHoverInfo(ITextViewer, IRegion)
 	 */
 	@Override
 	public String getHoverInfo(ITextViewer viewer, IRegion region) {
@@ -61,7 +57,6 @@ public class CDocHover extends AbstractCEditorTextHover {
 			// call the Help to get info
 
 			ICHelpInvocationContext context = new IHoverHelpInvocationContext() {
-
 				@Override
 				public IProject getProject() {
 					ITranslationUnit unit = getTranslationUnit();
@@ -81,7 +76,6 @@ public class CDocHover extends AbstractCEditorTextHover {
 				public IRegion getHoverRegion() {
 					return hoverRegion; 
 				}
-				
 			};
 
 			IFunctionSummary fs = CHelpProviderManager.getDefault().getFunctionInfo(context, expression);
@@ -117,7 +111,7 @@ public class CDocHover extends AbstractCEditorTextHover {
 				HTMLPrinter.addPageEpilog(buffer);
 				return buffer.toString();
 			}
-		} catch(Exception ex) {
+		} catch (Exception e) {
 			/* Ignore */
 		}
 		
@@ -125,7 +119,7 @@ public class CDocHover extends AbstractCEditorTextHover {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
+	 * @see ITextHover#getHoverRegion(ITextViewer, int)
 	 */
 	@Override
 	public IRegion getHoverRegion(ITextViewer viewer, int offset) {
@@ -134,12 +128,12 @@ public class CDocHover extends AbstractCEditorTextHover {
 			if (selectedRange.x >= 0 && 
 					selectedRange.y > 0 &&
 					offset >= selectedRange.x &&
-					offset <= selectedRange.x + selectedRange.y)
+					offset <= selectedRange.x + selectedRange.y) {
 				return new Region(selectedRange.x, selectedRange.y);
+			}
 			
 			return CWordFinder.findWord(viewer.getDocument(), offset);
 		}
 		return null;
 	}
-	
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CEditorTextHoverProxy.java

@@ -9,7 +9,6 @@
  *     QNX Software Systems - Initial API and implementation
  *     Anton Leherbauer (Wind River Systems)
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.ui.text.c.hover;
 
 import org.eclipse.jface.text.IInformationControlCreator;
@@ -26,7 +25,6 @@ import org.eclipse.cdt.ui.text.c.hover.ICEditorTextHover;
  * CEditorTexHoverProxy
  */
 public class CEditorTextHoverProxy extends AbstractCEditorTextHover {
-
 	private CEditorTextHoverDescriptor fHoverDescriptor;
 	private ICEditorTextHover fHover;
 
@@ -132,5 +130,4 @@ public class CEditorTextHoverProxy extends AbstractCEditorTextHover {
 		}
 		return null;
 	}
-
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CMacroExpansionHover.java

@@ -25,7 +25,6 @@ import org.eclipse.ui.part.IWorkbenchPartOrientation;
  * @since 5.0
  */
 public class CMacroExpansionHover extends AbstractCEditorTextHover {
-
 	@Override
 	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 		Object hoverInfo= getHoverInfo2(textViewer, hoverRegion);
@@ -33,7 +32,7 @@ public class CMacroExpansionHover extends AbstractCEditorTextHover {
 	}
 	
 	/*
-	 * @see org.eclipse.cdt.internal.ui.text.c.hover.AbstractCEditorTextHover#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
+	 * @see AbstractCEditorTextHover#getHoverInfo2(ITextViewer, IRegion)
 	 */
 	@Override
 	public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
@@ -55,7 +54,7 @@ public class CMacroExpansionHover extends AbstractCEditorTextHover {
 	}
 
 	/*
-	 * @see org.eclipse.cdt.internal.ui.text.c.hover.AbstractCEditorTextHover#getInformationPresenterControlCreator()
+	 * @see AbstractCEditorTextHover#getInformationPresenterControlCreator()
 	 */
 	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
@@ -70,5 +69,4 @@ public class CMacroExpansionHover extends AbstractCEditorTextHover {
 			}
 		};
 	}
-
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2002, 2011 QNX Software Systems and others.
+ * Copyright (c) 2002, 2012 QNX Software Systems 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
@@ -8,6 +8,7 @@
  * Contributors:
  *     QNX Software Systems - Initial API and implementation
  *     Anton Leherbauer (Wind River Systems)
+ *     Sergey Prigogin (Google)
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.text.c.hover;
 
@@ -47,12 +48,20 @@ import org.eclipse.ui.part.IWorkbenchPartOrientation;
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.IPositionConverter;
 import org.eclipse.cdt.core.dom.IName;
+import org.eclipse.cdt.core.dom.ast.ASTTypeUtil;
 import org.eclipse.cdt.core.dom.ast.DOMException;
+import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
+import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
 import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
 import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
 import org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner;
 import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNode;
+import org.eclipse.cdt.core.dom.ast.IASTNodeSelector;
+import org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration;
+import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
+import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclaration;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
 import org.eclipse.cdt.core.dom.ast.IBinding;
 import org.eclipse.cdt.core.dom.ast.ICompositeType;
@@ -62,9 +71,14 @@ import org.eclipse.cdt.core.dom.ast.IFunction;
 import org.eclipse.cdt.core.dom.ast.IMacroBinding;
 import org.eclipse.cdt.core.dom.ast.IParameter;
 import org.eclipse.cdt.core.dom.ast.IProblemBinding;
+import org.eclipse.cdt.core.dom.ast.IProblemType;
 import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.ITypedef;
 import org.eclipse.cdt.core.dom.ast.IVariable;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTDeclarator;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleDeclSpecifier;
+import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypeId;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPConstructor;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPSpecialization;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition;
@@ -77,12 +91,14 @@ import org.eclipse.cdt.core.model.ILanguage;
 import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.core.model.IWorkingCopy;
 import org.eclipse.cdt.core.parser.KeywordSetKey;
+import org.eclipse.cdt.core.parser.Keywords;
 import org.eclipse.cdt.core.parser.ParserFactory;
 import org.eclipse.cdt.core.parser.ParserLanguage;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.IWorkingCopyManager;
 import org.eclipse.cdt.ui.text.ICPartitions;
 
+import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
 import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable;
 import org.eclipse.cdt.internal.corext.util.Strings;
 
@@ -95,15 +111,16 @@ import org.eclipse.cdt.internal.ui.util.EditorUtility;
  * A text hover presenting the source of the element under the cursor.
  */
 public class CSourceHover extends AbstractCEditorTextHover {
-
 	private static final boolean DEBUG = false;
 
 	protected static class SingletonRule implements ISchedulingRule {
 		public static final ISchedulingRule INSTANCE = new SingletonRule();
+
 		@Override
 		public boolean contains(ISchedulingRule rule) {
 			return rule == this;
 		}
+
 		@Override
 		public boolean isConflicting(ISchedulingRule rule) {
 			return rule == this;
@@ -114,39 +131,69 @@ public class CSourceHover extends AbstractCEditorTextHover {
 	 * Computes the source location for a given identifier.
 	 */
 	protected static class ComputeSourceRunnable implements ASTRunnable {
-
 		private final ITranslationUnit fTU;
 		private final IRegion fTextRegion;
+		private final String fSelection;
 		private final IProgressMonitor fMonitor;
 		private String fSource;
 
 		/**
-		 * @param tUnit
+		 * @param tUnit the translation unit
-		 * @param textRegion 
+		 * @param textRegion the selected region
+		 * @param selection the text of the selected region without 
 		 */
-		public ComputeSourceRunnable(ITranslationUnit tUnit, IRegion textRegion) {
+		public ComputeSourceRunnable(ITranslationUnit tUnit, IRegion textRegion, String selection) {
 			fTU= tUnit;
 			fTextRegion= textRegion;
+			fSelection = selection;
 			fMonitor= new NullProgressMonitor();
 			fSource= null;
 		}
 
 		/*
-		 * @see org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable#runOnAST(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit)
+		 * @see org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable#runOnAST(IASTTranslationUnit)
 		 */
 		@Override
 		public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
 			if (ast != null) {
 				try {
-					IASTName name= ast.getNodeSelector(null).findEnclosingName(fTextRegion.getOffset(), fTextRegion.getLength());
+					IASTNodeSelector nodeSelector = ast.getNodeSelector(null);
+					if (fSelection.equals(Keywords.AUTO)) {
+						IASTNode node = nodeSelector.findEnclosingNode(fTextRegion.getOffset(), fTextRegion.getLength());
+						if (node instanceof ICPPASTDeclSpecifier) {
+							ICPPASTDeclSpecifier declSpec = (ICPPASTDeclSpecifier) node;
+							IASTNode parent = declSpec.getParent();
+							IASTDeclarator[] declarators = IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
+							if (parent instanceof IASTSimpleDeclaration) {
+								declarators = ((IASTSimpleDeclaration) parent).getDeclarators();
+							} else if (parent instanceof IASTParameterDeclaration) {
+								declarators = new IASTDeclarator[] { ((IASTParameterDeclaration) parent).getDeclarator() };
+							} else if (parent instanceof ICPPASTTypeId) {
+								declarators = new IASTDeclarator[] { ((ICPPASTTypeId) parent).getAbstractDeclarator() };
+							}
+							IType type = null;
+							for (IASTDeclarator declarator : declarators) {
+								IType t = CPPVisitor.createType(declarator);
+								if (type == null) {
+									type = t;
+								} else if (!type.isSameType(t)) {
+									// Type varies between declarators - don't display anything.
+									type = null;
+									break;
+								}
+							}
+							if (type != null && !(type instanceof IProblemType))
+								fSource = ASTTypeUtil.getType(type, false);
+						}
+					} else {
+						IASTName name= nodeSelector.findEnclosingName(fTextRegion.getOffset(), fTextRegion.getLength());
 						if (name != null) {
 							IBinding binding= name.resolveBinding();
 							if (binding != null) {
-							
+								// Check for implicit names first, could be an implicit constructor call.
-							// Check for implicit names first, could be an implicit constructor call
 								if (name.getParent() instanceof IASTImplicitNameOwner) {
-								IASTImplicitNameOwner iastImplicitNameOwner = (IASTImplicitNameOwner) name.getParent();
+									IASTImplicitNameOwner implicitNameOwner = (IASTImplicitNameOwner) name.getParent();
-								IASTName [] implicitNames = iastImplicitNameOwner.getImplicitNames();
+									IASTName[] implicitNames = implicitNameOwner.getImplicitNames();
 									if (implicitNames.length == 1) {
 										IBinding implicitNameBinding = implicitNames[0].resolveBinding();
 										if (implicitNameBinding instanceof ICPPConstructor) {
@@ -156,10 +203,10 @@ public class CSourceHover extends AbstractCEditorTextHover {
 								}
 								
 								if (binding instanceof IProblemBinding) {
-								// report problem as source comment
+									// Report problem as source comment.
 									if (DEBUG) {
 										IProblemBinding problem= (IProblemBinding) binding;
-									fSource= "/* Indexer Problem!\n" + //$NON-NLS-1$
+										fSource= "/* Problem:\n" + //$NON-NLS-1$
 												" * " + problem.getMessage() +  //$NON-NLS-1$
 												"\n */"; //$NON-NLS-1$
 									}
@@ -168,15 +215,16 @@ public class CSourceHover extends AbstractCEditorTextHover {
 								} else {
 									fSource= computeSourceForBinding(ast, binding);
 								}
+							}
+						}
+					}
 					if (fSource != null) {
 						return Status.OK_STATUS;
 					}
-						}
+				} catch (CoreException e) {
-					}
+					return e.getStatus();
-				} catch (CoreException exc) {
+				} catch (DOMException e) {
-					return exc.getStatus();
+					return new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, "Internal Error", e); //$NON-NLS-1$
-				} catch (DOMException exc) {
-					return new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, "Internal Error", exc); //$NON-NLS-1$
 				}
 			}
 			return Status.CANCEL_STATUS;
@@ -219,8 +267,8 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		private String computeSourceForBinding(IASTTranslationUnit ast, IBinding binding) throws CoreException, DOMException {
 			IName[] names = findDefsOrDecls(ast, binding);
 			
-			// in case the binding is a non-explicit specialization we need
+			// In case the binding is a non-explicit specialization we need
-			// to consider the original binding (bug 281396)
+			// to consider the original binding (bug 281396).
 			while (names.length == 0 && binding instanceof ICPPSpecialization) {
 				IBinding specializedBinding = ((ICPPSpecialization) binding).getSpecializedBinding();
 				if (specializedBinding == null || specializedBinding instanceof IProblemBinding) {
@@ -275,24 +323,24 @@ public class CSourceHover extends AbstractCEditorTextHover {
 					int hoverOffset = fTextRegion.getOffset();
 					if (hoverOffset <= nodeOffset && nodeOffset < hoverOffset + fTextRegion.getLength() ||
 							hoverOffset >= nodeOffset && hoverOffset < nodeOffset + nodeLength) {
-						// bug 359352 - don't show source if its the same we are hovering on
+						// Bug 359352 - don't show source if its the same we are hovering on.
-						return null;
+						return computeHoverForDeclaration(astName);
 					}
 					if (fTU.getResource() != null) {
-						// reuse editor buffer for names local to the translation unit
+						// Reuse editor buffer for names local to the translation unit
 						location= fTU.getResource().getFullPath();
 						locationKind= LocationKind.IFILE;
 					}
 				}
 			} else {
-				// try to resolve path to a resource for proper encoding (bug 221029)
+				// Try to resolve path to a resource for proper encoding (bug 221029)
 				IFile file= EditorUtility.getWorkspaceFileAtLocation(location, fTU);
 				if (file != null) {
 					location= file.getFullPath();
 					locationKind= LocationKind.IFILE;
 					if (name instanceof IIndexName) {
-						// need to adjust index offsets to current offsets
+						// Need to adjust index offsets to current offsets
-						// in case file has been modified since last index time
+						// in case file has been modified since last index time.
 						IIndexName indexName= (IIndexName) name;
 						long timestamp= indexName.getFile().getTimestamp();
 						IPositionConverter converter= CCorePlugin.getPositionTrackerManager().findPositionConverter(file, timestamp);
@@ -331,7 +379,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 						return null;
 					}
 				} else {
-					// expand source range to include preceding comment, if any
+					// Expand source range to include preceding comment, if any
 					boolean isKnR= isKnRSource(name);
 					sourceStart= computeSourceStart(doc, nameOffset, binding, isKnR);
 					if (sourceStart == CHeuristicScanner.NOT_FOUND) {
@@ -342,15 +390,46 @@ public class CSourceHover extends AbstractCEditorTextHover {
 				String source= buffer.getDocument().get(sourceStart, sourceEnd - sourceStart);
 				return source;
 
-			} catch (BadLocationException exc) {
+			} catch (BadLocationException e) {
-				// ignore - should not happen anyway
+				// Ignore - should not happen anyway
-				if (DEBUG) exc.printStackTrace();
+				if (DEBUG) e.printStackTrace();
 			} finally {
 				mgr.disconnect(location, LocationKind.LOCATION, fMonitor);
 			}
 			return null;
 		}
 
+		/**
+		 * Computes the hover containing the deduced type for a declaration based on {@code auto}
+		 * keyword.
+		 * 
+		 * @param name the name of the declarator
+		 * @return the hover text, if the declaration is based on {@code auto} keyword,
+		 *     otherwise {@code null}.
+		 */
+		private String computeHoverForDeclaration(IASTName name) {
+			ICPPASTDeclarator declarator =
+					CPPVisitor.findAncestorWithType(name, ICPPASTDeclarator.class);
+			if (declarator == null)
+				return null;
+			IASTDeclaration declaration =
+					CPPVisitor.findAncestorWithType(declarator, IASTDeclaration.class);
+			IASTDeclSpecifier declSpec = null;
+			if (declaration instanceof IASTSimpleDeclaration) {
+				declSpec = ((IASTSimpleDeclaration) declaration).getDeclSpecifier();
+			} else if (declaration instanceof IASTParameterDeclaration) {
+				declSpec = ((IASTParameterDeclaration) declaration).getDeclSpecifier();
+			}
+			if (!(declSpec instanceof ICPPASTSimpleDeclSpecifier) ||
+					((ICPPASTSimpleDeclSpecifier) declSpec).getType() != IASTSimpleDeclSpecifier.t_auto) {
+				return null;
+			}
+			IType type = CPPVisitor.createType(declarator);
+			if (type instanceof IProblemType)
+				return null;
+			return ASTTypeUtil.getType(type, false) + " " + name.getRawSignature(); //$NON-NLS-1$
+		}
+
 		/**
 		 * Determine if the name is part of a KnR function definition.
 		 * @param name
@@ -455,7 +534,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 					if (nextNonWS != CHeuristicScanner.NOT_FOUND) {
 						int nextNonWSLine= doc.getLineOfOffset(nextNonWS);
 						int lineOffset= doc.getLineOffset(nextNonWSLine);
-						if (doc.get(lineOffset, nextNonWS - lineOffset).trim().length() == 0) {
+						if (doc.get(lineOffset, nextNonWS - lineOffset).trim().isEmpty()) {
 							sourceStart= doc.getLineOffset(nextNonWSLine);
 						}
 					}
@@ -467,7 +546,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		private int computeSourceEnd(IDocument doc, int start, IBinding binding, boolean isDefinition, boolean isKnR) throws BadLocationException {
 			int sourceEnd= start;
 			CHeuristicScanner scanner= new CHeuristicScanner(doc);
-			// expand forward to the end of the definition/declaration
+			// Expand forward to the end of the definition/declaration
 			boolean searchBrace= false;
 			boolean searchSemi= false;
 			boolean searchComma= false;
@@ -498,7 +577,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 						sourceEnd= doc.getLength();
 					}
 				}
-				// expand region to include whole line
+				// Expand region to include whole line
 				IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
 				sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
 			} else if (searchSemi) {
@@ -506,7 +585,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 				if (semi != CHeuristicScanner.NOT_FOUND) {
 					sourceEnd= semi+1;
 				}
-				// expand region to include whole line
+				// Expand region to include whole line
 				IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
 				sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
 			} else if (searchComma) {
@@ -552,8 +631,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		 * @return an array of definitions, never <code>null</code>
 		 * @throws CoreException
 		 */
-		private IName[] findDefinitions(IASTTranslationUnit ast,
+		private IName[] findDefinitions(IASTTranslationUnit ast, IBinding binding) throws CoreException {
-				IBinding binding) throws CoreException {
 			IName[] declNames= ast.getDefinitionsInAST(binding);
 			if (declNames.length == 0 && ast.getIndex() != null) {
 				// search definitions in index
@@ -570,8 +648,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		 * @return an array of declarations, never <code>null</code>
 		 * @throws CoreException
 		 */
-		private IName[] findDeclarations(IASTTranslationUnit ast,
+		private IName[] findDeclarations(IASTTranslationUnit ast, IBinding binding) throws CoreException {
-				IBinding binding) throws CoreException {
 			IName[] declNames= ast.getDeclarationsInAST(binding);
 			if (declNames.length == 0 && ast.getIndex() != null) {
 				// search declarations in index
@@ -586,7 +663,6 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		public String getSource() {
 			return fSource;
 		}
-
 	}
 
 	/**
@@ -605,12 +681,12 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		if (editor != null) {
 			IEditorInput input= editor.getEditorInput();
 			IWorkingCopyManager manager= CUIPlugin.getDefault().getWorkingCopyManager();				
-			IWorkingCopy copy = manager.getWorkingCopy(input);
+			IWorkingCopy workingCopy = manager.getWorkingCopy(input);
 			try {
-				if (copy == null || !copy.isConsistent()) {
+				if (workingCopy == null || !workingCopy.isConsistent()) {
 					return null;
 				}
-			} catch (CModelException exc) {
+			} catch (CModelException e) {
 				return null;
 			}
 			
@@ -618,22 +694,21 @@ public class CSourceHover extends AbstractCEditorTextHover {
 			try {
 				expression = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
 				expression = expression.trim();
-				if (expression.length() == 0)
+				if (expression.isEmpty())
 					return null;
 
-				//Before trying a search lets make sure that the user is not hovering over a keyword 
+				// Before trying a search lets make sure that the user is not hovering
-				if (selectionIsKeyword(expression))
+				// over a keyword other than 'auto'.
+				if (selectionIsKeyword(expression) && !expression.equals(Keywords.AUTO))
 					return null;
 
-				String source= null;
+				// Try with the indexer.
+				String source= searchInIndex(workingCopy, hoverRegion, expression);
 
-				// Try with the indexer
+				if (source == null || source.trim().isEmpty())
-				source= searchInIndex(copy, hoverRegion);
-
-				if (source == null || source.trim().length() == 0)
 					return null;
 
-				// we are actually interested in the comments, too.
+				// We are actually interested in the comments, too.
 //				source= removeLeadingComments(source);
 
 				String delim= System.getProperty("line.separator", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -645,7 +720,6 @@ public class CSourceHover extends AbstractCEditorTextHover {
 
 				source = Strings.concatenate(sourceLines, delim);
 				return source;
-
 			} catch (BadLocationException e) {
 			}
 		}
@@ -680,7 +754,7 @@ public class CSourceHover extends AbstractCEditorTextHover {
 				final int startLine= doc.getLineOfOffset(partitionOffset);
 				final int lineOffset= doc.getLineOffset(startLine);
 				if (partitionOffset == lineOffset || 
-						doc.get(lineOffset, partitionOffset - lineOffset).trim().length() == 0) {
+						doc.get(lineOffset, partitionOffset - lineOffset).trim().isEmpty()) {
 					return lineOffset;
 				}
 				return commentOffset;
@@ -690,13 +764,13 @@ public class CSourceHover extends AbstractCEditorTextHover {
 				final int startLine= doc.getLineOfOffset(partitionOffset);
 				final int lineOffset= doc.getLineOffset(startLine);
 				if (partitionOffset == lineOffset || 
-						doc.get(lineOffset, partitionOffset - lineOffset).trim().length() == 0) {
+						doc.get(lineOffset, partitionOffset - lineOffset).trim().isEmpty()) {
 					commentOffset= lineOffset;
 					continue;
 				}
 				return commentOffset;
 			} else if (IDocument.DEFAULT_CONTENT_TYPE.equals(partition.getType())) {
-				if (doc.get(partition.getOffset(), partition.getLength()).trim().length() == 0) {
+				if (doc.get(partition.getOffset(), partition.getLength()).trim().isEmpty()) {
 					continue;
 				}
 				if (commentOffset >= 0) {
@@ -713,7 +787,6 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		return 4;
 	}
 
-
 	/**
 	 * Strip the leading comment from the given source string.
 	 * 
@@ -732,13 +805,13 @@ public class CSourceHover extends AbstractCEditorTextHover {
 			}
 			i= reader.getOffset();
 			reader.close();
-		} catch (IOException ex) {
+		} catch (IOException e) {
 			i= 0;
 		} finally {
 			try {
 				reader.close();
-			} catch (IOException ex) {
+			} catch (IOException e) {
-				CUIPlugin.log(ex);
+				CUIPlugin.log(e);
 			}
 		}
 
@@ -747,13 +820,14 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		return source.substring(i);
 	}
 
-	protected String searchInIndex(final ITranslationUnit tUnit, IRegion textRegion) {
+	protected String searchInIndex(final ITranslationUnit tUnit, IRegion textRegion, String selection) {
-		final ComputeSourceRunnable computer= new ComputeSourceRunnable(tUnit, textRegion);
+		final ComputeSourceRunnable computer= new ComputeSourceRunnable(tUnit, textRegion, selection);
 		Job job= new Job(CHoverMessages.CSourceHover_jobTitle) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
-					return ASTProvider.getASTProvider().runOnAST(tUnit, ASTProvider.WAIT_ACTIVE_ONLY, monitor, computer);
+					return ASTProvider.getASTProvider().runOnAST(tUnit, ASTProvider.WAIT_ACTIVE_ONLY,
+							monitor, computer);
 				} catch (Throwable t) {
 					CUIPlugin.log(t);
 				}
@@ -769,16 +843,15 @@ public class CSourceHover extends AbstractCEditorTextHover {
 		job.schedule();
 		try {
 			job.join();
-		} catch (InterruptedException exc) {
+		} catch (InterruptedException e) {
 			job.cancel();
 			return null;
 		}
 		return computer.getSource();
 	}
 
-
 	/**
-	 * Test whether the given name is a known keyword.
+	 * Checks whether the given name is a known keyword.
 	 * 
 	 * @param name
 	 * @return <code>true</code> if the name is a known keyword or <code>false</code> if the
@@ -802,7 +875,8 @@ public class CSourceHover extends AbstractCEditorTextHover {
 				int orientation= SWT.NONE;
 				if (editor instanceof IWorkbenchPartOrientation)
 					orientation= ((IWorkbenchPartOrientation) editor).getOrientation();
-				return new SourceViewerInformationControl(parent, false, orientation, getTooltipAffordanceString());
+				return new SourceViewerInformationControl(parent, false, orientation,
+						getTooltipAffordanceString());
 			}
 		};
 	}