mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-02 13:55:39 +02:00
Code Issues Wiki Activity

Correct determination of default template arguments, bug 281781.

Browse source
This commit is contained in:
Markus Schorn 2009-07-01 16:53:45 +00:00
parent aa1e4bd52c
commit be997b5279
4 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateNonTypeParameter.java
View file

@ -43,13 +43,15 @@ public class CPPTemplateNonTypeParameter extends CPPTemplateParameter implements
return null; return null;
for (IASTName name : nds) { for (IASTName name : nds) {
IASTNode parent = name.getParent(); if (name != null) {
assert parent instanceof IASTDeclarator; IASTNode parent = name.getParent();
if (parent instanceof IASTDeclarator) { assert parent instanceof IASTDeclarator;
IASTDeclarator dtor = (IASTDeclarator) parent; if (parent instanceof IASTDeclarator) {
IASTInitializer initializer = dtor.getInitializer(); IASTDeclarator dtor = (IASTDeclarator) parent;
if (initializer instanceof IASTInitializerExpression) IASTInitializer initializer = dtor.getInitializer();
return ((IASTInitializerExpression) initializer).getExpression(); if (initializer instanceof IASTInitializerExpression)
return ((IASTInitializerExpression) initializer).getExpression();
}
} }
} }
return null; return null;

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java
View file

@ -95,13 +95,15 @@ public class CPPTemplateTemplateParameter extends CPPTemplateParameter implement
if (nds == null || nds.length == 0) if (nds == null || nds.length == 0)
return null; return null;
for (IASTName nd : nds) { for (IASTName nd : nds) {
IASTNode parent = nd.getParent(); if (nd != null) {
assert parent instanceof ICPPASTTemplatedTypeTemplateParameter; IASTNode parent = nd.getParent();
if (parent instanceof ICPPASTTemplatedTypeTemplateParameter) { assert parent instanceof ICPPASTTemplatedTypeTemplateParameter;
ICPPASTTemplatedTypeTemplateParameter param = (ICPPASTTemplatedTypeTemplateParameter) parent; if (parent instanceof ICPPASTTemplatedTypeTemplateParameter) {
IASTExpression value = param.getDefaultValue(); ICPPASTTemplatedTypeTemplateParameter param = (ICPPASTTemplatedTypeTemplateParameter) parent;
if (value != null) IASTExpression value = param.getDefaultValue();
return CPPVisitor.createType(value); if (value != null)
return CPPVisitor.createType(value);
}
} }
} }
return null; return null;

16
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java
View file

@ -50,13 +50,15 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements
if (nds == null || nds.length == 0) if (nds == null || nds.length == 0)
return null; return null;
for (IASTName nd : nds) { for (IASTName nd : nds) {
IASTNode parent = nd.getParent(); if (nd != null) {
assert parent instanceof ICPPASTSimpleTypeTemplateParameter; IASTNode parent = nd.getParent();
if (parent instanceof ICPPASTSimpleTypeTemplateParameter) { assert parent instanceof ICPPASTSimpleTypeTemplateParameter;
ICPPASTSimpleTypeTemplateParameter simple = (ICPPASTSimpleTypeTemplateParameter) parent; if (parent instanceof ICPPASTSimpleTypeTemplateParameter) {
IASTTypeId typeId = simple.getDefaultType(); ICPPASTSimpleTypeTemplateParameter simple = (ICPPASTSimpleTypeTemplateParameter) parent;
if (typeId != null) IASTTypeId typeId = simple.getDefaultType();
return CPPVisitor.createType(typeId); if (typeId != null)
return CPPVisitor.createType(typeId);
}
} }
} }
return null; return null;

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMWriter.java
View file

@ -212,7 +212,7 @@ abstract public class PDOMWriter {
th= e; th= e;
} }
if (th != null) { if (th != null) {
stati.add(createStatus(NLS.bind(Messages.PDOMWriter_errorWhileParsing, ifl.getURI().getPath(), th))); stati.add(createStatus(NLS.bind(Messages.PDOMWriter_errorWhileParsing, ifl.getURI().getPath()), th));
} }
if (i<ifls.length-1) { if (i<ifls.length-1) {
updateFileCount(0, 0, 1); // update header count updateFileCount(0, 0, 1); // update header count