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

Cosmetics.

This commit is contained in:
Sergey Prigogin 2012-08-09 10:41:18 -07:00
parent f66b671544
commit a7f7ee8abe

View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics; package org.eclipse.cdt.internal.core.dom.parser.cpp.semantics;
@ -70,8 +70,8 @@ class BaseClassLookup {
private IBinding[] fBindings; private IBinding[] fBindings;
private List<BaseClassLookup> fChildren= Collections.emptyList(); private List<BaseClassLookup> fChildren= Collections.emptyList();
private BitSet fVirtual; private BitSet fVirtual;
private boolean fHiddenAsVirtualBase= false; private boolean fHiddenAsVirtualBase;
private boolean fPropagationDone= false; private boolean fPropagationDone;
private boolean fCollected; private boolean fCollected;
private boolean fCollectedAsRegularBase; private boolean fCollectedAsRegularBase;
@ -85,9 +85,11 @@ class BaseClassLookup {
IBinding[] getResult() { IBinding[] getResult() {
return fBindings; return fBindings;
} }
boolean containsVirtualBase() { boolean containsVirtualBase() {
return (fVirtual != null && fVirtual.nextSetBit(0) >= 0); return (fVirtual != null && fVirtual.nextSetBit(0) >= 0);
} }
boolean hasMatches() { boolean hasMatches() {
return fBindings != null && fBindings.length > 0 && fBindings[0] != null; return fBindings != null && fBindings.length > 0 && fBindings[0] != null;
} }
@ -111,6 +113,7 @@ class BaseClassLookup {
public void setHiddenAsVirtualBase() { public void setHiddenAsVirtualBase() {
fHiddenAsVirtualBase= true; fHiddenAsVirtualBase= true;
} }
public void propagateHiddenAsVirtual() { public void propagateHiddenAsVirtual() {
if (fPropagationDone) if (fPropagationDone)
return; return;
@ -136,8 +139,8 @@ class BaseClassLookup {
return false; return false;
} }
static BaseClassLookup lookupInBaseClass(LookupData data, ICPPClassScope baseClassScope, boolean isVirtual, static BaseClassLookup lookupInBaseClass(LookupData data, ICPPClassScope baseClassScope,
ICPPClassType root, HashMap<IScope, BaseClassLookup> infoMap, int depth) { boolean isVirtual, ICPPClassType root, HashMap<IScope, BaseClassLookup> infoMap, int depth) {
if (depth++ > CPPSemantics.MAX_INHERITANCE_DEPTH) if (depth++ > CPPSemantics.MAX_INHERITANCE_DEPTH)
return null; return null;
@ -314,6 +317,7 @@ class BaseClassLookup {
} }
} }
} }
public void collectResultForContentAssist(LookupData data) { public void collectResultForContentAssist(LookupData data) {
if (fCollected) if (fCollected)
return; return;