[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited CompletionStateWrapper.java, 1.6, 1.7 CompletionState.java, 1.7, 1.8

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29460/src_completions/org/python/pydev/editor/codecompletion/revisited

Modified Files:
	CompletionStateWrapper.java CompletionState.java 
Log Message:
Fixed recursion while completing in numpy situation where compiled file needed a later reference to a source.

Index: CompletionState.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/CompletionState.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CompletionState.java	25 Feb 2008 11:21:34 -0000	1.7
--- CompletionState.java	4 May 2008 16:48:46 -0000	1.8
***************
*** 43,46 ****
--- 43,47 ----
      public Stack<Memo<IToken>> findResolveImportMemory = new Stack<Memo<IToken>>();
      public Memo<String> findModuleCompletionsMemory = new Memo<String>();
+     public Memo<String> findSourceFromCompiledMemory = new Memo<String>(1); //max is 1 for this one!
      
      public boolean builtinsGotten=false;
***************
*** 215,218 ****
--- 216,227 ----
      }
      
+     
+     public boolean canStillCheckFindSourceFromCompiled(IModule mod, String tok) {
+         if(!findSourceFromCompiledMemory.isInRecursion(mod, tok)){
+             return true;
+         }
+         return false;
+     }
+     
      /**
       * This check is a bit different from the others because of the context it will work in...

Index: CompletionStateWrapper.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/CompletionStateWrapper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CompletionStateWrapper.java	25 Jan 2008 01:53:38 -0000	1.6
--- CompletionStateWrapper.java	4 May 2008 16:48:46 -0000	1.7
***************
*** 91,94 ****
--- 91,98 ----
          wrapped.checkWildImportInMemory(current, mod);
      }
+     
+     public boolean canStillCheckFindSourceFromCompiled(IModule mod, String tok) {
+         return wrapped.canStillCheckFindSourceFromCompiled(mod, tok);
+     }