mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-24 09:25:31 +02:00
Fixed broken tests.
This commit is contained in:
parent
2706336f46
commit
31119f627e
5 changed files with 25 additions and 10 deletions
|
@ -278,6 +278,18 @@ public interface ICPPNodeFactory extends INodeFactory {
|
|||
@Deprecated
|
||||
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.
|
||||
* @since 5.3
|
||||
|
|
|
@ -499,12 +499,12 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
|
|||
}
|
||||
|
||||
@Override
|
||||
public IASTName newName() {
|
||||
public ICPPASTName newName() {
|
||||
return new CPPASTName();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IASTName newName(char[] name) {
|
||||
public ICPPASTName newName(char[] name) {
|
||||
return new CPPASTName(name);
|
||||
}
|
||||
|
||||
|
|
|
@ -698,7 +698,7 @@ public class ClassTypeHelper {
|
|||
Deque<ICPPBinding> result= new ArrayDeque<>();
|
||||
HashSet<String> handled= new HashSet<>();
|
||||
getSubClasses(index, mcl, result, handled);
|
||||
result.remove(0);
|
||||
result.removeFirst();
|
||||
return result.toArray(new ICPPClassType[result.size()]);
|
||||
}
|
||||
|
||||
|
|
|
@ -331,11 +331,12 @@ public class DeclarationGeneratorImpl extends DeclarationGenerator {
|
|||
IASTName name;
|
||||
if (qualifiedNameCharArray.length > 1) {
|
||||
char[] cs = qualifiedNameCharArray[qualifiedNameCharArray.length - 1];
|
||||
IASTName segment = factory.newName(cs);
|
||||
name = ((ICPPNodeFactory) factory).newQualifiedName((ICPPASTName) segment);
|
||||
ICPPNodeFactory cppFactory = (ICPPNodeFactory) factory;
|
||||
ICPPASTName segment = cppFactory.newName(cs);
|
||||
name = cppFactory.newQualifiedName(segment);
|
||||
for (int i = 0; i < qualifiedNameCharArray.length - 1; i++) {
|
||||
segment = factory.newName(cs);
|
||||
((ICPPASTQualifiedName) name).addName(factory.newName(qualifiedNameCharArray[i]));
|
||||
segment = cppFactory.newName(cs);
|
||||
((ICPPASTQualifiedName) name).addNameSpecifier(cppFactory.newName(qualifiedNameCharArray[i]));
|
||||
}
|
||||
} else if (qualifiedNameCharArray.length == 1) {
|
||||
name = factory.newName(qualifiedNameCharArray[0]);
|
||||
|
|
|
@ -72,13 +72,15 @@ public class ChangeFormatter {
|
|||
int newEnd = lineInfo.getOffset();
|
||||
newEnd = (originalEnd == 0 || code.charAt(originalEnd - 1) == '\n') && end == newEnd ?
|
||||
end : endOffset(lineInfo);
|
||||
if (newOffset <= prevEnd) {
|
||||
if (newOffset <= prevEnd && numRegions > 0) {
|
||||
numRegions--;
|
||||
newOffset = regions[numRegions].getOffset();
|
||||
}
|
||||
prevEnd = newEnd;
|
||||
regions[numRegions] = new Region(newOffset, newEnd - newOffset);
|
||||
numRegions++;
|
||||
if (newEnd != newOffset) { // Don't produce empty regions.
|
||||
regions[numRegions] = new Region(newOffset, newEnd - newOffset);
|
||||
numRegions++;
|
||||
}
|
||||
}
|
||||
|
||||
if (numRegions == 0)
|
||||
|
|
Loading…
Add table
Reference in a new issue