[Bicyclerepair-cvslog] CVS: bicyclerepair/bike/query findReferences.py,1.22,1.23

[Phil D. <pd...@us...>]

Update of /cvsroot/bicyclerepair/bicyclerepair/bike/query
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5018/bike/query

Modified Files:
	findReferences.py 
Log Message:
some patches and fixes - see changelog for details


Index: findReferences.py
===================================================================
RCS file: /cvsroot/bicyclerepair/bicyclerepair/bike/query/findReferences.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- findReferences.py	10 Feb 2004 11:29:58 -0000	1.22
+++ findReferences.py	22 Oct 2004 22:38:17 -0000	1.23
@@ -116,13 +116,24 @@
     def visitFunction(self, node):
         self.popWordsUpTo(node.name)
         for arg, default in self.zipArgs(node.argnames, node.defaults):
-            if arg == self.targetstr:
+            potentualMatch = findDefinitionFromASTNode(self.scope,Name(arg))
+            if  potentualMatch is not None and \
+                   potentualMatch == self.targetMatch:
                 self.appendMatch(arg)
             self.popWordsUpTo(arg)
             if default is not None:
-                self.visit(default)
+                self.handleDefaultArg(default)
         self.visit(node.code)
 
+    def handleDefaultArg(self, node):
+        if node.name == self.targetstr:
+            potentualMatch = findDefinitionFromASTNode(self.scope.getParent(),
+                                                       node)
+            if  potentualMatch is not None and \
+                   potentualMatch == self.targetMatch:
+                self.appendMatch(node.name)
+        self.popWordsUpTo(node.name)
+
 
     def visitFrom(self, node):
         for elem in node.modname.split("."):
@@ -142,7 +153,7 @@
                 self.popWordsUpTo(alias)
 
 
-    def visitGetattr(self, node):        
+    def visitGetattr(self, node):
         for c in node.getChildNodes():
             self.visit(c)
         if node.attrname == self.targetstr: