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

Fixed broken tests.

Browse source
This commit is contained in:
Sergey Prigogin 2014-10-31 14:09:39 -07:00
parent 2706336f46
commit 31119f627e
5 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
View file

@ -278,6 +278,18 @@ public interface ICPPNodeFactory extends INodeFactory {
@Deprecated @Deprecated
public ICPPASTQualifiedName newQualifiedName(); public ICPPASTQualifiedName newQualifiedName();
/**
* @since 5.9
*/
@Override
public ICPPASTName newName();
/**
* @since 5.9
*/
@Override
public ICPPASTName newName(char[] name);
/** /**
* Creates a range based for statement. * Creates a range based for statement.
* @since 5.3 * @since 5.3

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

@ -499,12 +499,12 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
} }
@Override @Override
public IASTName newName() { public ICPPASTName newName() {
return new CPPASTName(); return new CPPASTName();
} }
@Override @Override
public IASTName newName(char[] name) { public ICPPASTName newName(char[] name) {
return new CPPASTName(name); return new CPPASTName(name);
} }

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
View file

@ -698,7 +698,7 @@ public class ClassTypeHelper {
Deque<ICPPBinding> result= new ArrayDeque<>(); Deque<ICPPBinding> result= new ArrayDeque<>();
HashSet<String> handled= new HashSet<>(); HashSet<String> handled= new HashSet<>();
getSubClasses(index, mcl, result, handled); getSubClasses(index, mcl, result, handled);
result.remove(0); result.removeFirst();
return result.toArray(new ICPPClassType[result.size()]); return result.toArray(new ICPPClassType[result.size()]);
} }

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/DeclarationGeneratorImpl.java
View file

@ -331,11 +331,12 @@ public class DeclarationGeneratorImpl extends DeclarationGenerator {
IASTName name; IASTName name;
if (qualifiedNameCharArray.length > 1) { if (qualifiedNameCharArray.length > 1) {
char[] cs = qualifiedNameCharArray[qualifiedNameCharArray.length - 1]; char[] cs = qualifiedNameCharArray[qualifiedNameCharArray.length - 1];
IASTName segment = factory.newName(cs); ICPPNodeFactory cppFactory = (ICPPNodeFactory) factory;
name = ((ICPPNodeFactory) factory).newQualifiedName((ICPPASTName) segment); ICPPASTName segment = cppFactory.newName(cs);
name = cppFactory.newQualifiedName(segment);
for (int i = 0; i < qualifiedNameCharArray.length - 1; i++) { for (int i = 0; i < qualifiedNameCharArray.length - 1; i++) {
segment = factory.newName(cs); segment = cppFactory.newName(cs);
((ICPPASTQualifiedName) name).addName(factory.newName(qualifiedNameCharArray[i])); ((ICPPASTQualifiedName) name).addNameSpecifier(cppFactory.newName(qualifiedNameCharArray[i]));
} }
} else if (qualifiedNameCharArray.length == 1) { } else if (qualifiedNameCharArray.length == 1) {
name = factory.newName(qualifiedNameCharArray[0]); name = factory.newName(qualifiedNameCharArray[0]);

4
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/ChangeFormatter.java
View file

@ -72,14 +72,16 @@ public class ChangeFormatter {
int newEnd = lineInfo.getOffset(); int newEnd = lineInfo.getOffset();
newEnd = (originalEnd == 0 || code.charAt(originalEnd - 1) == '\n') && end == newEnd ? newEnd = (originalEnd == 0 || code.charAt(originalEnd - 1) == '\n') && end == newEnd ?
end : endOffset(lineInfo); end : endOffset(lineInfo);
if (newOffset <= prevEnd) { if (newOffset <= prevEnd && numRegions > 0) {
numRegions--; numRegions--;
newOffset = regions[numRegions].getOffset(); newOffset = regions[numRegions].getOffset();
} }
prevEnd = newEnd; prevEnd = newEnd;
if (newEnd != newOffset) { // Don't produce empty regions.
regions[numRegions] = new Region(newOffset, newEnd - newOffset); regions[numRegions] = new Region(newOffset, newEnd - newOffset);
numRegions++; numRegions++;
} }
}
if (numRegions == 0) if (numRegions == 0)
return rootEdit; return rootEdit;