Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors AbstractV
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2005-07-29 01:06:44
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15521/src/org/python/pydev/editor/codecompletion/revisited/visitors Modified Files: AbstractVisitor.java GlobalModelVisitor.java Log Message: Index: AbstractVisitor.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AbstractVisitor.java 28 Jul 2005 20:00:42 -0000 1.19 --- AbstractVisitor.java 29 Jul 2005 01:06:31 -0000 1.20 *************** *** 18,21 **** --- 18,22 ---- import org.python.parser.ast.VisitorBase; import org.python.parser.ast.aliasType; + import org.python.pydev.core.FullRepIterable; import org.python.pydev.editor.codecompletion.revisited.IToken; import org.python.pydev.editor.codecompletion.revisited.modules.SourceToken; *************** *** 37,41 **** public static final int INNER_DEFS = 5; ! protected List tokens = new ArrayList(); /** --- 38,42 ---- public static final int INNER_DEFS = 5; ! protected List<IToken> tokens = new ArrayList<IToken>(); /** *************** *** 81,87 **** * @return the tokens list passed in or the created one if it was null */ ! public static IToken makeWildImportToken(ImportFrom node, List tokens, String moduleName) { if(tokens == null){ ! tokens = new ArrayList(); } SourceToken sourceToken = null; --- 82,88 ---- * @return the tokens list passed in or the created one if it was null */ ! public static IToken makeWildImportToken(ImportFrom node, List<IToken> tokens, String moduleName) { if(tokens == null){ ! tokens = new ArrayList<IToken>(); } SourceToken sourceToken = null; *************** *** 107,116 **** * @param moduleName the module name * @param tokens OUT used to add the source tokens (may create many from a single import) * * @return the tokens list passed in or the created one if it was null */ ! public static List makeImportToken(Import node, List tokens, String moduleName) { aliasType[] names = node.names; ! return makeImportToken(node, tokens, names, moduleName); } --- 108,119 ---- * @param moduleName the module name * @param tokens OUT used to add the source tokens (may create many from a single import) + * @param allowForMultiple is used to indicate if an import in the format import os.path should generate one token for os + * and another for os.path or just one for both with os.path * * @return the tokens list passed in or the created one if it was null */ ! public static List<IToken> makeImportToken(Import node, List<IToken> tokens, String moduleName, boolean allowForMultiple) { aliasType[] names = node.names; ! return makeImportToken(node, tokens, names, moduleName, allowForMultiple); } *************** *** 118,124 **** * The same as above but with ImportFrom */ ! public static List makeImportToken(ImportFrom node, List tokens, String moduleName) { aliasType[] names = node.names; ! return makeImportToken(node, tokens, names, node.module); } --- 121,127 ---- * The same as above but with ImportFrom */ ! public static List<IToken> makeImportToken(ImportFrom node, List<IToken> tokens, String moduleName, boolean allowForMultiple) { aliasType[] names = node.names; ! return makeImportToken(node, tokens, names, node.module, allowForMultiple); } *************** *** 126,132 **** * The same as above */ ! private static List makeImportToken(SimpleNode node, List tokens, aliasType[] names, String module) { if(tokens == null){ ! tokens = new ArrayList(); } for (int i = 0; i < names.length; i++) { --- 129,135 ---- * The same as above */ ! private static List<IToken> makeImportToken(SimpleNode node, List<IToken> tokens, aliasType[] names, String module, boolean allowForMultiple) { if(tokens == null){ ! tokens = new ArrayList<IToken>(); } for (int i = 0; i < names.length; i++) { *************** *** 136,140 **** name = names[i].asname; } ! tokens.add(new SourceToken(node, name, "", "", module, original)); } return tokens; --- 139,149 ---- name = names[i].asname; } ! ! FullRepIterable iterator = new FullRepIterable(name); ! for (String rep : iterator) { ! SourceToken sourceToken = new SourceToken(node, rep, "", "", module, original); ! tokens.add(sourceToken); ! } ! } return tokens; Index: GlobalModelVisitor.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/GlobalModelVisitor.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GlobalModelVisitor.java 20 Jul 2005 21:00:33 -0000 1.5 --- GlobalModelVisitor.java 29 Jul 2005 01:06:31 -0000 1.6 *************** *** 91,95 **** makeWildImportToken(node, this.tokens, moduleName); } else if (this.visitWhat == ALIAS_MODULES) { ! makeImportToken(node, this.tokens, moduleName); } return null; --- 91,95 ---- makeWildImportToken(node, this.tokens, moduleName); } else if (this.visitWhat == ALIAS_MODULES) { ! makeImportToken(node, this.tokens, moduleName, true); } return null; *************** *** 104,108 **** public Object visitImport(Import node) throws Exception { if (this.visitWhat == ALIAS_MODULES) { ! makeImportToken(node, this.tokens, moduleName); } return null; --- 104,108 ---- public Object visitImport(Import node) throws Exception { if (this.visitWhat == ALIAS_MODULES) { ! makeImportToken(node, this.tokens, moduleName, true); } return null; |