mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-25 17:23:56 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2013-09-06 13:46:48 -07:00
parent a2a8a1dd8c
commit 2272e31185
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
View file

@ -233,9 +233,7 @@ public class CPPSemantics {
* The maximum depth to search ancestors before assuming infinite looping. * The maximum depth to search ancestors before assuming infinite looping.
*/ */
public static final int MAX_INHERITANCE_DEPTH= 16; public static final int MAX_INHERITANCE_DEPTH= 16;
//
// public static final ASTNodeProperty STRING_LOOKUP_PROPERTY =
// new ASTNodeProperty("CPPSemantics.STRING_LOOKUP_PROPERTY - STRING_LOOKUP"); //$NON-NLS-1$
public static final String EMPTY_NAME = ""; //$NON-NLS-1$ public static final String EMPTY_NAME = ""; //$NON-NLS-1$
public static final char[] OPERATOR_ = new char[] {'o','p','e','r','a','t','o','r',' '}; public static final char[] OPERATOR_ = new char[] {'o','p','e','r','a','t','o','r',' '};
public static final IType VOID_TYPE = new CPPBasicType(Kind.eVoid, 0); public static final IType VOID_TYPE = new CPPBasicType(Kind.eVoid, 0);

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFileSet.java
View file

@ -118,8 +118,7 @@ public class IndexFileSet implements IIndexFileSet {
IIndexFragmentBinding fb; IIndexFragmentBinding fb;
if (binding instanceof IIndexFragmentBinding) { if (binding instanceof IIndexFragmentBinding) {
fb= (IIndexFragmentBinding) binding; fb= (IIndexFragmentBinding) binding;
} } else {
else {
fb= (IIndexFragmentBinding) binding.getAdapter(IIndexFragmentBinding.class); fb= (IIndexFragmentBinding) binding.getAdapter(IIndexFragmentBinding.class);
} }
try { try {
@ -128,8 +127,7 @@ public class IndexFileSet implements IIndexFileSet {
if (subSet != null && subSet.containsFileOfLocalBinding(fb)) { if (subSet != null && subSet.containsFileOfLocalBinding(fb)) {
ok.set(i); ok.set(i);
} }
} } else {
else {
ok.set(i); ok.set(i);
} }
} catch (CoreException e) { } catch (CoreException e) {
@ -164,9 +162,9 @@ public class IndexFileSet implements IIndexFileSet {
if (!(file instanceof IIndexFragmentFile)) if (!(file instanceof IIndexFragmentFile))
return invert; return invert;
IIndexFragmentFile ifile= (IIndexFragmentFile) file; IIndexFragmentFile fragmentFile= (IIndexFragmentFile) file;
IIndexFragmentFileSet subSet= fSubSets.get(ifile.getIndexFragment()); IIndexFragmentFileSet subSet= fSubSets.get(fragmentFile.getIndexFragment());
if (subSet != null && subSet.contains(ifile)) { if (subSet != null && subSet.contains(fragmentFile)) {
return !invert; return !invert;
} }
return invert; return invert;

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMLinkage.java
View file

@ -394,7 +394,7 @@ public abstract class PDOMLinkage extends PDOMNamedNode implements IIndexLinkage
*/ */
public PDOMBinding[] getBindingsViaCache(char[] name, IProgressMonitor monitor) throws CoreException { public PDOMBinding[] getBindingsViaCache(char[] name, IProgressMonitor monitor) throws CoreException {
CharArrayMap<PDOMBinding[]> map = getBindingMap(); CharArrayMap<PDOMBinding[]> map = getBindingMap();
synchronized(map) { synchronized (map) {
PDOMBinding[] result= map.get(name); PDOMBinding[] result= map.get(name);
if (result != null) if (result != null)
return result; return result;
@ -404,7 +404,7 @@ public abstract class PDOMLinkage extends PDOMNamedNode implements IIndexLinkage
visitor.setMonitor(monitor); visitor.setMonitor(monitor);
getIndex().accept(visitor); getIndex().accept(visitor);
PDOMBinding[] result= visitor.getBindings(); PDOMBinding[] result= visitor.getBindings();
synchronized(map) { synchronized (map) {
map.put(name, result); map.put(name, result);
} }
return result; return result;