mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2015-06-25 17:55:03 -07:00
parent 814ee56c8a
commit a8c1d14f8a
2 changed files with 149 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2TestBase.java
View file

@ -15,7 +15,6 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.core.parser.tests.ast2; package org.eclipse.cdt.core.parser.tests.ast2;
import static org.eclipse.cdt.core.parser.ParserLanguage.C;
import static org.eclipse.cdt.core.parser.ParserLanguage.CPP; import static org.eclipse.cdt.core.parser.ParserLanguage.CPP;
import java.io.IOException; import java.io.IOException;
@ -111,8 +110,7 @@ import junit.framework.AssertionFailedError;
*/ */
public class AST2TestBase extends BaseTestCase { public class AST2TestBase extends BaseTestCase {
public final static String TEST_CODE = "<testcode>"; public final static String TEST_CODE = "<testcode>";
protected static final ParserLanguage[] C_AND_CPP = new ParserLanguage[] { C, CPP }; protected static final IParserLogService NULL_LOG = new NullLogService();
protected static final IParserLogService NULL_LOG = new NullLogService();
protected static boolean sValidateCopy; protected static boolean sValidateCopy;
protected static class CommonCTypes { protected static class CommonCTypes {

387
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2Tests.java
View file

@ -230,8 +230,8 @@ public class AST2Tests extends AST2TestBase {
// function - void f() // function - void f()
IASTFunctionDefinition funcdef_f = (IASTFunctionDefinition) declarations[1]; IASTFunctionDefinition funcdef_f = (IASTFunctionDefinition) declarations[1];
IASTSimpleDeclSpecifier declspec_f = (IASTSimpleDeclSpecifier) funcdef_f IASTSimpleDeclSpecifier declspec_f =
.getDeclSpecifier(); (IASTSimpleDeclSpecifier) funcdef_f.getDeclSpecifier();
assertEquals(IASTSimpleDeclSpecifier.t_void, declspec_f.getType()); assertEquals(IASTSimpleDeclSpecifier.t_void, declspec_f.getType());
IASTFunctionDeclarator declor_f = funcdef_f.getDeclarator(); IASTFunctionDeclarator declor_f = funcdef_f.getDeclarator();
IASTName name_f = declor_f.getName(); IASTName name_f = declor_f.getName();
@ -239,24 +239,21 @@ public class AST2Tests extends AST2TestBase {
// parameter - int y // parameter - int y
assertTrue(declor_f instanceof IASTStandardFunctionDeclarator); assertTrue(declor_f instanceof IASTStandardFunctionDeclarator);
IASTParameterDeclaration decl_y = ((IASTStandardFunctionDeclarator) declor_f) IASTParameterDeclaration decl_y =
.getParameters()[0]; ((IASTStandardFunctionDeclarator) declor_f).getParameters()[0];
IASTSimpleDeclSpecifier declspec_y = (IASTSimpleDeclSpecifier) decl_y IASTSimpleDeclSpecifier declspec_y = (IASTSimpleDeclSpecifier) decl_y.getDeclSpecifier();
.getDeclSpecifier();
assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_y.getType()); assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_y.getType());
IASTDeclarator declor_y = decl_y.getDeclarator(); IASTDeclarator declor_y = decl_y.getDeclarator();
IASTName name_y = declor_y.getName(); IASTName name_y = declor_y.getName();
assertEquals("y", name_y.toString()); //$NON-NLS-1$ assertEquals("y", name_y.toString()); //$NON-NLS-1$
// int z // int z
IASTCompoundStatement body_f = (IASTCompoundStatement) funcdef_f IASTCompoundStatement body_f = (IASTCompoundStatement) funcdef_f.getBody();
.getBody(); IASTDeclarationStatement declstmt_z =
IASTDeclarationStatement declstmt_z = (IASTDeclarationStatement) body_f (IASTDeclarationStatement) body_f.getStatements()[0];
.getStatements()[0]; IASTSimpleDeclaration decl_z = (IASTSimpleDeclaration) declstmt_z.getDeclaration();
IASTSimpleDeclaration decl_z = (IASTSimpleDeclaration) declstmt_z IASTSimpleDeclSpecifier declspec_z =
.getDeclaration(); (IASTSimpleDeclSpecifier) decl_z.getDeclSpecifier();
IASTSimpleDeclSpecifier declspec_z = (IASTSimpleDeclSpecifier) decl_z
.getDeclSpecifier();
assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_z.getType()); assertEquals(IASTSimpleDeclSpecifier.t_int, declspec_z.getType());
IASTDeclarator declor_z = decl_z.getDeclarators()[0]; IASTDeclarator declor_z = decl_z.getDeclarators()[0];
IASTName name_z = declor_z.getName(); IASTName name_z = declor_z.getName();
@ -359,10 +356,8 @@ public class AST2Tests extends AST2TestBase {
IASTTranslationUnit tu = parse(getAboveComment(), C); IASTTranslationUnit tu = parse(getAboveComment(), C);
assertTrue(tu.isFrozen()); assertTrue(tu.isFrozen());
for (int i = 0; i < NUM_TESTS; i++) { for (int i = 0; i < NUM_TESTS; i++) {
IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
.getDeclarations()[0]; IASTCompositeTypeSpecifier type = (IASTCompositeTypeSpecifier) decl.getDeclSpecifier();
IASTCompositeTypeSpecifier type = (IASTCompositeTypeSpecifier) decl
.getDeclSpecifier();
// it's a typedef // it's a typedef
assertEquals(IASTDeclSpecifier.sc_typedef, type.getStorageClass()); assertEquals(IASTDeclSpecifier.sc_typedef, type.getStorageClass());
@ -372,10 +367,8 @@ public class AST2Tests extends AST2TestBase {
assertFalse(name_struct.isReference()); assertFalse(name_struct.isReference());
assertEquals("", name_struct.toString()); //$NON-NLS-1$ assertEquals("", name_struct.toString()); //$NON-NLS-1$
// member - x // member - x
IASTSimpleDeclaration decl_x = (IASTSimpleDeclaration) type IASTSimpleDeclaration decl_x = (IASTSimpleDeclaration) type.getMembers()[0];
.getMembers()[0]; IASTSimpleDeclSpecifier spec_x = (IASTSimpleDeclSpecifier) decl_x.getDeclSpecifier();
IASTSimpleDeclSpecifier spec_x = (IASTSimpleDeclSpecifier) decl_x
.getDeclSpecifier();
// it's an int // it's an int
assertEquals(IASTSimpleDeclSpecifier.t_int, spec_x.getType()); assertEquals(IASTSimpleDeclSpecifier.t_int, spec_x.getType());
IASTDeclarator tor_x = decl_x.getDeclarators()[0]; IASTDeclarator tor_x = decl_x.getDeclarators()[0];
@ -388,19 +381,15 @@ public class AST2Tests extends AST2TestBase {
assertEquals("S", name_S.toString()); //$NON-NLS-1$ assertEquals("S", name_S.toString()); //$NON-NLS-1$
// function f // function f
IASTFunctionDefinition def_f = (IASTFunctionDefinition) tu IASTFunctionDefinition def_f = (IASTFunctionDefinition) tu.getDeclarations()[1];
.getDeclarations()[1];
// f's body // f's body
IASTCompoundStatement body_f = (IASTCompoundStatement) def_f.getBody(); IASTCompoundStatement body_f = (IASTCompoundStatement) def_f.getBody();
// the declaration statement for myS // the declaration statement for myS
IASTDeclarationStatement declstmt_myS = (IASTDeclarationStatement) body_f IASTDeclarationStatement declstmt_myS = (IASTDeclarationStatement) body_f.getStatements()[0];
.getStatements()[0];
// the declaration for myS // the declaration for myS
IASTSimpleDeclaration decl_myS = (IASTSimpleDeclaration) declstmt_myS IASTSimpleDeclaration decl_myS = (IASTSimpleDeclaration) declstmt_myS.getDeclaration();
.getDeclaration();
// the type specifier for myS // the type specifier for myS
IASTNamedTypeSpecifier type_spec_myS = (IASTNamedTypeSpecifier) decl_myS IASTNamedTypeSpecifier type_spec_myS = (IASTNamedTypeSpecifier) decl_myS.getDeclSpecifier();
.getDeclSpecifier();
// the type name for myS // the type name for myS
IASTName name_type_myS = type_spec_myS.getName(); IASTName name_type_myS = type_spec_myS.getName();
// the declarator for myS // the declarator for myS
@ -408,14 +397,11 @@ public class AST2Tests extends AST2TestBase {
// the name for myS // the name for myS
IASTName name_myS = tor_myS.getName(); IASTName name_myS = tor_myS.getName();
// the assignment expression statement // the assignment expression statement
IASTExpressionStatement exprstmt = (IASTExpressionStatement) body_f IASTExpressionStatement exprstmt = (IASTExpressionStatement) body_f.getStatements()[1];
.getStatements()[1];
// the assignment expression // the assignment expression
IASTBinaryExpression assexpr = (IASTBinaryExpression) exprstmt IASTBinaryExpression assexpr = (IASTBinaryExpression) exprstmt.getExpression();
.getExpression();
// the field reference to myS.x // the field reference to myS.x
IASTFieldReference fieldref = (IASTFieldReference) assexpr IASTFieldReference fieldref = (IASTFieldReference) assexpr.getOperand1();
.getOperand1();
// the reference to myS // the reference to myS
IASTIdExpression ref_myS = (IASTIdExpression) fieldref.getFieldOwner(); IASTIdExpression ref_myS = (IASTIdExpression) fieldref.getFieldOwner();
IASTLiteralExpression lit_5 = (IASTLiteralExpression) assexpr.getOperand2(); IASTLiteralExpression lit_5 = (IASTLiteralExpression) assexpr.getOperand2();
@ -571,9 +557,8 @@ public class AST2Tests extends AST2TestBase {
} }
} }
public void testStructureTagScoping_1() throws Exception { public void testStructureTagScoping_1() throws Exception {
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
buffer.append("struct A; \n"); //$NON-NLS-1$ buffer.append("struct A; \n"); //$NON-NLS-1$
buffer.append("void f() { \n"); //$NON-NLS-1$ buffer.append("void f() { \n"); //$NON-NLS-1$
buffer.append(" struct A; \n"); //$NON-NLS-1$ buffer.append(" struct A; \n"); //$NON-NLS-1$
@ -585,8 +570,7 @@ public class AST2Tests extends AST2TestBase {
assertTrue(tu.isFrozen()); assertTrue(tu.isFrozen());
for (int i = 0; i < NUM_TESTS; i++) { for (int i = 0; i < NUM_TESTS; i++) {
// struct A; // struct A;
IASTSimpleDeclaration decl1 = (IASTSimpleDeclaration) tu IASTSimpleDeclaration decl1 = (IASTSimpleDeclaration) tu.getDeclarations()[0];
.getDeclarations()[0];
IASTElaboratedTypeSpecifier compTypeSpec = (IASTElaboratedTypeSpecifier) decl1.getDeclSpecifier(); IASTElaboratedTypeSpecifier compTypeSpec = (IASTElaboratedTypeSpecifier) decl1.getDeclSpecifier();
assertEquals(0, decl1.getDeclarators().length); assertEquals(0, decl1.getDeclarators().length);
IASTName nameA1 = compTypeSpec.getName(); IASTName nameA1 = compTypeSpec.getName();
@ -653,7 +637,7 @@ public class AST2Tests extends AST2TestBase {
} }
public void testStructureTagScoping_2() throws Exception { public void testStructureTagScoping_2() throws Exception {
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
buffer.append("struct A; \n"); //$NON-NLS-1$ buffer.append("struct A; \n"); //$NON-NLS-1$
buffer.append("void f() { \n"); //$NON-NLS-1$ buffer.append("void f() { \n"); //$NON-NLS-1$
buffer.append(" struct A * a; \n"); //$NON-NLS-1$ buffer.append(" struct A * a; \n"); //$NON-NLS-1$
@ -722,7 +706,7 @@ public class AST2Tests extends AST2TestBase {
// f("aaa"MACRO); // f("aaa"MACRO);
// } // }
public void testStringConcatenationWithMacro() throws Exception { public void testStringConcatenationWithMacro() throws Exception {
for (ParserLanguage lang : C_AND_CPP) { for (ParserLanguage lang : ParserLanguage.values()) {
BindingAssertionHelper bh = getAssertionHelper(lang); BindingAssertionHelper bh = getAssertionHelper(lang);
IASTName name = bh.findName("f(\"", 1); IASTName name = bh.findName("f(\"", 1);
assertNotNull(name); assertNotNull(name);
@ -733,7 +717,7 @@ public class AST2Tests extends AST2TestBase {
} }
public void testStructureDef() throws Exception { public void testStructureDef() throws Exception {
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
buffer.append("struct A; \r\n"); //$NON-NLS-1$ buffer.append("struct A; \r\n"); //$NON-NLS-1$
buffer.append("struct A * a; \n"); //$NON-NLS-1$ buffer.append("struct A * a; \n"); //$NON-NLS-1$
buffer.append("struct A { int i; }; \n"); //$NON-NLS-1$ buffer.append("struct A { int i; }; \n"); //$NON-NLS-1$
@ -766,8 +750,7 @@ public class AST2Tests extends AST2TestBase {
IASTName name_Adef = compTypeSpec.getName(); IASTName name_Adef = compTypeSpec.getName();
// int i; // int i;
IASTSimpleDeclaration decl4 = (IASTSimpleDeclaration) compTypeSpec IASTSimpleDeclaration decl4 = (IASTSimpleDeclaration) compTypeSpec.getMembers()[0];
.getMembers()[0];
dtor = decl4.getDeclarators()[0]; dtor = decl4.getDeclarators()[0];
IASTName name_i = dtor.getName(); IASTName name_i = dtor.getName();
@ -825,8 +808,7 @@ public class AST2Tests extends AST2TestBase {
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_i); assertEquals(decls[0], name_i);
decls = tu.getDeclarationsInAST(fndef.getDeclarator().getName() decls = tu.getDeclarationsInAST(fndef.getDeclarator().getName().resolveBinding());
.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], fndef.getDeclarator().getName()); assertEquals(decls[0], fndef.getDeclarator().getName());
@ -1104,12 +1086,9 @@ public class AST2Tests extends AST2TestBase {
// f(); // f();
IASTCompoundStatement compound = (IASTCompoundStatement) gdef.getBody(); IASTCompoundStatement compound = (IASTCompoundStatement) gdef.getBody();
IASTExpressionStatement expStatement = (IASTExpressionStatement) compound IASTExpressionStatement expStatement = (IASTExpressionStatement) compound.getStatements()[0];
.getStatements()[0]; IASTFunctionCallExpression fcall = (IASTFunctionCallExpression) expStatement.getExpression();
IASTFunctionCallExpression fcall = (IASTFunctionCallExpression) expStatement IASTIdExpression fcall_id = (IASTIdExpression) fcall.getFunctionNameExpression();
.getExpression();
IASTIdExpression fcall_id = (IASTIdExpression) fcall
.getFunctionNameExpression();
IASTName name_fcall = fcall_id.getName(); IASTName name_fcall = fcall_id.getName();
assertNull(fcall.getParameterExpression()); assertNull(fcall.getParameterExpression());
@ -1134,8 +1113,7 @@ public class AST2Tests extends AST2TestBase {
assertEquals(decls[0], name_f); assertEquals(decls[0], name_f);
assertEquals(decls[1], name_fdef); assertEquals(decls[1], name_fdef);
decls = tu.getDeclarationsInAST(gdef.getDeclarator().getName() decls = tu.getDeclarationsInAST(gdef.getDeclarator().getName().resolveBinding());
.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], gdef.getDeclarator().getName()); assertEquals(decls[0], gdef.getDeclarator().getName());
@ -1170,8 +1148,9 @@ public class AST2Tests extends AST2TestBase {
IASTForStatement for_stmt = (IASTForStatement) compound.getStatements()[0]; IASTForStatement for_stmt = (IASTForStatement) compound.getStatements()[0];
// int i = 0; // int i = 0;
IASTSimpleDeclaration initDecl = (IASTSimpleDeclaration) ((IASTDeclarationStatement) for_stmt IASTDeclarationStatement declStatement =
.getInitializerStatement()).getDeclaration(); (IASTDeclarationStatement) for_stmt.getInitializerStatement();
IASTSimpleDeclaration initDecl = (IASTSimpleDeclaration) declStatement.getDeclaration();
IASTDeclarator dtor = initDecl.getDeclarators()[0]; IASTDeclarator dtor = initDecl.getDeclarators()[0];
IASTName name_i = dtor.getName(); IASTName name_i = dtor.getName();
// i < 5; // i < 5;
@ -1203,8 +1182,7 @@ public class AST2Tests extends AST2TestBase {
assertSame(var_3, var_4); assertSame(var_3, var_4);
// test tu.getDeclarationsInAST(IBinding) // test tu.getDeclarationsInAST(IBinding)
IASTName[] decls = tu.getDeclarationsInAST(fdef.getDeclarator().getName() IASTName[] decls = tu.getDeclarationsInAST(fdef.getDeclarator().getName().resolveBinding());
.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], fdef.getDeclarator().getName()); assertEquals(decls[0], fdef.getDeclarator().getName());
@ -1265,8 +1243,9 @@ public class AST2Tests extends AST2TestBase {
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], fdef.getDeclarator().getName()); assertEquals(decls[0], fdef.getDeclarator().getName());
IASTCastExpression castExpression = (IASTCastExpression) ((IASTUnaryExpression) ((IASTFieldReference) expStatement.getExpression()).getFieldOwner()) fieldRef = (IASTFieldReference) expStatement.getExpression();
.getOperand(); IASTCastExpression castExpression =
(IASTCastExpression) ((IASTUnaryExpression) fieldRef.getFieldOwner()).getOperand();
IASTElaboratedTypeSpecifier elaboratedTypeSpecifier = ((IASTElaboratedTypeSpecifier) castExpression.getTypeId().getDeclSpecifier()); IASTElaboratedTypeSpecifier elaboratedTypeSpecifier = ((IASTElaboratedTypeSpecifier) castExpression.getTypeId().getDeclSpecifier());
decls = tu.getDeclarationsInAST(elaboratedTypeSpecifier.getName().resolveBinding()); decls = tu.getDeclarationsInAST(elaboratedTypeSpecifier.getName().resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
@ -1303,8 +1282,7 @@ public class AST2Tests extends AST2TestBase {
assertEquals(label_1, label_2); assertEquals(label_1, label_2);
// test tu.getDeclarationsInAST(IBinding) // test tu.getDeclarationsInAST(IBinding)
IASTName[] decls = tu.getDeclarationsInAST(collector.getName(0) IASTName[] decls = tu.getDeclarationsInAST(collector.getName(0).resolveBinding());
.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], collector.getName(0)); assertEquals(decls[0], collector.getName(0));
@ -1331,10 +1309,11 @@ public class AST2Tests extends AST2TestBase {
IASTSimpleDeclaration decl2 = (IASTSimpleDeclaration) tu.getDeclarations()[1]; IASTSimpleDeclaration decl2 = (IASTSimpleDeclaration) tu.getDeclarations()[1];
IASTName name_X1 = decl1.getDeclarators()[0].getName(); IASTName name_X1 = decl1.getDeclarators()[0].getName();
IASTName name_f = decl2.getDeclarators()[0].getName(); IASTName name_f = decl2.getDeclarators()[0].getName();
IASTName name_X2 = ((IASTNamedTypeSpecifier) ((IASTStandardFunctionDeclarator) decl2 IASTStandardFunctionDeclarator functionDecl =
.getDeclarators()[0]).getParameters()[0].getDeclSpecifier()).getName(); (IASTStandardFunctionDeclarator) decl2.getDeclarators()[0];
IASTName name_x = ((IASTStandardFunctionDeclarator) decl2 IASTName name_X2 =
.getDeclarators()[0]).getParameters()[0].getDeclarator().getName(); ((IASTNamedTypeSpecifier) functionDecl.getParameters()[0].getDeclSpecifier()).getName();
IASTName name_x = functionDecl.getParameters()[0].getDeclarator().getName();
IASTName[] decls = tu.getDeclarationsInAST(name_X1.resolveBinding()); IASTName[] decls = tu.getDeclarationsInAST(name_X1.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
@ -1354,15 +1333,13 @@ public class AST2Tests extends AST2TestBase {
tu = validateCopy(tu); tu = validateCopy(tu);
} }
} }
public void testLongLong() throws ParserException { public void testLongLong() throws ParserException {
IASTTranslationUnit tu = parse("long long x;\n", C); //$NON-NLS-1$ IASTTranslationUnit tu = parse("long long x;\n", C); //$NON-NLS-1$
// test tu.getDeclarationsInAST(IBinding) // test tu.getDeclarationsInAST(IBinding)
IASTSimpleDeclaration decl1 = (IASTSimpleDeclaration) tu IASTSimpleDeclaration decl1 = (IASTSimpleDeclaration) tu.getDeclarations()[0];
.getDeclarations()[0];
IASTName name_x = decl1.getDeclarators()[0].getName(); IASTName name_x = decl1.getDeclarators()[0].getName();
IASTName[] decls = tu.getDeclarationsInAST(name_x.resolveBinding()); IASTName[] decls = tu.getDeclarationsInAST(name_x.resolveBinding());
@ -1484,8 +1461,7 @@ public class AST2Tests extends AST2TestBase {
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_cp); assertEquals(decls[0], name_cp);
decls = tu.getDeclarationsInAST(fn.getDeclarator().getName() decls = tu.getDeclarationsInAST(fn.getDeclarator().getName().resolveBinding());
.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], fn.getDeclarator().getName()); assertEquals(decls[0], fn.getDeclarator().getName());
@ -1524,8 +1500,7 @@ public class AST2Tests extends AST2TestBase {
assertEquals(tu.getDeclarations().length, 1); assertEquals(tu.getDeclarations().length, 1);
IASTSimpleDeclaration d = (IASTSimpleDeclaration) tu.getDeclarations()[0]; IASTSimpleDeclaration d = (IASTSimpleDeclaration) tu.getDeclarations()[0];
assertEquals(d.getDeclarators().length, 1); assertEquals(d.getDeclarators().length, 1);
IASTStandardFunctionDeclarator f = (IASTStandardFunctionDeclarator) d IASTStandardFunctionDeclarator f = (IASTStandardFunctionDeclarator) d.getDeclarators()[0];
.getDeclarators()[0];
assertEquals(f.getName().toString(), ""); //$NON-NLS-1$ assertEquals(f.getName().toString(), ""); //$NON-NLS-1$
assertNotNull(f.getNestedDeclarator()); assertNotNull(f.getNestedDeclarator());
assertEquals(f.getNestedDeclarator().getName().toString(), "pfi"); //$NON-NLS-1$ assertEquals(f.getNestedDeclarator().getName().toString(), "pfi"); //$NON-NLS-1$
@ -1533,8 +1508,7 @@ public class AST2Tests extends AST2TestBase {
assertFalse(f.getNestedDeclarator().getPointerOperators().length == 0); assertFalse(f.getNestedDeclarator().getPointerOperators().length == 0);
// test tu.getDeclarationsInAST(IBinding) // test tu.getDeclarationsInAST(IBinding)
IASTName[] decls = tu.getDeclarationsInAST(f.getNestedDeclarator().getName() IASTName[] decls = tu.getDeclarationsInAST(f.getNestedDeclarator().getName().resolveBinding());
.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], f.getNestedDeclarator().getName()); assertEquals(decls[0], f.getNestedDeclarator().getName());
@ -1552,25 +1526,18 @@ public class AST2Tests extends AST2TestBase {
IASTTranslationUnit tu = parse(getAboveComment(), C); IASTTranslationUnit tu = parse(getAboveComment(), C);
assertTrue(tu.isFrozen()); assertTrue(tu.isFrozen());
for (int i = 0; i < NUM_TESTS; i++) { for (int i = 0; i < NUM_TESTS; i++) {
IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
.getDeclarations()[0]; IVariable a = (IVariable) decl.getDeclarators()[0].getName().resolveBinding();
IVariable a = (IVariable) decl.getDeclarators()[0].getName()
.resolveBinding();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[1]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[1];
IVariable b = (IVariable) decl.getDeclarators()[0].getName() IVariable b = (IVariable) decl.getDeclarators()[0].getName().resolveBinding();
.resolveBinding();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[2]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[2];
IVariable c = (IVariable) decl.getDeclarators()[0].getName() IVariable c = (IVariable) decl.getDeclarators()[0].getName().resolveBinding();
.resolveBinding();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[3]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[3];
IVariable d = (IVariable) decl.getDeclarators()[0].getName() IVariable d = (IVariable) decl.getDeclarators()[0].getName().resolveBinding();
.resolveBinding();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[4]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[4];
IVariable e = (IVariable) decl.getDeclarators()[0].getName() IVariable e = (IVariable) decl.getDeclarators()[0].getName().resolveBinding();
.resolveBinding();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[5]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[5];
IVariable f = (IVariable) decl.getDeclarators()[0].getName() IVariable f = (IVariable) decl.getDeclarators()[0].getName().resolveBinding();
.resolveBinding();
IType t_a_1 = a.getType(); IType t_a_1 = a.getType();
assertTrue(t_a_1 instanceof IBasicType); assertTrue(t_a_1 instanceof IBasicType);
@ -1839,28 +1806,20 @@ public class AST2Tests extends AST2TestBase {
decl = (IASTSimpleDeclaration) tu.getDeclarations()[1]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[1];
IFunction f = (IFunction) decl.getDeclarators()[0].getName().resolveBinding(); IFunction f = (IFunction) decl.getDeclarators()[0].getName().resolveBinding();
IASTName name_f = decl.getDeclarators()[0].getName(); IASTName name_f = decl.getDeclarators()[0].getName();
IASTName name_i = ((IASTStandardFunctionDeclarator) decl IASTName name_i = ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]).getParameters()[0].getDeclarator().getName();
.getDeclarators()[0]).getParameters()[0].getDeclarator().getName(); IASTName name_c = ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]).getParameters()[1].getDeclarator().getName();
IASTName name_c = ((IASTStandardFunctionDeclarator) decl
.getDeclarators()[0]).getParameters()[1].getDeclarator().getName();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[2]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[2];
IVariable g = (IVariable) decl.getDeclarators()[0] IVariable g = (IVariable) decl.getDeclarators()[0].getNestedDeclarator().getName().resolveBinding();
.getNestedDeclarator().getName().resolveBinding();
IASTName name_g = decl.getDeclarators()[0].getNestedDeclarator().getName(); IASTName name_g = decl.getDeclarators()[0].getNestedDeclarator().getName();
IASTName name_A2 = ((IASTElaboratedTypeSpecifier) ((IASTStandardFunctionDeclarator) decl IASTName name_A2 = ((IASTElaboratedTypeSpecifier) ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]).getParameters()[0].getDeclSpecifier()).getName();
.getDeclarators()[0]).getParameters()[0].getDeclSpecifier()).getName();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[3]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[3];
IVariable h = (IVariable) decl.getDeclarators()[0] IVariable h = (IVariable) decl.getDeclarators()[0].getNestedDeclarator().getNestedDeclarator().getName().resolveBinding();
.getNestedDeclarator().getNestedDeclarator().getName().resolveBinding(); IASTName name_h = decl.getDeclarators()[0].getNestedDeclarator().getNestedDeclarator().getName();
IASTName name_h = decl.getDeclarators()[0].getNestedDeclarator() IASTName name_A3 = ((IASTElaboratedTypeSpecifier) ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0].getNestedDeclarator()).getParameters()[0]
.getNestedDeclarator().getName();
IASTName name_A3 = ((IASTElaboratedTypeSpecifier) ((IASTStandardFunctionDeclarator) decl
.getDeclarators()[0].getNestedDeclarator()).getParameters()[0]
.getDeclSpecifier()).getName(); .getDeclSpecifier()).getName();
IASTName name_d = ((IASTStandardFunctionDeclarator) decl IASTName name_d = ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]).getParameters()[0].getDeclarator().getName();
.getDeclarators()[0]).getParameters()[0].getDeclarator().getName();
IFunctionType t_f = f.getType(); IFunctionType t_f = f.getType();
IType t_f_return = t_f.getReturnType(); IType t_f_return = t_f.getReturnType();
@ -1899,12 +1858,10 @@ public class AST2Tests extends AST2TestBase {
IType t_h_func_p1 = t_h_func_params[0]; IType t_h_func_p1 = t_h_func_params[0];
assertTrue(t_h_func_p1 instanceof IPointerType); assertTrue(t_h_func_p1 instanceof IPointerType);
assertTrue(((IPointerType) t_h_func_p1).getType() instanceof IPointerType); assertTrue(((IPointerType) t_h_func_p1).getType() instanceof IPointerType);
assertSame(((IPointerType) ((IPointerType) t_h_func_p1).getType()) assertSame(((IPointerType) ((IPointerType) t_h_func_p1).getType()).getType(), A);
.getType(), A);
assertTrue(t_h_func_return instanceof IPointerType); assertTrue(t_h_func_return instanceof IPointerType);
IFunctionType h_return = (IFunctionType) ((IPointerType) t_h_func_return) IFunctionType h_return = (IFunctionType) ((IPointerType) t_h_func_return).getType();
.getType();
IType h_r = h_return.getReturnType(); IType h_r = h_return.getReturnType();
IType[] h_ps = h_return.getParameterTypes(); IType[] h_ps = h_return.getParameterTypes();
assertTrue(h_r instanceof IBasicType); assertTrue(h_r instanceof IBasicType);
@ -1970,15 +1927,11 @@ public class AST2Tests extends AST2TestBase {
assertNotNull(tu); assertNotNull(tu);
IASTDeclaration[] declarations = tu.getDeclarations(); IASTDeclaration[] declarations = tu.getDeclarations();
IASTName name_Coord = ((IASTSimpleDeclaration) declarations[0]).getDeclarators()[0].getName(); IASTName name_Coord = ((IASTSimpleDeclaration) declarations[0]).getDeclarators()[0].getName();
IASTName name_x = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[0]) IASTName name_x = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[0]).getDeclSpecifier()).getMembers()[0]).getDeclarators()[0].getName();
.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0].getName(); IASTName name_y = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[0]).getDeclSpecifier()).getMembers()[1]).getDeclarators()[0].getName();
IASTName name_y = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[0])
.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0].getName();
IASTName name_Point = ((IASTSimpleDeclaration) declarations[1]).getDeclarators()[0].getName(); IASTName name_Point = ((IASTSimpleDeclaration) declarations[1]).getDeclarators()[0].getName();
IASTName name_pos = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[1]) IASTName name_pos = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[1]).getDeclSpecifier()).getMembers()[0]).getDeclarators()[0].getName();
.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0].getName(); IASTName name_width = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[1]).getDeclSpecifier()).getMembers()[1]).getDeclarators()[0].getName();
IASTName name_width = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) ((IASTSimpleDeclaration) declarations[1])
.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0].getName();
IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[2]; IASTFunctionDefinition main = (IASTFunctionDefinition) declarations[2];
IASTStatement[] statements = ((IASTCompoundStatement) main.getBody()).getStatements(); IASTStatement[] statements = ((IASTCompoundStatement) main.getBody()).getStatements();
@ -1986,33 +1939,22 @@ public class AST2Tests extends AST2TestBase {
IASTName name_Coord2 = ((IASTNamedTypeSpecifier) xy.getDeclSpecifier()).getName(); IASTName name_Coord2 = ((IASTNamedTypeSpecifier) xy.getDeclSpecifier()).getName();
IASTName name_xy = xy.getDeclarators()[0].getName(); IASTName name_xy = xy.getDeclarators()[0].getName();
IASTDeclarator declarator_xy = xy.getDeclarators()[0]; IASTDeclarator declarator_xy = xy.getDeclarators()[0];
IASTInitializer[] initializers1 = ((IASTInitializerList) ((IASTEqualsInitializer) declarator_xy.getInitializer()) IASTInitializer[] initializers1 = ((IASTInitializerList) ((IASTEqualsInitializer) declarator_xy.getInitializer()).getInitializerClause()).getInitializers();
.getInitializerClause()).getInitializers(); IASTName name_y2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers1[0]).getDesignators()[0]).getName();
IASTName name_y2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers1[0])
.getDesignators()[0]).getName();
// test bug 87649 // test bug 87649
assertEquals(((ASTNode) (ICASTDesignatedInitializer) initializers1[0]) assertEquals(((ASTNode) (ICASTDesignatedInitializer) initializers1[0]).getLength(), 7);
.getLength(), 7);
IASTName name_x2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers1[1]) IASTName name_x2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers1[1]).getDesignators()[0]).getName();
.getDesignators()[0]).getName();
IASTSimpleDeclaration point = (IASTSimpleDeclaration) ((IASTDeclarationStatement) statements[1]) IASTSimpleDeclaration point = (IASTSimpleDeclaration) ((IASTDeclarationStatement) statements[1]).getDeclaration();
.getDeclaration(); IASTName name_Point2 = ((IASTNamedTypeSpecifier) point.getDeclSpecifier()).getName();
IASTName name_Point2 = ((IASTNamedTypeSpecifier) point
.getDeclSpecifier()).getName();
IASTName name_point = point.getDeclarators()[0].getName(); IASTName name_point = point.getDeclarators()[0].getName();
IASTDeclarator declarator_point = point.getDeclarators()[0]; IASTDeclarator declarator_point = point.getDeclarators()[0];
IASTInitializer[] initializers2 = ((IASTInitializerList) ((IASTEqualsInitializer) declarator_point IASTInitializer[] initializers2 = ((IASTInitializerList) ((IASTEqualsInitializer) declarator_point.getInitializer()).getInitializerClause()).getInitializers();
.getInitializer()).getInitializerClause()).getInitializers(); IASTName name_width2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers2[0]).getDesignators()[0]).getName();
IASTName name_width2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers2[0]) IASTName name_pos2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers2[1]).getDesignators()[0]).getName();
.getDesignators()[0]).getName(); IASTName name_xy2 = ((IASTIdExpression) ((IASTUnaryExpression) ((IASTEqualsInitializer) ((ICASTDesignatedInitializer) initializers2[1]).getOperandInitializer()).getInitializerClause()).getOperand()).getName();
IASTName name_pos2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers2[1])
.getDesignators()[0]).getName();
IASTName name_xy2 = ((IASTIdExpression) ((IASTUnaryExpression) ((IASTEqualsInitializer) ((ICASTDesignatedInitializer) initializers2[1])
.getOperandInitializer()).getInitializerClause()).getOperand())
.getName();
for (int j = 0; j < 2; ++j) { for (int j = 0; j < 2; ++j) {
ICASTDesignatedInitializer designatedInitializer = (ICASTDesignatedInitializer) initializers1[j]; ICASTDesignatedInitializer designatedInitializer = (ICASTDesignatedInitializer) initializers1[j];
@ -2076,19 +2018,12 @@ public class AST2Tests extends AST2TestBase {
IASTSimpleDeclaration S_decl = (IASTSimpleDeclaration) tu.getDeclarations()[0]; IASTSimpleDeclaration S_decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
IASTFunctionDefinition f_def = (IASTFunctionDefinition) tu.getDeclarations()[1]; IASTFunctionDefinition f_def = (IASTFunctionDefinition) tu.getDeclarations()[1];
IASTName a1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl IASTName a1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0].getName();
.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0] IASTName b1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0].getName();
.getName(); final IASTDeclarator dtor = ((IASTSimpleDeclaration) ((IASTDeclarationStatement) ((IASTCompoundStatement) f_def.getBody()).getStatements()[0]).getDeclaration()).getDeclarators()[0];
IASTName b1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl
.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0]
.getName();
final IASTDeclarator dtor = ((IASTSimpleDeclaration) ((IASTDeclarationStatement) ((IASTCompoundStatement) f_def
.getBody()).getStatements()[0]).getDeclaration()).getDeclarators()[0];
final IASTInitializerList initializerList = (IASTInitializerList) ((IASTEqualsInitializer) dtor.getInitializer()).getInitializerClause(); final IASTInitializerList initializerList = (IASTInitializerList) ((IASTEqualsInitializer) dtor.getInitializer()).getInitializerClause();
IASTName a2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializerList.getInitializers()[0]) IASTName a2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializerList.getInitializers()[0]).getDesignators()[0]).getName();
.getDesignators()[0]).getName(); IASTName b2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializerList.getInitializers()[1]).getDesignators()[0]).getName();
IASTName b2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializerList.getInitializers()[1])
.getDesignators()[0]).getName();
assertEquals(a1.resolveBinding(), a2.resolveBinding()); assertEquals(a1.resolveBinding(), a2.resolveBinding());
assertEquals(b1.resolveBinding(), b2.resolveBinding()); assertEquals(b1.resolveBinding(), b2.resolveBinding());
@ -2115,18 +2050,11 @@ public class AST2Tests extends AST2TestBase {
for (int i = 0; i < NUM_TESTS; i++) { for (int i = 0; i < NUM_TESTS; i++) {
IASTSimpleDeclaration S_decl = (IASTSimpleDeclaration) tu.getDeclarations()[0]; IASTSimpleDeclaration S_decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
IASTName a1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl IASTName a1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0].getName();
.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0] IASTName b1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0].getName();
.getName(); final IASTInitializer[] initializers = ((IASTInitializerList) ((IASTEqualsInitializer) S_decl.getDeclarators()[0].getInitializer()).getInitializerClause()).getInitializers();
IASTName b1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl IASTName a2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers[0]).getDesignators()[0]).getName();
.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0] IASTName b2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers[1]).getDesignators()[0]).getName();
.getName();
final IASTInitializer[] initializers = ((IASTInitializerList) ((IASTEqualsInitializer) S_decl
.getDeclarators()[0].getInitializer()).getInitializerClause()).getInitializers();
IASTName a2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers[0])
.getDesignators()[0]).getName();
IASTName b2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) initializers[1])
.getDesignators()[0]).getName();
assertEquals(a1.resolveBinding(), a2.resolveBinding()); assertEquals(a1.resolveBinding(), a2.resolveBinding());
assertEquals(b1.resolveBinding(), b2.resolveBinding()); assertEquals(b1.resolveBinding(), b2.resolveBinding());
@ -2157,18 +2085,12 @@ public class AST2Tests extends AST2TestBase {
IASTSimpleDeclaration S_decl = (IASTSimpleDeclaration) tu.getDeclarations()[0]; IASTSimpleDeclaration S_decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
IASTSimpleDeclaration x_decl = (IASTSimpleDeclaration) tu.getDeclarations()[3]; IASTSimpleDeclaration x_decl = (IASTSimpleDeclaration) tu.getDeclarations()[3];
IASTName a1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl IASTName a1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0].getName();
.getDeclSpecifier()).getMembers()[0]).getDeclarators()[0] IASTName b1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0].getName();
.getName();
IASTName b1 = ((IASTSimpleDeclaration) ((IASTCompositeTypeSpecifier) S_decl
.getDeclSpecifier()).getMembers()[1]).getDeclarators()[0]
.getName();
IASTInitializer initializer = x_decl.getDeclarators()[0].getInitializer(); IASTInitializer initializer = x_decl.getDeclarators()[0].getInitializer();
initializer= (IASTInitializer) ((IASTEqualsInitializer) initializer).getInitializerClause(); initializer= (IASTInitializer) ((IASTEqualsInitializer) initializer).getInitializerClause();
IASTName a2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) ((IASTInitializerList) initializer).getInitializers()[0]) IASTName a2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) ((IASTInitializerList) initializer).getInitializers()[0]).getDesignators()[0]).getName();
.getDesignators()[0]).getName(); IASTName b2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) ((IASTInitializerList) initializer).getInitializers()[1]).getDesignators()[0]).getName();
IASTName b2 = ((ICASTFieldDesignator) ((ICASTDesignatedInitializer) ((IASTInitializerList) initializer).getInitializers()[1])
.getDesignators()[0]).getName();
assertEquals(a1.resolveBinding(), a2.resolveBinding()); assertEquals(a1.resolveBinding(), a2.resolveBinding());
assertEquals(b1.resolveBinding(), b2.resolveBinding()); assertEquals(b1.resolveBinding(), b2.resolveBinding());
@ -2226,9 +2148,7 @@ public class AST2Tests extends AST2TestBase {
assertTrue(((IPointerType) ft.getParameterTypes()[0]).isConst()); assertTrue(((IPointerType) ft.getParameterTypes()[0]).isConst());
// test tu.getDeclarationsInAST(IBinding) // test tu.getDeclarationsInAST(IBinding)
IASTName name_parm = ((IASTStandardFunctionDeclarator) def IASTName name_parm = ((IASTStandardFunctionDeclarator) def.getDeclarators()[0]).getParameters()[0].getDeclarator().getName();
.getDeclarators()[0]).getParameters()[0].getDeclarator()
.getName();
IASTName[] decls = tu.getDeclarationsInAST(name_parm.resolveBinding()); IASTName[] decls = tu.getDeclarationsInAST(name_parm.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_parm); assertEquals(decls[0], name_parm);
@ -2316,12 +2236,9 @@ public class AST2Tests extends AST2TestBase {
// test tu.getDeclarationsInAST(IBinding) // test tu.getDeclarationsInAST(IBinding)
assertTrue(def.getDeclarator() instanceof IASTStandardFunctionDeclarator); assertTrue(def.getDeclarator() instanceof IASTStandardFunctionDeclarator);
IASTName name_g = ((IASTStandardFunctionDeclarator) def.getDeclarator()) IASTName name_g = ((IASTStandardFunctionDeclarator) def.getDeclarator()).getParameters()[0].getDeclarator().getName();
.getParameters()[0].getDeclarator().getName();
IASTName name_g_call = IASTName name_g_call =
((IASTIdExpression) ((IASTFunctionCallExpression) ((IASTReturnStatement) ((IASTCompoundStatement) def ((IASTIdExpression) ((IASTFunctionCallExpression) ((IASTReturnStatement) ((IASTCompoundStatement) def.getBody()).getStatements()[0]).getReturnValue()).getFunctionNameExpression()).getName();
.getBody()).getStatements()[0]).getReturnValue())
.getFunctionNameExpression()).getName();
IASTName[] decls = tu.getDeclarationsInAST(name_g_call.resolveBinding()); IASTName[] decls = tu.getDeclarationsInAST(name_g_call.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_g); assertEquals(decls[0], name_g);
@ -2336,8 +2253,7 @@ public class AST2Tests extends AST2TestBase {
assertTrue(tu.isFrozen()); assertTrue(tu.isFrozen());
for (int i = 0; i < NUM_TESTS; i++) { for (int i = 0; i < NUM_TESTS; i++) {
IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0]; IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
IVariable v = (IVariable) ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]) IVariable v = (IVariable) ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]).getNestedDeclarator().getName().resolveBinding();
.getNestedDeclarator().getName().resolveBinding();
IType vt_1 = v.getType(); IType vt_1 = v.getType();
assertTrue(vt_1 instanceof IArrayType); assertTrue(vt_1 instanceof IArrayType);
@ -2361,12 +2277,9 @@ public class AST2Tests extends AST2TestBase {
assertEquals(((IBasicType) vpt_2_2).getType(), IBasicType.t_int); assertEquals(((IBasicType) vpt_2_2).getType(), IBasicType.t_int);
// test tu.getDeclarationsInAST(IBinding) // test tu.getDeclarationsInAST(IBinding)
IASTName[] decls = tu.getDeclarationsInAST(((IASTStandardFunctionDeclarator) decl IASTName[] decls = tu.getDeclarationsInAST(((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]).getNestedDeclarator().getName().resolveBinding());
.getDeclarators()[0]).getNestedDeclarator().getName()
.resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]) assertEquals(decls[0], ((IASTStandardFunctionDeclarator) decl.getDeclarators()[0]).getNestedDeclarator().getName());
.getNestedDeclarator().getName());
tu = validateCopy(tu); tu = validateCopy(tu);
} }
@ -2413,13 +2326,11 @@ public class AST2Tests extends AST2TestBase {
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_DWORD); assertEquals(decls[0], name_DWORD);
decls = tu.getDeclarationsInAST(((IASTNamedTypeSpecifier) decl2.getDeclSpecifier()) decls = tu.getDeclarationsInAST(((IASTNamedTypeSpecifier) decl2.getDeclSpecifier()).getName().resolveBinding());
.getName().resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_DWORD); assertEquals(decls[0], name_DWORD);
decls = tu.getDeclarationsInAST(((IASTNamedTypeSpecifier) decl3 decls = tu.getDeclarationsInAST(((IASTNamedTypeSpecifier) decl3.getDeclSpecifier()).getName().resolveBinding());
.getDeclSpecifier()).getName().resolveBinding());
assertEquals(decls.length, 1); assertEquals(decls.length, 1);
assertEquals(decls[0], name_v); assertEquals(decls[0], name_v);
@ -2469,8 +2380,7 @@ public class AST2Tests extends AST2TestBase {
assertTrue(signal_ret_ret_1 instanceof ITypedef); assertTrue(signal_ret_ret_1 instanceof ITypedef);
IType signal_ret_ret_2 = ((ITypedef) signal_ret_ret_1).getType(); IType signal_ret_ret_2 = ((ITypedef) signal_ret_ret_1).getType();
assertTrue(signal_ret_ret_2 instanceof IBasicType); assertTrue(signal_ret_ret_2 instanceof IBasicType);
assertEquals(((IBasicType) signal_ret_ret_2).getType(), assertEquals(((IBasicType) signal_ret_ret_2).getType(), IBasicType.t_void);
IBasicType.t_void);
assertTrue(((ITypedef) signal_ret_ret_1).getName().equals("DWORD")); //$NON-NLS-1$ assertTrue(((ITypedef) signal_ret_ret_1).getName().equals("DWORD")); //$NON-NLS-1$
IType signal_parm_t1 = signal_t.getParameterTypes()[0]; IType signal_parm_t1 = signal_t.getParameterTypes()[0];
@ -2518,15 +2428,15 @@ public class AST2Tests extends AST2TestBase {
assertTrue(tu.isFrozen()); assertTrue(tu.isFrozen());
for (int i = 0; i < NUM_TESTS; i++) { for (int i = 0; i < NUM_TESTS; i++) {
IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0]; IASTSimpleDeclaration decl = (IASTSimpleDeclaration) tu.getDeclarations()[0];
ITypedef fv = (ITypedef) decl.getDeclarators()[0].getName().resolveBinding(); IASTDeclarator[] declarators = decl.getDeclarators();
ITypedef pfv = (ITypedef) decl.getDeclarators()[1].getNestedDeclarator().getName().resolveBinding(); ITypedef fv = (ITypedef) declarators[0].getName().resolveBinding();
ITypedef pfv = (ITypedef) declarators[1].getNestedDeclarator().getName().resolveBinding();
IType fv_t = fv.getType(); IType fv_t = fv.getType();
assertEquals(((IBasicType) ((IFunctionType) fv_t).getReturnType()) assertEquals(((IBasicType) ((IFunctionType) fv_t).getReturnType()).getType(),
.getType(), IBasicType.t_void); IBasicType.t_void);
assertEquals( assertEquals(((IBasicType) ((IFunctionType) fv_t).getParameterTypes()[0]).getType(),
((IBasicType) ((IFunctionType) fv_t).getParameterTypes()[0]) IBasicType.t_int);
.getType(), IBasicType.t_int);
IType pfv_t = pfv.getType(); IType pfv_t = pfv.getType();
assertEquals(((IBasicType) ((IFunctionType) ((IPointerType) pfv_t) assertEquals(((IBasicType) ((IFunctionType) ((IPointerType) pfv_t)
@ -2536,16 +2446,18 @@ public class AST2Tests extends AST2TestBase {
IBasicType.t_int); IBasicType.t_int);
decl = (IASTSimpleDeclaration) tu.getDeclarations()[1]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[1];
IFunction signal1 = (IFunction) decl.getDeclarators()[0] declarators = decl.getDeclarators();
.getNestedDeclarator().getName().resolveBinding(); IFunction signal1 = (IFunction) declarators[0].getNestedDeclarator().getName().resolveBinding();
IType signal1_t = signal1.getType(); IType signal1_t = signal1.getType();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[2]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[2];
IFunction signal2 = (IFunction) decl.getDeclarators()[0].getName().resolveBinding(); declarators = decl.getDeclarators();
IFunction signal2 = (IFunction) declarators[0].getName().resolveBinding();
IType signal2_t = signal2.getType(); IType signal2_t = signal2.getType();
decl = (IASTSimpleDeclaration) tu.getDeclarations()[3]; decl = (IASTSimpleDeclaration) tu.getDeclarations()[3];
IFunction signal3 = (IFunction) decl.getDeclarators()[0].getName().resolveBinding(); declarators = decl.getDeclarators();
IFunction signal3 = (IFunction) declarators[0].getName().resolveBinding();
IType signal3_t = signal3.getType(); IType signal3_t = signal3.getType();
assertEquals( assertEquals(
@ -2567,8 +2479,8 @@ public class AST2Tests extends AST2TestBase {
((IBasicType) ((IFunctionType) ((ITypedef) ((IPointerType) ((IFunctionType) signal2_t) ((IBasicType) ((IFunctionType) ((ITypedef) ((IPointerType) ((IFunctionType) signal2_t)
.getReturnType()).getType()).getType()).getReturnType()) .getReturnType()).getType()).getType()).getReturnType())
.getType(), IBasicType.t_void); .getType(), IBasicType.t_void);
assertEquals(((IBasicType) ((IFunctionType) signal2_t) assertEquals(((IBasicType) ((IFunctionType) signal2_t).getParameterTypes()[0]).getType(),
.getParameterTypes()[0]).getType(), IBasicType.t_int); IBasicType.t_int);
assertEquals( assertEquals(
((IBasicType) ((IFunctionType) ((ITypedef) ((IPointerType) ((IFunctionType) signal2_t) ((IBasicType) ((IFunctionType) ((ITypedef) ((IPointerType) ((IFunctionType) signal2_t)
.getParameterTypes()[1]).getType()).getType()) .getParameterTypes()[1]).getType()).getType())
@ -2595,7 +2507,6 @@ public class AST2Tests extends AST2TestBase {
tu = validateCopy(tu); tu = validateCopy(tu);
} }
} }
// const int x = 10; // const int x = 10;
@ -3445,7 +3356,7 @@ public class AST2Tests extends AST2TestBase {
} }
public void testBug107150() throws Exception { public void testBug107150() throws Exception {
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\r\n"); //$NON-NLS-1$ buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\r\n"); //$NON-NLS-1$
buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\r\n"); //$NON-NLS-1$ buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\r\n"); //$NON-NLS-1$
buffer.append("return 0;\r\n"); //$NON-NLS-1$ buffer.append("return 0;\r\n"); //$NON-NLS-1$
@ -3459,7 +3370,7 @@ public class AST2Tests extends AST2TestBase {
tu = parse(buffer.toString(), CPP); tu = parse(buffer.toString(), CPP);
assertFalse(tu.getDeclarations()[1] instanceof IASTProblemDeclaration); assertFalse(tu.getDeclarations()[1] instanceof IASTProblemDeclaration);
buffer = new StringBuffer(); buffer = new StringBuilder();
buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\n"); //$NON-NLS-1$ buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\n"); //$NON-NLS-1$
buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\n"); //$NON-NLS-1$ buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\n"); //$NON-NLS-1$
buffer.append("return 0;\n"); //$NON-NLS-1$ buffer.append("return 0;\n"); //$NON-NLS-1$
@ -3475,7 +3386,7 @@ public class AST2Tests extends AST2TestBase {
} }
public void testBug107150b() throws Exception { public void testBug107150b() throws Exception {
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\r\n"); //$NON-NLS-1$ buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\r\n"); //$NON-NLS-1$
buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\r\n"); //$NON-NLS-1$ buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\r\n"); //$NON-NLS-1$
buffer.append("return 0;\r\n"); //$NON-NLS-1$ buffer.append("return 0;\r\n"); //$NON-NLS-1$
@ -3490,7 +3401,7 @@ public class AST2Tests extends AST2TestBase {
tu = parse(buffer.toString(), CPP); tu = parse(buffer.toString(), CPP);
assertFalse(tu.getDeclarations()[1] instanceof IASTProblemDeclaration); assertFalse(tu.getDeclarations()[1] instanceof IASTProblemDeclaration);
buffer = new StringBuffer(); buffer = new StringBuilder();
buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\n"); //$NON-NLS-1$ buffer.append("#define FUNC_PROTOTYPE_PARAMS(list) list\n"); //$NON-NLS-1$
buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\n"); //$NON-NLS-1$ buffer.append("int func1 FUNC_PROTOTYPE_PARAMS((int arg1)) {\n"); //$NON-NLS-1$
buffer.append("return 0;\n"); //$NON-NLS-1$ buffer.append("return 0;\n"); //$NON-NLS-1$
@ -3932,7 +3843,7 @@ public class AST2Tests extends AST2TestBase {
public void test195943() throws Exception { public void test195943() throws Exception {
final int depth= 100; final int depth= 100;
StringBuffer buffer = new StringBuffer(); StringBuilder buffer = new StringBuilder();
buffer.append("#define M0 1\n"); buffer.append("#define M0 1\n");
for (int i = 1; i < depth; i++) { for (int i = 1; i < depth; i++) {
buffer.append("#define M" + i + " (M" + (i-1) + "+1)\n"); buffer.append("#define M" + i + " (M" + (i-1) + "+1)\n");
@ -3953,8 +3864,7 @@ public class AST2Tests extends AST2TestBase {
try { try {
parse(content, C, false); parse(content, C, false);
fail("C89 does not allow empty braces in array initializer"); fail("C89 does not allow empty braces in array initializer");
} } catch (ParserException e) {
catch (ParserException e) {
} }
} }
@ -5280,7 +5190,7 @@ public class AST2Tests extends AST2TestBase {
final IASTTranslationUnit tu= parse(code + exprStr + ";}", lang); final IASTTranslationUnit tu= parse(code + exprStr + ";}", lang);
final IASTFunctionDefinition fdef= getDeclaration(tu, 2); final IASTFunctionDefinition fdef= getDeclaration(tu, 2);
IASTExpression expr= getExpressionOfStatement(fdef, 0); IASTExpression expr= getExpressionOfStatement(fdef, 0);
assertEquals("expr: " + exprStr, io[1].trim(), polnishNotation(expr)); assertEquals("expr: " + exprStr, io[1].trim(), polishNotation(expr));
assertEquals(exprStr, expr.getRawSignature()); assertEquals(exprStr, expr.getRawSignature());
checkOffsets(exprStr, expr); checkOffsets(exprStr, expr);
} }
@ -5320,7 +5230,7 @@ public class AST2Tests extends AST2TestBase {
final IASTTranslationUnit tu= parse(code + exprStr + ";}", lang); final IASTTranslationUnit tu= parse(code + exprStr + ";}", lang);
final IASTFunctionDefinition fdef= getDeclaration(tu, 4); final IASTFunctionDefinition fdef= getDeclaration(tu, 4);
IASTExpression expr= getExpressionOfStatement(fdef, 0); IASTExpression expr= getExpressionOfStatement(fdef, 0);
assertEquals("expr: " + exprStr, io[1].trim(), polnishNotation(expr)); assertEquals("expr: " + exprStr, io[1].trim(), polishNotation(expr));
assertEquals(exprStr, expr.getRawSignature()); assertEquals(exprStr, expr.getRawSignature());
checkOffsets(exprStr, expr); checkOffsets(exprStr, expr);
} }
@ -5345,7 +5255,7 @@ public class AST2Tests extends AST2TestBase {
final IASTTranslationUnit tu= parse(code + exprStr + ";}", lang); final IASTTranslationUnit tu= parse(code + exprStr + ";}", lang);
final IASTFunctionDefinition fdef= getDeclaration(tu, 1); final IASTFunctionDefinition fdef= getDeclaration(tu, 1);
IASTExpression expr= getExpressionOfStatement(fdef, 0); IASTExpression expr= getExpressionOfStatement(fdef, 0);
assertEquals("expr: " + exprStr, io[1].trim(), polnishNotation(expr)); assertEquals("expr: " + exprStr, io[1].trim(), polishNotation(expr));
assertEquals(exprStr, expr.getRawSignature()); assertEquals(exprStr, expr.getRawSignature());
checkOffsets(exprStr, expr); checkOffsets(exprStr, expr);
} }
@ -5372,7 +5282,7 @@ public class AST2Tests extends AST2TestBase {
IASTFunctionDeclarator fdtor= fdef.getDeclarator(); IASTFunctionDeclarator fdtor= fdef.getDeclarator();
IASTParameterDeclaration pdecl= (IASTParameterDeclaration) fdtor.getChildren()[1]; IASTParameterDeclaration pdecl= (IASTParameterDeclaration) fdtor.getChildren()[1];
IASTExpression expr= (IASTExpression) ((IASTEqualsInitializer) pdecl.getDeclarator().getInitializer()).getInitializerClause(); IASTExpression expr= (IASTExpression) ((IASTEqualsInitializer) pdecl.getDeclarator().getInitializer()).getInitializerClause();
assertEquals("expr: " + exprStr, io[1].trim(), polnishNotation(expr)); assertEquals("expr: " + exprStr, io[1].trim(), polishNotation(expr));
assertEquals(exprStr, expr.getRawSignature()); assertEquals(exprStr, expr.getRawSignature());
checkOffsets(exprStr, expr); checkOffsets(exprStr, expr);
} }
@ -5423,65 +5333,65 @@ public class AST2Tests extends AST2TestBase {
return ((ASTNode) expr).getOffset() + ((ASTNode) expr).getLength(); return ((ASTNode) expr).getOffset() + ((ASTNode) expr).getLength();
} }
private String polnishNotation(IASTExpression expr) { private String polishNotation(IASTExpression expr) {
StringBuilder buf= new StringBuilder(); StringBuilder buf= new StringBuilder();
polnishNotation(expr, buf); polishNotation(expr, buf);
return buf.toString(); return buf.toString();
} }
private void polnishNotation(IASTExpression expr, StringBuilder buf) { private void polishNotation(IASTExpression expr, StringBuilder buf) {
if (expr instanceof IASTConditionalExpression) { if (expr instanceof IASTConditionalExpression) {
IASTConditionalExpression bexpr= (IASTConditionalExpression) expr; IASTConditionalExpression bexpr= (IASTConditionalExpression) expr;
polnishNotation(bexpr.getLogicalConditionExpression(), buf); polishNotation(bexpr.getLogicalConditionExpression(), buf);
buf.append(','); buf.append(',');
polnishNotation(bexpr.getPositiveResultExpression(), buf); polishNotation(bexpr.getPositiveResultExpression(), buf);
buf.append(','); buf.append(',');
polnishNotation(bexpr.getNegativeResultExpression(), buf); polishNotation(bexpr.getNegativeResultExpression(), buf);
buf.append(','); buf.append(',');
buf.append('?'); buf.append('?');
} else if (expr instanceof IASTExpressionList) { } else if (expr instanceof IASTExpressionList) {
IASTExpressionList bexpr= (IASTExpressionList) expr; IASTExpressionList bexpr= (IASTExpressionList) expr;
IASTExpression[] args = bexpr.getExpressions(); IASTExpression[] args = bexpr.getExpressions();
for (IASTExpression e : args) { for (IASTExpression e : args) {
polnishNotation(e, buf); polishNotation(e, buf);
buf.append(','); buf.append(',');
} }
buf.append(','); buf.append(',');
} else if (expr instanceof IASTBinaryExpression) { } else if (expr instanceof IASTBinaryExpression) {
IASTBinaryExpression bexpr= (IASTBinaryExpression) expr; IASTBinaryExpression bexpr= (IASTBinaryExpression) expr;
polnishNotation(bexpr.getOperand1(), buf); polishNotation(bexpr.getOperand1(), buf);
buf.append(','); buf.append(',');
polnishNotation(bexpr.getOperand2(), buf); polishNotation(bexpr.getOperand2(), buf);
buf.append(','); buf.append(',');
buf.append(ASTStringUtil.getBinaryOperatorString(bexpr)); buf.append(ASTStringUtil.getBinaryOperatorString(bexpr));
} else if (expr instanceof IASTCastExpression) { } else if (expr instanceof IASTCastExpression) {
IASTCastExpression castExpr= (IASTCastExpression) expr; IASTCastExpression castExpr= (IASTCastExpression) expr;
buf.append(castExpr.getTypeId().getRawSignature()); buf.append(castExpr.getTypeId().getRawSignature());
buf.append(','); buf.append(',');
polnishNotation(castExpr.getOperand(), buf); polishNotation(castExpr.getOperand(), buf);
buf.append(",cast"); buf.append(",cast");
} else if (expr instanceof IASTFunctionCallExpression) { } else if (expr instanceof IASTFunctionCallExpression) {
IASTFunctionCallExpression f= (IASTFunctionCallExpression) expr; IASTFunctionCallExpression f= (IASTFunctionCallExpression) expr;
polnishNotation(f.getFunctionNameExpression(), buf); polishNotation(f.getFunctionNameExpression(), buf);
buf.append(','); buf.append(',');
polnishNotation(f.getParameterExpression(), buf); polishNotation(f.getParameterExpression(), buf);
buf.append(",()"); buf.append(",()");
} else if (expr instanceof IASTArraySubscriptExpression) { } else if (expr instanceof IASTArraySubscriptExpression) {
IASTArraySubscriptExpression f= (IASTArraySubscriptExpression) expr; IASTArraySubscriptExpression f= (IASTArraySubscriptExpression) expr;
polnishNotation(f.getArrayExpression(), buf); polishNotation(f.getArrayExpression(), buf);
buf.append(','); buf.append(',');
polnishNotation(f.getSubscriptExpression(), buf); polishNotation(f.getSubscriptExpression(), buf);
buf.append(",[]"); buf.append(",[]");
} else if (expr instanceof IASTFieldReference) { } else if (expr instanceof IASTFieldReference) {
IASTFieldReference f= (IASTFieldReference) expr; IASTFieldReference f= (IASTFieldReference) expr;
polnishNotation(f.getFieldOwner(), buf); polishNotation(f.getFieldOwner(), buf);
buf.append(','); buf.append(',');
buf.append(f.getFieldName().toString()); buf.append(f.getFieldName().toString());
buf.append(','); buf.append(',');
buf.append(f.isPointerDereference() ? "->" : "."); buf.append(f.isPointerDereference() ? "->" : ".");
} else if (expr instanceof IASTUnaryExpression) { } else if (expr instanceof IASTUnaryExpression) {
IASTUnaryExpression unaryExpr= (IASTUnaryExpression) expr; IASTUnaryExpression unaryExpr= (IASTUnaryExpression) expr;
polnishNotation(unaryExpr.getOperand(), buf); polishNotation(unaryExpr.getOperand(), buf);
switch (unaryExpr.getOperator()) { switch (unaryExpr.getOperator()) {
case IASTUnaryExpression.op_amper: case IASTUnaryExpression.op_amper:
case IASTUnaryExpression.op_plus: case IASTUnaryExpression.op_plus:
@ -7363,8 +7273,8 @@ public class AST2Tests extends AST2TestBase {
public void testParameterBindings_316931() throws Exception { public void testParameterBindings_316931() throws Exception {
String code= getAboveComment(); String code= getAboveComment();
parseAndCheckBindings(code); parseAndCheckBindings(code);
for (int k=0; k<2; k++) { for (ParserLanguage lang : ParserLanguage.values()) {
BindingAssertionHelper bh= new BindingAssertionHelper(code, k>0); BindingAssertionHelper bh= new BindingAssertionHelper(code, lang);
IParameter i= bh.assertNonProblem("i)", 1); IParameter i= bh.assertNonProblem("i)", 1);
IParameter j= bh.assertNonProblem("j)", 1); IParameter j= bh.assertNonProblem("j)", 1);
assertSame(i, j); assertSame(i, j);
@ -7605,8 +7515,7 @@ public class AST2Tests extends AST2TestBase {
// void waldo(...); // void waldo(...);
public void testVariadicCFunction_452416() throws Exception { public void testVariadicCFunction_452416() throws Exception {
String code= getAboveComment(); BindingAssertionHelper bh= getAssertionHelper(C);
BindingAssertionHelper bh= new BindingAssertionHelper(code, false /* not C++ */);
IFunction waldo = bh.assertNonProblem("waldo"); IFunction waldo = bh.assertNonProblem("waldo");
assertTrue(waldo.getType().takesVarArgs()); assertTrue(waldo.getType().takesVarArgs());
} }