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

Fix CCE

Browse source
This commit is contained in:
Anton Leherbauer 2007-04-26 10:11:53 +00:00
parent 987b06a53e
commit 1214623cf9
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/ASTCache.java
View file

@ -411,11 +411,7 @@ public class ASTCache {
if (ast == null)
return "null"; //$NON-NLS-1$
IASTNode[] nodes= ast.getDeclarations();
if (nodes != null && nodes.length > 0)
return nodes[0].getRawSignature();
else
return "AST without any declaration"; //$NON-NLS-1$
return ast.getFilePath();
}
}

13
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/LocationMap.java
View file

@ -1719,11 +1719,11 @@ public class LocationMap implements ILocationResolver, IScannerPreprocessorLog {
* @see org.eclipse.cdt.internal.core.parser.scanner2.ILocationResolver#getIncludeDirectives()
*/
public IASTPreprocessorIncludeStatement[] getIncludeDirectives() {
int size = collectContexts(V_INCLUSIONS, tu, null, 0);
int size = collectContexts(V_INCLUDE_DIRECTIVES, tu, null, 0);
if (size == 0)
return EMPTY_INCLUDES_ARRAY;
_Context[] contexts = new _Context[size];
collectContexts(V_INCLUSIONS, tu, contexts, 0);
collectContexts(V_INCLUDE_DIRECTIVES, tu, contexts, 0);
IASTPreprocessorIncludeStatement[] result = new IASTPreprocessorIncludeStatement[size];
for (int i = 0; i < size; ++i)
result[i] = (IASTPreprocessorIncludeStatement)createPreprocessorStatement(contexts[i]);
@ -2482,6 +2482,8 @@ public class LocationMap implements ILocationResolver, IScannerPreprocessorLog {
protected static final int V_MACRODEFSUNDEFS = 6;
protected static final int V_INCLUDE_DIRECTIVES = 7;
private static final char[] EMPTY_CHAR_ARRAY = "".toCharArray(); //$NON-NLS-1$
private static final IASTName[] EMPTY_NAME_ARRAY = new IASTName[0];
@ -2503,6 +2505,13 @@ public class LocationMap implements ILocationResolver, IScannerPreprocessorLog {
++count;
break;
case V_INCLUSIONS:
if (source instanceof _Inclusion) {
if (result != null)
result[startAt++] = source;
++count;
}
break;
case V_INCLUDE_DIRECTIVES:
if (source instanceof _IPreprocessorIncludeDirective) {
if (result != null)
result[startAt++] = source;