mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

Bug 83855: visiting designators

Browse source
This commit is contained in:
Andrew Niefer 2005-01-27 21:10:10 +00:00
parent 868fa103f4
commit 6df133bc09
2 changed files with 73 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2177,4 +2177,45 @@ public class AST2Tests extends AST2BaseTest {
assertInstances( col, a, 6 ); assertInstances( col, a, 6 );
assertInstances( col, g, 3 ); assertInstances( col, g, 3 );
} }
public void testFieldDesignators() throws Exception {
StringBuffer buffer = new StringBuffer();
buffer.append( "typedef struct { int x; int y; } Coord; \n" ); //$NON-NLS-1$
buffer.append( "int f() { \n" ); //$NON-NLS-1$
buffer.append( " Coord xy = { .x = 10, .y = 11 }; \n" ); //$NON-NLS-1$
buffer.append( "} \n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C );
CNameCollector col = new CNameCollector();
CVisitor.visitTranslationUnit( tu, col );
assertEquals( col.size(), 9 );
IField x = (IField) col.getName( 1 ).resolveBinding();
IField y = (IField) col.getName( 2 ).resolveBinding();
ITypedef Coord = (ITypedef) col.getName( 3 ).resolveBinding();
assertInstances( col, x, 2 );
assertInstances( col, y, 2 );
assertInstances( col, Coord, 2 );
}
public void testArrayDesignator() throws Exception {
StringBuffer buffer = new StringBuffer();
buffer.append( "enum { member_one, member_two }; \n" ); //$NON-NLS-1$
buffer.append( "const char *nm[] = { \n" ); //$NON-NLS-1$
buffer.append( " [member_one] = \"one\", \n" ); //$NON-NLS-1$
buffer.append( " [member_two] = \"two\" \n" ); //$NON-NLS-1$
buffer.append( "}; \n" ); //$NON-NLS-1$
IASTTranslationUnit tu = parse( buffer.toString(), ParserLanguage.C );
CNameCollector col = new CNameCollector();
CVisitor.visitTranslationUnit( tu, col );
assertEquals( col.size(), 6 );
IEnumerator one = (IEnumerator) col.getName( 1 ).resolveBinding();
IEnumerator two = (IEnumerator) col.getName( 2 ).resolveBinding();
assertInstances( col, one, 2 );
assertInstances( col, two, 2 );
}
} }

33
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
View file

@ -74,9 +74,12 @@ import org.eclipse.cdt.core.dom.ast.IScope;
import org.eclipse.cdt.core.dom.ast.IType; import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.IVariable; import org.eclipse.cdt.core.dom.ast.IVariable;
import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator; import org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator;
import org.eclipse.cdt.core.dom.ast.c.ICASTArrayDesignator;
import org.eclipse.cdt.core.dom.ast.c.ICASTArrayModifier; import org.eclipse.cdt.core.dom.ast.c.ICASTArrayModifier;
import org.eclipse.cdt.core.dom.ast.c.ICASTCompositeTypeSpecifier; import org.eclipse.cdt.core.dom.ast.c.ICASTCompositeTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.c.ICASTDeclSpecifier; import org.eclipse.cdt.core.dom.ast.c.ICASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.c.ICASTDesignatedInitializer;
import org.eclipse.cdt.core.dom.ast.c.ICASTDesignator;
import org.eclipse.cdt.core.dom.ast.c.ICASTElaboratedTypeSpecifier; import org.eclipse.cdt.core.dom.ast.c.ICASTElaboratedTypeSpecifier;
import org.eclipse.cdt.core.dom.ast.c.ICASTEnumerationSpecifier; import org.eclipse.cdt.core.dom.ast.c.ICASTEnumerationSpecifier;
import org.eclipse.cdt.core.dom.ast.c.ICASTFieldDesignator; import org.eclipse.cdt.core.dom.ast.c.ICASTFieldDesignator;
@ -88,6 +91,7 @@ import org.eclipse.cdt.core.dom.ast.c.ICFunctionScope;
import org.eclipse.cdt.core.dom.ast.c.ICScope; import org.eclipse.cdt.core.dom.ast.c.ICScope;
import org.eclipse.cdt.core.dom.ast.gnu.IGNUASTCompoundStatementExpression; import org.eclipse.cdt.core.dom.ast.gnu.IGNUASTCompoundStatementExpression;
import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator; import org.eclipse.cdt.core.dom.ast.gnu.c.ICASTKnRFunctionDeclarator;
import org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTArrayRangeDesignator;
import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.core.parser.util.CharArrayUtils;
import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer; import org.eclipse.cdt.internal.core.dom.parser.ITypeContainer;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction;
@ -108,7 +112,7 @@ public class CVisitor {
public boolean processStatements = false; public boolean processStatements = false;
public boolean processTypeIds = false; public boolean processTypeIds = false;
public boolean processEnumerators = false; public boolean processEnumerators = false;
public boolean processDesignators = false;
/** /**
* @return true to continue visiting, abort to stop, skip to not descend into this node. * @return true to continue visiting, abort to stop, skip to not descend into this node.
*/ */
@ -116,6 +120,7 @@ public class CVisitor {
public final static int PROCESS_ABORT = 2; public final static int PROCESS_ABORT = 2;
public final static int PROCESS_CONTINUE = 3; public final static int PROCESS_CONTINUE = 3;
public int processName( IASTName name ) { return PROCESS_CONTINUE; } public int processName( IASTName name ) { return PROCESS_CONTINUE; }
public int processDeclaration( IASTDeclaration declaration ){ return PROCESS_CONTINUE; } public int processDeclaration( IASTDeclaration declaration ){ return PROCESS_CONTINUE; }
public int processInitializer( IASTInitializer initializer ){ return PROCESS_CONTINUE; } public int processInitializer( IASTInitializer initializer ){ return PROCESS_CONTINUE; }
@ -126,6 +131,7 @@ public class CVisitor {
public int processStatement( IASTStatement statement ) { return PROCESS_CONTINUE; } public int processStatement( IASTStatement statement ) { return PROCESS_CONTINUE; }
public int processTypeId( IASTTypeId typeId ) { return PROCESS_CONTINUE; } public int processTypeId( IASTTypeId typeId ) { return PROCESS_CONTINUE; }
public int processEnumerator( IASTEnumerator enumerator ) { return PROCESS_CONTINUE; } public int processEnumerator( IASTEnumerator enumerator ) { return PROCESS_CONTINUE; }
public int processDesignator( ICASTDesignator designator ) { return PROCESS_CONTINUE; }
} }
public static class ClearBindingAction extends CBaseVisitorAction { public static class ClearBindingAction extends CBaseVisitorAction {
@ -1199,6 +1205,31 @@ public class CVisitor {
for( int i = 0; i < list.length; i++ ){ for( int i = 0; i < list.length; i++ ){
if( !visitInitializer( list[i], action ) ) return false; if( !visitInitializer( list[i], action ) ) return false;
} }
} else if( initializer instanceof ICASTDesignatedInitializer ){
ICASTDesignatedInitializer dinit = (ICASTDesignatedInitializer) initializer;
ICASTDesignator [] ds = dinit.getDesignators();
for( int i = 0; i < ds.length; i++ ){
if( !visitDesignator( ds[i], action ) ) return false;
}
if( !visitInitializer( dinit.getOperandInitializer(), action ) ) return false;
}
return true;
}
public static boolean visitDesignator( ICASTDesignator designator, CBaseVisitorAction action ){
if( action.processDesignators ){
switch( action.processDesignator( designator ) ){
case CPPBaseVisitorAction.PROCESS_ABORT : return false;
case CPPBaseVisitorAction.PROCESS_SKIP : return true;
default : break;
}
}
if( designator instanceof ICASTFieldDesignator ){
if( !visitName( ((ICASTFieldDesignator)designator).getName(), action ) ) return false;
} else if( designator instanceof ICASTArrayDesignator ){
if( !visitExpression( ((ICASTArrayDesignator)designator).getSubscriptExpression(), action ) ) return false;
} else if( designator instanceof IGCCASTArrayRangeDesignator ){
if( !visitExpression( ((IGCCASTArrayRangeDesignator)designator).getRangeFloor(), action ) ) return false;
if( !visitExpression( ((IGCCASTArrayRangeDesignator)designator).getRangeCeiling(), action ) ) return false;
} }
return true; return true;
} }