mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Added linkage-id for objective-c, bug 265748.

Browse source
This commit is contained in:
Markus Schorn 2009-02-24 16:58:37 +00:00
parent 8d7e3e3edb
commit ec1281a793
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/Linkage.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2008 Wind River Systems, Inc. and others. * Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -23,7 +23,12 @@ public class Linkage implements ILinkage {
public static final ILinkage OBJC_LINKAGE = new Linkage(OBJC_LINKAGE_ID, OBJC_LINKAGE_NAME); public static final ILinkage OBJC_LINKAGE = new Linkage(OBJC_LINKAGE_ID, OBJC_LINKAGE_NAME);
private static final ILinkage[] LINKAGES= {C_LINKAGE, CPP_LINKAGE, FORTRAN_LINKAGE, OBJC_LINKAGE}; private static final ILinkage[] LINKAGES= {C_LINKAGE, CPP_LINKAGE, FORTRAN_LINKAGE, OBJC_LINKAGE};
private static final ILinkage[] INDEX_LINKAGES= {C_LINKAGE, CPP_LINKAGE, FORTRAN_LINKAGE};
public static final ILinkage[] getIndexerLinkages() {
return INDEX_LINKAGES;
}
public static final ILinkage[] getAllLinkages() { public static final ILinkage[] getAllLinkages() {
return LINKAGES; return LINKAGES;
} }

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2008 Wind River Systems, Inc. and others. * Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -97,7 +97,7 @@ public class CIndex implements IIndex {
return fFragments[0].findBindings(patterns, isFullyQualified, filter, monitor); return fFragments[0].findBindings(patterns, isFullyQualified, filter, monitor);
} else { } else {
List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>(); List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>();
ILinkage[] linkages = Linkage.getAllLinkages(); ILinkage[] linkages = Linkage.getIndexerLinkages();
for(int j=0; j < linkages.length; j++) { for(int j=0; j < linkages.length; j++) {
if(filter.acceptLinkage(linkages[j])) { if(filter.acceptLinkage(linkages[j])) {
IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][]; IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][];
@ -124,7 +124,7 @@ public class CIndex implements IIndex {
return fFragments[0].findMacroContainers(pattern, filter, monitor); return fFragments[0].findMacroContainers(pattern, filter, monitor);
} else { } else {
List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>(); List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>();
ILinkage[] linkages = Linkage.getAllLinkages(); ILinkage[] linkages = Linkage.getIndexerLinkages();
for(int j=0; j < linkages.length; j++) { for(int j=0; j < linkages.length; j++) {
if(filter.acceptLinkage(linkages[j])) { if(filter.acceptLinkage(linkages[j])) {
IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][]; IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][];
@ -378,7 +378,7 @@ public class CIndex implements IIndex {
monitor= new NullProgressMonitor(); monitor= new NullProgressMonitor();
} }
List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>(); List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>();
ILinkage[] linkages = Linkage.getAllLinkages(); ILinkage[] linkages = Linkage.getIndexerLinkages();
monitor.beginTask(Messages.CIndex_FindBindingsTask_label, fFragments.length * linkages.length); monitor.beginTask(Messages.CIndex_FindBindingsTask_label, fFragments.length * linkages.length);
for(int j=0; j < linkages.length; j++) { for(int j=0; j < linkages.length; j++) {
if(filter.acceptLinkage(linkages[j])) { if(filter.acceptLinkage(linkages[j])) {
@ -504,7 +504,7 @@ public class CIndex implements IIndex {
return fFragments[0].findBindingsForPrefix(prefix, filescope, filter, monitor); return fFragments[0].findBindingsForPrefix(prefix, filescope, filter, monitor);
} else { } else {
List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>(); List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>();
ILinkage[] linkages = Linkage.getAllLinkages(); ILinkage[] linkages = Linkage.getIndexerLinkages();
for(int j=0; j < linkages.length; j++) { for(int j=0; j < linkages.length; j++) {
if(filter.acceptLinkage(linkages[j])) { if(filter.acceptLinkage(linkages[j])) {
IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][]; IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][];
@ -531,7 +531,7 @@ public class CIndex implements IIndex {
return fFragments[0].findBindings(name, filescope, filter, monitor); return fFragments[0].findBindings(name, filescope, filter, monitor);
} else { } else {
List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>(); List<IIndexBinding[]> result = new ArrayList<IIndexBinding[]>();
ILinkage[] linkages = Linkage.getAllLinkages(); ILinkage[] linkages = Linkage.getIndexerLinkages();
for(int j=0; j < linkages.length; j++) { for(int j=0; j < linkages.length; j++) {
if(filter.acceptLinkage(linkages[j])) { if(filter.acceptLinkage(linkages[j])) {
IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][]; IIndexFragmentBinding[][] fragmentBindings = new IIndexFragmentBinding[fPrimaryFragmentCount][];