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

patch from Devin Steffler:

Browse source 
removing IBindings from IScopes
This commit is contained in:
Andrew Niefer 2005-01-13 20:29:34 +00:00
parent f814de106b
commit c20d990dc3
7 changed files with 89 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,7 @@ import org.eclipse.cdt.core.dom.ast.c.ICASTFieldDesignator;
import org.eclipse.cdt.core.dom.ast.c.ICASTPointer; import org.eclipse.cdt.core.dom.ast.c.ICASTPointer;
import org.eclipse.cdt.core.dom.ast.c.ICArrayType; import org.eclipse.cdt.core.dom.ast.c.ICArrayType;
import org.eclipse.cdt.core.dom.ast.c.ICFunctionScope; 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.cpp.ICPPASTPointerToMember; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTPointerToMember;
import org.eclipse.cdt.core.parser.ParserLanguage; import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.internal.core.dom.parser.c.CFunction; import org.eclipse.cdt.internal.core.dom.parser.c.CFunction;
@ -153,7 +154,7 @@ public class AST2Tests extends AST2BaseTest {
IFunction func_f = (IFunction) name_f.resolveBinding(); IFunction func_f = (IFunction) name_f.resolveBinding();
assertEquals(globalScope, func_f.getScope()); assertEquals(globalScope, func_f.getScope());
IParameter var_y = (IParameter) name_y.resolveBinding(); IParameter var_y = (IParameter) name_y.resolveBinding();
assertEquals(func_f.getFunctionScope(), var_y.getScope()); assertEquals(((IASTCompoundStatement)funcdef_f.getBody()).getScope(), var_y.getScope());
IVariable var_z = (IVariable) name_z.resolveBinding(); IVariable var_z = (IVariable) name_z.resolveBinding();
assertEquals(((ICFunctionScope)func_f.getFunctionScope()).getBodyScope(), var_z.getScope()); assertEquals(((ICFunctionScope)func_f.getFunctionScope()).getBodyScope(), var_z.getScope());
@ -162,6 +163,15 @@ public class AST2Tests extends AST2BaseTest {
assertEquals(var_x, name_ref_x.resolveBinding()); assertEquals(var_x, name_ref_x.resolveBinding());
assertEquals(var_y, name_ref_y.resolveBinding()); assertEquals(var_y, name_ref_y.resolveBinding());
assertNotNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("x").toCharArray()) ); //$NON-NLS-1$
assertNotNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("f").toCharArray()) ); //$NON-NLS-1$
assertNotNull( ((ICScope)body_f.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("z").toCharArray()) ); //$NON-NLS-1$
assertNotNull( ((ICScope)body_f.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("y").toCharArray()) ); //$NON-NLS-1$
CVisitor.clearBindings(tu);
assertNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("x").toCharArray()) ); //$NON-NLS-1$
assertNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("f").toCharArray()) ); //$NON-NLS-1$
assertNull( ((ICScope)body_f.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("z").toCharArray()) ); //$NON-NLS-1$
assertNull( ((ICScope)body_f.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("y").toCharArray()) ); //$NON-NLS-1$
} }
public void testSimpleStruct() throws ParserException { public void testSimpleStruct() throws ParserException {
@ -501,6 +511,18 @@ public class AST2Tests extends AST2BaseTest {
assertSame( x1, x3 ); assertSame( x1, x3 );
assertNotSame( x2, x3 ); assertNotSame( x2, x3 );
IASTDeclarator decl_i = declaration.getDeclarators()[0];
decl_i.getName().resolveBinding(); // add i's binding to the scope
assertNotNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_TAG, new String("x").toCharArray()) ); //$NON-NLS-1$
assertNotNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("f").toCharArray()) ); //$NON-NLS-1$
assertNotNull( ((ICScope)compound.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("x").toCharArray()) ); //$NON-NLS-1$
assertNotNull( ((ICScope)compound.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("i").toCharArray()) ); //$NON-NLS-1$
CVisitor.clearBindings(tu);
assertNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_TAG, new String("x").toCharArray()) ); //$NON-NLS-1$
assertNull( ((ICScope)tu.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("f").toCharArray()) ); //$NON-NLS-1$
assertNull( ((ICScope)compound.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("x").toCharArray()) ); //$NON-NLS-1$
assertNull( ((ICScope)compound.getScope()).getBinding(ICScope.NAMESPACE_TYPE_OTHER, new String("i").toCharArray()) ); //$NON-NLS-1$
} }
public void testFunctionParameters() throws Exception { public void testFunctionParameters() throws Exception {
StringBuffer buffer = new StringBuffer(); StringBuffer buffer = new StringBuffer();

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICScope.java
View file

@ -25,5 +25,6 @@ public interface ICScope extends IScope {
public static final int NAMESPACE_TYPE_OTHER = 1; public static final int NAMESPACE_TYPE_OTHER = 1;
void addBinding( IBinding binding ); void addBinding( IBinding binding );
void removeBinding( IBinding binding );
public IBinding getBinding( int namespaceType, char [] name ); public IBinding getBinding( int namespaceType, char [] name );
} }

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java
View file

@ -45,6 +45,10 @@ public class CASTName extends CASTNode implements IASTName {
return binding; return binding;
} }
protected boolean hasBinding(){
return ( binding != null );
}
protected void setBinding( IBinding binding ){ protected void setBinding( IBinding binding ){
this.binding = binding; this.binding = binding;
} }

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java
View file

@ -72,4 +72,13 @@ public class CCompositeTypeScope implements ICCompositeTypeScope {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.c.ICScope#removeBinding(org.eclipse.cdt.core.dom.ast.IBinding)
*/
public void removeBinding(IBinding binding) {
if( bindings != CharArrayObjectMap.EMPTY_MAP ) {
bindings.remove( binding.getNameCharArray(), 0, binding.getNameCharArray().length);
}
}
} }

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java
View file

@ -114,5 +114,12 @@ public class CFunctionScope implements ICFunctionScope {
} }
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.c.ICScope#removeBinding(org.eclipse.cdt.core.dom.ast.IBinding)
*/
public void removeBinding(IBinding binding) {
if( bindings != CharArrayObjectMap.EMPTY_MAP ) {
bindings.remove( binding.getNameCharArray(), 0, binding.getNameCharArray().length);
}
}
} }

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java
View file

@ -63,4 +63,16 @@ public class CScope implements ICScope {
public IBinding getBinding( int namespaceType, char [] name ){ public IBinding getBinding( int namespaceType, char [] name ){
return (IBinding) bindings[namespaceType].get( name ); return (IBinding) bindings[namespaceType].get( name );
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.c.ICScope#removeBinding(org.eclipse.cdt.core.dom.ast.IBinding)
*/
public void removeBinding(IBinding binding) {
int type = ( binding instanceof ICompositeType || binding instanceof IEnumeration ) ?
NAMESPACE_TYPE_TAG : NAMESPACE_TYPE_OTHER;
if( bindings[type] != CharArrayObjectMap.EMPTY_MAP ) {
bindings[type].remove( binding.getNameCharArray(), 0, binding.getNameCharArray().length);
}
}
} }

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

@ -213,6 +213,20 @@ public class CVisitor {
} }
} }
public static class ClearBindingFromScopeAction extends CBaseVisitorAction {
{
processNames = true;
}
public boolean processName(IASTName name) {
if ( ((CASTName)name).hasBinding() ) {
ICScope scope = (ICScope)name.resolveBinding().getScope();
if ( scope != null )
scope.removeBinding(name.resolveBinding());
}
return true;
}
}
//lookup bits //lookup bits
private static final int COMPLETE = 0; private static final int COMPLETE = 0;
private static final int CURRENT_SCOPE = 1; private static final int CURRENT_SCOPE = 1;
@ -348,6 +362,18 @@ public class CVisitor {
binding = createBinding( (IASTSimpleDeclaration) parent, name ); binding = createBinding( (IASTSimpleDeclaration) parent, name );
} else if( parent instanceof IASTParameterDeclaration ){ } else if( parent instanceof IASTParameterDeclaration ){
binding = createBinding( (IASTParameterDeclaration ) parent ); binding = createBinding( (IASTParameterDeclaration ) parent );
// C99 6.2.1-4: within the list of parameter declarations in a function definition, the
// identifier has block scope, which terminates at the end of the associated block.
parent = parent.getParent();
if ( parent instanceof IASTFunctionDeclarator ) {
parent = parent.getParent();
if ( parent instanceof IASTFunctionDefinition ) {
ICScope scope = (ICScope) ((IASTCompoundStatement)((IASTFunctionDefinition)parent).getBody()).getScope();
if ( scope != null && binding != null )
scope.addBinding(binding);
}
}
} else if ( parent instanceof IASTFunctionDeclarator ) { } else if ( parent instanceof IASTFunctionDeclarator ) {
binding = createBinding(declarator); binding = createBinding(declarator);
} }
@ -565,10 +591,10 @@ public class CVisitor {
public static IScope getContainingScope(IASTParameterDeclaration parameterDeclaration) { public static IScope getContainingScope(IASTParameterDeclaration parameterDeclaration) {
IASTNode parent = parameterDeclaration.getParent(); IASTNode parent = parameterDeclaration.getParent();
if( parent instanceof IASTFunctionDeclarator ){ if( parent instanceof IASTFunctionDeclarator ){
IASTFunctionDeclarator functionDeclarator = (IASTFunctionDeclarator) parent; parent = ((IASTDeclarator)parent).getParent();
IASTName fnName = functionDeclarator.getName(); if ( parent instanceof IASTFunctionDefinition ) {
IFunction function = (IFunction) fnName.resolveBinding(); return ((IASTCompoundStatement)((IASTFunctionDefinition)parent).getBody()).getScope();
return function.getFunctionScope(); }
} }
return null; return null;
@ -806,6 +832,7 @@ public class CVisitor {
} }
public static void clearBindings( IASTTranslationUnit tu ){ public static void clearBindings( IASTTranslationUnit tu ){
visitTranslationUnit( tu, new ClearBindingFromScopeAction() );
visitTranslationUnit( tu, new ClearBindingAction() ); visitTranslationUnit( tu, new ClearBindingAction() );
} }