annotate runtime/autoload/pythoncomplete.vim @ 19767:4ee37e23b782

Added tag v8.2.0439 for changeset aa4cbdb676cd3dde5e939ec5cb078e2a7345cd6c
author Bram Moolenaar <Bram@vim.org>
date Mon, 23 Mar 2020 23:00:05 +0100
parents ffad29dc7eee
children 17c4178f26ea
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
1 "pythoncomplete.vim - Omni Completion for python
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
2 " Maintainer: Aaron Griffin <aaronmgriffin@gmail.com>
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
3 " Version: 0.9
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
4 " Last Updated: 18 Jun 2009
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
5 "
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
6 " Changes
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
7 " TODO:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
8 " 'info' item output can use some formatting work
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
9 " Add an "unsafe eval" mode, to allow for return type evaluation
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
10 " Complete basic syntax along with import statements
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
11 " i.e. "import url<c-x,c-o>"
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
12 " Continue parsing on invalid line??
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
13 "
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
14 " v 0.9
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
15 " * Fixed docstring parsing for classes and functions
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
16 " * Fixed parsing of *args and **kwargs type arguments
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
17 " * Better function param parsing to handle things like tuples and
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
18 " lambda defaults args
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
19 "
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
20 " v 0.8
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
21 " * Fixed an issue where the FIRST assignment was always used instead of
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
22 " using a subsequent assignment for a variable
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
23 " * Fixed a scoping issue when working inside a parameterless function
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
24 "
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
25 "
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
26 " v 0.7
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
27 " * Fixed function list sorting (_ and __ at the bottom)
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
28 " * Removed newline removal from docs. It appears vim handles these better in
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
29 " recent patches
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
30 "
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
31 " v 0.6:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
32 " * Fixed argument completion
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
33 " * Removed the 'kind' completions, as they are better indicated
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
34 " with real syntax
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
35 " * Added tuple assignment parsing (whoops, that was forgotten)
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
36 " * Fixed import handling when flattening scope
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
37 "
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
38 " v 0.5:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
39 " Yeah, I skipped a version number - 0.4 was never public.
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
40 " It was a bugfix version on top of 0.3. This is a complete
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
41 " rewrite.
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
42 "
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
43
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
44 if !has('python')
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
45 echo "Error: Required vim compiled with +python"
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
46 finish
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
47 endif
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
48
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
49 function! pythoncomplete#Complete(findstart, base)
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
50 "findstart = 1 when we need to get the text length
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
51 if a:findstart == 1
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
52 let line = getline('.')
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
53 let idx = col('.')
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
54 while idx > 0
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
55 let idx -= 1
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
56 let c = line[idx]
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
57 if c =~ '\w'
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
58 continue
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
59 elseif ! c =~ '\.'
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
60 let idx = -1
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
61 break
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
62 else
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
63 break
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
64 endif
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
65 endwhile
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
66
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
67 return idx
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
68 "findstart = 0 when we need to return the list of completions
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
69 else
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
70 "vim no longer moves the cursor upon completion... fix that
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
71 let line = getline('.')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
72 let idx = col('.')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
73 let cword = ''
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
74 while idx > 0
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
75 let idx -= 1
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
76 let c = line[idx]
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
77 if c =~ '\w' || c =~ '\.'
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
78 let cword = c . cword
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
79 continue
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
80 elseif strlen(cword) > 0 || idx == 0
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
81 break
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
82 endif
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
83 endwhile
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
84 execute "python vimcomplete('" . cword . "', '" . a:base . "')"
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
85 return g:pythoncomplete_completions
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
86 endif
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
87 endfunction
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
88
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
89 function! s:DefPython()
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
90 python << PYTHONEOF
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
91 import sys, tokenize, cStringIO, types
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
92 from token import NAME, DEDENT, NEWLINE, STRING
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
93
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
94 debugstmts=[]
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
95 def dbg(s): debugstmts.append(s)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
96 def showdbg():
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
97 for d in debugstmts: print "DBG: %s " % d
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
98
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
99 def vimcomplete(context,match):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
100 global debugstmts
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
101 debugstmts = []
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
102 try:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
103 import vim
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
104 def complsort(x,y):
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
105 try:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
106 xa = x['abbr']
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
107 ya = y['abbr']
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
108 if xa[0] == '_':
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
109 if xa[1] == '_' and ya[0:2] == '__':
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
110 return xa > ya
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
111 elif ya[0:2] == '__':
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
112 return -1
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
113 elif y[0] == '_':
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
114 return xa > ya
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
115 else:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
116 return 1
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
117 elif ya[0] == '_':
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
118 return -1
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
119 else:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
120 return xa > ya
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
121 except:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
122 return 0
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
123 cmpl = Completer()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
124 cmpl.evalsource('\n'.join(vim.current.buffer),vim.eval("line('.')"))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
125 all = cmpl.get_completions(context,match)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
126 all.sort(complsort)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
127 dictstr = '['
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
128 # have to do this for double quoting
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
129 for cmpl in all:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
130 dictstr += '{'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
131 for x in cmpl: dictstr += '"%s":"%s",' % (x,cmpl[x])
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
132 dictstr += '"icase":0},'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
133 if dictstr[-1] == ',': dictstr = dictstr[:-1]
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
134 dictstr += ']'
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
135 #dbg("dict: %s" % dictstr)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
136 vim.command("silent let g:pythoncomplete_completions = %s" % dictstr)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
137 #dbg("Completion dict:\n%s" % all)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
138 except vim.error:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
139 dbg("VIM Error: %s" % vim.error)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
140
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
141 class Completer(object):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
142 def __init__(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
143 self.compldict = {}
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
144 self.parser = PyParser()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
145
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
146 def evalsource(self,text,line=0):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
147 sc = self.parser.parse(text,line)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
148 src = sc.get_code()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
149 dbg("source: %s" % src)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
150 try: exec(src) in self.compldict
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
151 except: dbg("parser: %s, %s" % (sys.exc_info()[0],sys.exc_info()[1]))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
152 for l in sc.locals:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
153 try: exec(l) in self.compldict
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
154 except: dbg("locals: %s, %s [%s]" % (sys.exc_info()[0],sys.exc_info()[1],l))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
155
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
156 def _cleanstr(self,doc):
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
157 return doc.replace('"',' ').replace("'",' ')
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
158
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
159 def get_arguments(self,func_obj):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
160 def _ctor(obj):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
161 try: return class_ob.__init__.im_func
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
162 except AttributeError:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
163 for base in class_ob.__bases__:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
164 rc = _find_constructor(base)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
165 if rc is not None: return rc
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
166 return None
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
167
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
168 arg_offset = 1
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
169 if type(func_obj) == types.ClassType: func_obj = _ctor(func_obj)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
170 elif type(func_obj) == types.MethodType: func_obj = func_obj.im_func
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
171 else: arg_offset = 0
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
172
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
173 arg_text=''
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
174 if type(func_obj) in [types.FunctionType, types.LambdaType]:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
175 try:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
176 cd = func_obj.func_code
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
177 real_args = cd.co_varnames[arg_offset:cd.co_argcount]
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
178 defaults = func_obj.func_defaults or ''
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
179 defaults = map(lambda name: "=%s" % name, defaults)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
180 defaults = [""] * (len(real_args)-len(defaults)) + defaults
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
181 items = map(lambda a,d: a+d, real_args, defaults)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
182 if func_obj.func_code.co_flags & 0x4:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
183 items.append("...")
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
184 if func_obj.func_code.co_flags & 0x8:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
185 items.append("***")
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
186 arg_text = (','.join(items)) + ')'
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
187
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
188 except:
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
189 dbg("arg completion: %s: %s" % (sys.exc_info()[0],sys.exc_info()[1]))
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
190 pass
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
191 if len(arg_text) == 0:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
192 # The doc string sometimes contains the function signature
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
193 # this works for alot of C modules that are part of the
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
194 # standard library
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
195 doc = func_obj.__doc__
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
196 if doc:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
197 doc = doc.lstrip()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
198 pos = doc.find('\n')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
199 if pos > 0:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
200 sigline = doc[:pos]
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
201 lidx = sigline.find('(')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
202 ridx = sigline.find(')')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
203 if lidx > 0 and ridx > 0:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
204 arg_text = sigline[lidx+1:ridx] + ')'
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
205 if len(arg_text) == 0: arg_text = ')'
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
206 return arg_text
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
207
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
208 def get_completions(self,context,match):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
209 dbg("get_completions('%s','%s')" % (context,match))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
210 stmt = ''
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
211 if context: stmt += str(context)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
212 if match: stmt += str(match)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
213 try:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
214 result = None
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
215 all = {}
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
216 ridx = stmt.rfind('.')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
217 if len(stmt) > 0 and stmt[-1] == '(':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
218 result = eval(_sanitize(stmt[:-1]), self.compldict)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
219 doc = result.__doc__
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
220 if doc is None: doc = ''
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
221 args = self.get_arguments(result)
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
222 return [{'word':self._cleanstr(args),'info':self._cleanstr(doc)}]
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
223 elif ridx == -1:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
224 match = stmt
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
225 all = self.compldict
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
226 else:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
227 match = stmt[ridx+1:]
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
228 stmt = _sanitize(stmt[:ridx])
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
229 result = eval(stmt, self.compldict)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
230 all = dir(result)
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
231
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
232 dbg("completing: stmt:%s" % stmt)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
233 completions = []
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
234
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
235 try: maindoc = result.__doc__
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
236 except: maindoc = ' '
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
237 if maindoc is None: maindoc = ' '
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
238 for m in all:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
239 if m == "_PyCmplNoType": continue #this is internal
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
240 try:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
241 dbg('possible completion: %s' % m)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
242 if m.find(match) == 0:
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
243 if result is None: inst = all[m]
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
244 else: inst = getattr(result,m)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
245 try: doc = inst.__doc__
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
246 except: doc = maindoc
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
247 typestr = str(inst)
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
248 if doc is None or doc == '': doc = maindoc
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
249
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
250 wrd = m[len(match):]
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
251 c = {'word':wrd, 'abbr':m, 'info':self._cleanstr(doc)}
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
252 if "function" in typestr:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
253 c['word'] += '('
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
254 c['abbr'] += '(' + self._cleanstr(self.get_arguments(inst))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
255 elif "method" in typestr:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
256 c['word'] += '('
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
257 c['abbr'] += '(' + self._cleanstr(self.get_arguments(inst))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
258 elif "module" in typestr:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
259 c['word'] += '.'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
260 elif "class" in typestr:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
261 c['word'] += '('
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
262 c['abbr'] += '('
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
263 completions.append(c)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
264 except:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
265 i = sys.exc_info()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
266 dbg("inner completion: %s,%s [stmt='%s']" % (i[0],i[1],stmt))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
267 return completions
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
268 except:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
269 i = sys.exc_info()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
270 dbg("completion: %s,%s [stmt='%s']" % (i[0],i[1],stmt))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
271 return []
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
272
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
273 class Scope(object):
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
274 def __init__(self,name,indent,docstr=''):
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
275 self.subscopes = []
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
276 self.docstr = docstr
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
277 self.locals = []
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
278 self.parent = None
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
279 self.name = name
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
280 self.indent = indent
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
281
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
282 def add(self,sub):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
283 #print 'push scope: [%s@%s]' % (sub.name,sub.indent)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
284 sub.parent = self
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
285 self.subscopes.append(sub)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
286 return sub
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
287
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
288 def doc(self,str):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
289 """ Clean up a docstring """
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
290 d = str.replace('\n',' ')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
291 d = d.replace('\t',' ')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
292 while d.find(' ') > -1: d = d.replace(' ',' ')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
293 while d[0] in '"\'\t ': d = d[1:]
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
294 while d[-1] in '"\'\t ': d = d[:-1]
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
295 dbg("Scope(%s)::docstr = %s" % (self,d))
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
296 self.docstr = d
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
297
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
298 def local(self,loc):
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
299 self._checkexisting(loc)
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
300 self.locals.append(loc)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
301
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
302 def copy_decl(self,indent=0):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
303 """ Copy a scope's declaration only, at the specified indent level - not local variables """
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
304 return Scope(self.name,indent,self.docstr)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
305
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
306 def _checkexisting(self,test):
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
307 "Convienance function... keep out duplicates"
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
308 if test.find('=') > -1:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
309 var = test.split('=')[0].strip()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
310 for l in self.locals:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
311 if l.find('=') > -1 and var == l.split('=')[0].strip():
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
312 self.locals.remove(l)
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
313
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
314 def get_code(self):
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
315 str = ""
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
316 if len(self.docstr) > 0: str += '"""'+self.docstr+'"""\n'
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
317 for l in self.locals:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
318 if l.startswith('import'): str += l+'\n'
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
319 str += 'class _PyCmplNoType:\n def __getattr__(self,name):\n return None\n'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
320 for sub in self.subscopes:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
321 str += sub.get_code()
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
322 for l in self.locals:
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
323 if not l.startswith('import'): str += l+'\n'
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
324
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
325 return str
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
326
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
327 def pop(self,indent):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
328 #print 'pop scope: [%s] to [%s]' % (self.indent,indent)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
329 outer = self
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
330 while outer.parent != None and outer.indent >= indent:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
331 outer = outer.parent
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
332 return outer
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
333
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
334 def currentindent(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
335 #print 'parse current indent: %s' % self.indent
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
336 return ' '*self.indent
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
337
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
338 def childindent(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
339 #print 'parse child indent: [%s]' % (self.indent+1)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
340 return ' '*(self.indent+1)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
341
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
342 class Class(Scope):
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
343 def __init__(self, name, supers, indent, docstr=''):
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
344 Scope.__init__(self,name,indent, docstr)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
345 self.supers = supers
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
346 def copy_decl(self,indent=0):
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
347 c = Class(self.name,self.supers,indent, self.docstr)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
348 for s in self.subscopes:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
349 c.add(s.copy_decl(indent+1))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
350 return c
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
351 def get_code(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
352 str = '%sclass %s' % (self.currentindent(),self.name)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
353 if len(self.supers) > 0: str += '(%s)' % ','.join(self.supers)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
354 str += ':\n'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
355 if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
356 if len(self.subscopes) > 0:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
357 for s in self.subscopes: str += s.get_code()
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
358 else:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
359 str += '%spass\n' % self.childindent()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
360 return str
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
361
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
362
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
363 class Function(Scope):
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
364 def __init__(self, name, params, indent, docstr=''):
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
365 Scope.__init__(self,name,indent, docstr)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
366 self.params = params
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
367 def copy_decl(self,indent=0):
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
368 return Function(self.name,self.params,indent, self.docstr)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
369 def get_code(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
370 str = "%sdef %s(%s):\n" % \
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
371 (self.currentindent(),self.name,','.join(self.params))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
372 if len(self.docstr) > 0: str += self.childindent()+'"""'+self.docstr+'"""\n'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
373 str += "%spass\n" % self.childindent()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
374 return str
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
375
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
376 class PyParser:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
377 def __init__(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
378 self.top = Scope('global',0)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
379 self.scope = self.top
7183
ffad29dc7eee commit https://github.com/vim/vim/commit/a0f849ee40cbea3c889345256786b640b0becca2
Christian Brabandt <cb@256bit.org>
parents: 2120
diff changeset
380 self.parserline = 0
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
381
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
382 def _parsedotname(self,pre=None):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
383 #returns (dottedname, nexttoken)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
384 name = []
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
385 if pre is None:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
386 tokentype, token, indent = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
387 if tokentype != NAME and token != '*':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
388 return ('', token)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
389 else: token = pre
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
390 name.append(token)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
391 while True:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
392 tokentype, token, indent = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
393 if token != '.': break
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
394 tokentype, token, indent = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
395 if tokentype != NAME: break
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
396 name.append(token)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
397 return (".".join(name), token)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
398
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
399 def _parseimportlist(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
400 imports = []
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
401 while True:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
402 name, token = self._parsedotname()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
403 if not name: break
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
404 name2 = ''
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
405 if token == 'as': name2, token = self._parsedotname()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
406 imports.append((name, name2))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
407 while token != "," and "\n" not in token:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
408 tokentype, token, indent = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
409 if token != ",": break
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
410 return imports
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
411
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
412 def _parenparse(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
413 name = ''
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
414 names = []
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
415 level = 1
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
416 while True:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
417 tokentype, token, indent = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
418 if token in (')', ',') and level == 1:
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
419 if '=' not in name: name = name.replace(' ', '')
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
420 names.append(name.strip())
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
421 name = ''
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
422 if token == '(':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
423 level += 1
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
424 name += "("
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
425 elif token == ')':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
426 level -= 1
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
427 if level == 0: break
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
428 else: name += ")"
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
429 elif token == ',' and level == 1:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
430 pass
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
431 else:
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
432 name += "%s " % str(token)
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
433 return names
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
434
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
435 def _parsefunction(self,indent):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
436 self.scope=self.scope.pop(indent)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
437 tokentype, fname, ind = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
438 if tokentype != NAME: return None
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
439
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
440 tokentype, open, ind = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
441 if open != '(': return None
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
442 params=self._parenparse()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
443
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
444 tokentype, colon, ind = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
445 if colon != ':': return None
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
446
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
447 return Function(fname,params,indent)
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
448
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
449 def _parseclass(self,indent):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
450 self.scope=self.scope.pop(indent)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
451 tokentype, cname, ind = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
452 if tokentype != NAME: return None
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
453
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
454 super = []
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
455 tokentype, next, ind = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
456 if next == '(':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
457 super=self._parenparse()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
458 elif next != ':': return None
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
459
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
460 return Class(cname,super,indent)
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
461
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
462 def _parseassignment(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
463 assign=''
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
464 tokentype, token, indent = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
465 if tokentype == tokenize.STRING or token == 'str':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
466 return '""'
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
467 elif token == '(' or token == 'tuple':
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
468 return '()'
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
469 elif token == '[' or token == 'list':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
470 return '[]'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
471 elif token == '{' or token == 'dict':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
472 return '{}'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
473 elif tokentype == tokenize.NUMBER:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
474 return '0'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
475 elif token == 'open' or token == 'file':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
476 return 'file'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
477 elif token == 'None':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
478 return '_PyCmplNoType()'
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
479 elif token == 'type':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
480 return 'type(_PyCmplNoType)' #only for method resolution
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
481 else:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
482 assign += token
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
483 level = 0
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
484 while True:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
485 tokentype, token, indent = self.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
486 if token in ('(','{','['):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
487 level += 1
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
488 elif token in (']','}',')'):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
489 level -= 1
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
490 if level == 0: break
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
491 elif level == 0:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
492 if token in (';','\n'): break
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
493 assign += token
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
494 return "%s" % assign
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
495
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
496 def next(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
497 type, token, (lineno, indent), end, self.parserline = self.gen.next()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
498 if lineno == self.curline:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
499 #print 'line found [%s] scope=%s' % (line.replace('\n',''),self.scope.name)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
500 self.currentscope = self.scope
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
501 return (type, token, indent)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
502
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
503 def _adjustvisibility(self):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
504 newscope = Scope('result',0)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
505 scp = self.currentscope
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
506 while scp != None:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
507 if type(scp) == Function:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
508 slice = 0
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
509 #Handle 'self' params
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
510 if scp.parent != None and type(scp.parent) == Class:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
511 slice = 1
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
512 newscope.local('%s = %s' % (scp.params[0],scp.parent.name))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
513 for p in scp.params[slice:]:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
514 i = p.find('=')
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
515 if len(p) == 0: continue
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
516 pvar = ''
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
517 ptype = ''
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
518 if i == -1:
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
519 pvar = p
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
520 ptype = '_PyCmplNoType()'
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
521 else:
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
522 pvar = p[:i]
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
523 ptype = _sanitize(p[i+1:])
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
524 if pvar.startswith('**'):
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
525 pvar = pvar[2:]
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
526 ptype = '{}'
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
527 elif pvar.startswith('*'):
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
528 pvar = pvar[1:]
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
529 ptype = '[]'
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
530
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
531 newscope.local('%s = %s' % (pvar,ptype))
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
532
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
533 for s in scp.subscopes:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
534 ns = s.copy_decl(0)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
535 newscope.add(ns)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
536 for l in scp.locals: newscope.local(l)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
537 scp = scp.parent
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
538
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
539 self.currentscope = newscope
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
540 return self.currentscope
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
541
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
542 #p.parse(vim.current.buffer[:],vim.eval("line('.')"))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
543 def parse(self,text,curline=0):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
544 self.curline = int(curline)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
545 buf = cStringIO.StringIO(''.join(text) + '\n')
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
546 self.gen = tokenize.generate_tokens(buf.readline)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
547 self.currentscope = self.scope
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
548
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
549 try:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
550 freshscope=True
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
551 while True:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
552 tokentype, token, indent = self.next()
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
553 #dbg( 'main: token=[%s] indent=[%s]' % (token,indent))
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
554
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 838
diff changeset
555 if tokentype == DEDENT or token == "pass":
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
556 self.scope = self.scope.pop(indent)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
557 elif token == 'def':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
558 func = self._parsefunction(indent)
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
559 if func is None:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
560 print "function: syntax error..."
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
561 continue
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
562 dbg("new scope: function")
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
563 freshscope = True
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
564 self.scope = self.scope.add(func)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
565 elif token == 'class':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
566 cls = self._parseclass(indent)
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
567 if cls is None:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
568 print "class: syntax error..."
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
569 continue
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
570 freshscope = True
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
571 dbg("new scope: class")
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
572 self.scope = self.scope.add(cls)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
573
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
574 elif token == 'import':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
575 imports = self._parseimportlist()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
576 for mod, alias in imports:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
577 loc = "import %s" % mod
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
578 if len(alias) > 0: loc += " as %s" % alias
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
579 self.scope.local(loc)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
580 freshscope = False
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
581 elif token == 'from':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
582 mod, token = self._parsedotname()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
583 if not mod or token != "import":
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
584 print "from: syntax error..."
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
585 continue
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
586 names = self._parseimportlist()
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
587 for name, alias in names:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
588 loc = "from %s import %s" % (mod,name)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
589 if len(alias) > 0: loc += " as %s" % alias
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
590 self.scope.local(loc)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
591 freshscope = False
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
592 elif tokentype == STRING:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
593 if freshscope: self.scope.doc(token)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
594 elif tokentype == NAME:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
595 name,token = self._parsedotname(token)
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
596 if token == '=':
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
597 stmt = self._parseassignment()
2120
f63ace015c63 Updated runtime and language files.
Bram Moolenaar <bram@zimbu.org>
parents: 1121
diff changeset
598 dbg("parseassignment: %s = %s" % (name, stmt))
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
599 if stmt != None:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
600 self.scope.local("%s = %s" % (name,stmt))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
601 freshscope = False
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
602 except StopIteration: #thrown on EOF
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
603 pass
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
604 except:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
605 dbg("parse error: %s, %s @ %s" %
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
606 (sys.exc_info()[0], sys.exc_info()[1], self.parserline))
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
607 return self._adjustvisibility()
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
608
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
609 def _sanitize(str):
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
610 val = ''
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
611 level = 0
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
612 for c in str:
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
613 if c in ('(','{','['):
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
614 level += 1
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
615 elif c in (']','}',')'):
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
616 level -= 1
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
617 elif level == 0:
838
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
618 val += c
8e5830943bff updated for version 7.0e04
vimboss
parents: 827
diff changeset
619 return val
827
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
620
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
621 sys.path.extend(['.','..'])
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
622 PYTHONEOF
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
623 endfunction
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
624
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
625 call s:DefPython()
fd1b3406fd1c updated for version 7.0d02
vimboss
parents:
diff changeset
626 " vim: set et ts=4: