mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-28 11:25:35 +02:00
Code Issues Wiki Activity

Testcases and fixes for selecting nodes by file offsets.

Browse source
This commit is contained in:
Markus Schorn 2008-03-05 12:41:59 +00:00
parent 789b2ea330
commit b4d5bb7a67
3 changed files with 66 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/ASTNodeSelectorTest.java
View file

@ -354,7 +354,7 @@ public class ASTNodeSelectorTest extends AST2BaseTest {
int x1= fCode.indexOf("EXPLICIT;"); int x1= fCode.indexOf("EXPLICIT;");
testContainedName(x1, fCode.length(), "EXPLICIT"); testContainedName(x1, fCode.length(), "EXPLICIT");
testName(x1, x1+8, "EXPLICIT"); testName(x1, x1+8, "EXPLICIT");
testEnclosingName(x1, 0, "EXPLICIT"); testEnclosingName(x1, x1, "EXPLICIT");
} }
// #define shift_offsets // #define shift_offsets
@ -367,6 +367,64 @@ public class ASTNodeSelectorTest extends AST2BaseTest {
int x1= fCode.indexOf("NESTED)"); int x1= fCode.indexOf("NESTED)");
testContainedName(x1, fCode.length(), "NESTED"); testContainedName(x1, fCode.length(), "NESTED");
testName(x1, x1+6, "NESTED"); testName(x1, x1+6, "NESTED");
testEnclosingName(x1, 0, "NESTED"); testEnclosingName(x1, x1, "NESTED");
} }
// #define id(x,y) x y
// id(int a, =1);
// id(int b=, a);
public void testImageLocations() {
int a1= fCode.indexOf("a");
int a2= fCode.indexOf("a", a1+1);
int b1= fCode.indexOf("b");
testName(a1, a1+1, "a");
testContainedName(a1-1, a2+2, "a");
testEnclosingName(a1, a1, "a");
testEnclosingName(a1+1, a1+1, "a");
testName(a2, a2+1, "a");
testContainedName(a2-1, a2+2, "a");
testEnclosingName(a2, a2, "a");
testEnclosingName(a2+1, a2+1, "a");
testEnclosingNode(a1-1, a1+1, "id(int a, =1)");
testContainedNode(a1-8, a1+1, "id");
}
// namespace ns {int a;}
// int x= ns::a;
// #define M int b;
// M
// #define N() int c;
// N()
// #define O
// #define P()
// P()O
public void testOrdering() {
int x1= fCode.indexOf("ns::a");
int x2= x1 + "ns::a".length();
testContainedName(x1, x2, "ns");
testEnclosingName(x2-1, x2-1, "a");
testEnclosingName(x2, x2, "a");
x1= fCode.indexOf("M"); x1= fCode.indexOf("M", x1+1);
testNode(x1, x1+1, "M");
testEnclosingNode(x1, x1, "M");
testEnclosingNode(x1+1, x1+1, "M");
testContainedNode(x1-1, x1+2, "M");
x1= fCode.indexOf("N"); x1= fCode.indexOf("N", x1+1);
testNode(x1, x1+1, "N");
testEnclosingNode(x1, x1, "N");
testEnclosingNode(x1+1, x1+1, "N");
testContainedNode(x1-1, x1+2, "N");
x1= fCode.indexOf("O"); x1= fCode.indexOf("O", x1+1);
testNode(x1, x1+1, "O");
testEnclosingNode(x1, x1, "O");
testEnclosingNode(x1+1, x1+1, "O");
testContainedNode(x1-1, x1+2, "O");
}
} }

3
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTNodeSelector.java
View file

@ -52,6 +52,9 @@ public class ASTNodeSelector implements IASTNodeSelector {
if (!fIsValid) { if (!fIsValid) {
return null; return null;
} }
if (lengthInFile < 0) {
throw new IllegalArgumentException("Length cannot be less than zero."); //$NON-NLS-1$
}
int sequenceLength; int sequenceLength;
int altSequenceNumber= -1; int altSequenceNumber= -1;
int sequenceNumber= fLocationResolver.getSequenceNumberForFileOffset(fFilePath, offsetInFile); int sequenceNumber= fLocationResolver.getSequenceNumberForFileOffset(fFilePath, offsetInFile);

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTNodeSpecification.java
View file

@ -144,7 +144,7 @@ public class ASTNodeSpecification<T extends IASTNode> {
final int endOffset= offset+length; final int endOffset= offset+length;
switch(fRelation) { switch(fRelation) {
case EXACT_MATCH: case EXACT_MATCH:
return !isParent(cand, fBestNode); return isParent(fBestNode, cand);
case FIRST_CONTAINED: case FIRST_CONTAINED:
if (offset < fBestOffset) { if (offset < fBestOffset) {
return true; return true;
@ -153,7 +153,7 @@ public class ASTNodeSpecification<T extends IASTNode> {
if (endOffset < fBestEndOffset) { if (endOffset < fBestEndOffset) {
return true; return true;
} }
return endOffset == fBestEndOffset && !isParent(cand, fBestNode); return endOffset == fBestEndOffset && isParent(fBestNode, cand);
} }
return false; return false;
case ENCLOSING: case ENCLOSING:
@ -161,7 +161,7 @@ public class ASTNodeSpecification<T extends IASTNode> {
if (length < bestLength) { if (length < bestLength) {
return true; return true;
} }
return length == bestLength && !isParent(cand, fBestNode); return length == bestLength && isParent(fBestNode, cand);
default: default:
assert false; assert false;
return false; return false;