LCPQ/irpf90
10
0
Fork 0
mirror of https://gitlab.com/scemama/irpf90.git synced 2024-12-21 20:03:33 +01:00
Code Releases Activity

Improved parsed_text

Browse Source 
Version:1.1.4
This commit is contained in:
Anthony Scemama 2009-09-07 16:55:11 +02:00
parent 1d4d58d8d0
commit 3be940cc9b
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/parsed_text.py
View File

@ -145,20 +145,35 @@ def move_variables():
main_result = [] main_result = []
for filename, text in parsed_text: for filename, text in parsed_text:
result = [] result = []
varlist = []
# 1st pass # 1st pass
varlist = []
ifvars = []
elsevars = []
old_varlist = []
old_ifvars = []
old_elsevars = []
revtext = list(text) revtext = list(text)
revtext.reverse() revtext.reverse()
old_varlist = []
for vars,line in revtext: for vars,line in revtext:
if type(line) in [ End_provider,End ]: if type(line) in [ End_provider,End ]:
varlist = [] varlist = []
result.append( ([],line) ) result.append( ([],line) )
elif type(line) in [ Endif, End_select ]: elif type(line) in [ Endif, End_select ]:
old_ifvars.append(ifvars)
old_elsevars.append(elsevars)
old_varlist.append(varlist) old_varlist.append(varlist)
varlist = [] varlist = []
result.append( ([],line) ) result.append( ([],line) )
elif type(line) in [ Else, Elseif, Case ]: elif type(line) == Else:
result.append( (varlist,line) )
elsevars = list(varlist)
if vars != []:
varlist = old_varlist.pop()
varlist += vars
old_varlist.append(varlist)
varlist = []
elif type(line) in [ Elseif, Case ]:
ifvars += varlist
result.append( (varlist,line) ) result.append( (varlist,line) )
if vars != []: if vars != []:
varlist = old_varlist.pop() varlist = old_varlist.pop()
@ -166,13 +181,19 @@ def move_variables():
old_varlist.append(varlist) old_varlist.append(varlist)
varlist = [] varlist = []
elif type(line) in [ If, Select ]: elif type(line) in [ If, Select ]:
ifvars += varlist
result.append( (varlist,line) ) result.append( (varlist,line) )
vars += filter(lambda x: x in elsevars, ifvars)
ifvars = old_ifvars.pop()
elsevars = old_elsevars.pop()
varlist = old_varlist.pop() varlist = old_varlist.pop()
varlist += vars varlist += vars
elif type(line) in [ Begin_provider, Subroutine, Function ]: elif type(line) in [ Begin_provider, Subroutine, Function ]:
varlist += vars varlist += vars
result.append( (varlist,line) ) result.append( (varlist,line) )
assert old_varlist == [] assert old_varlist == []
assert old_ifvars == []
assert old_elsevars == []
varlist = [] varlist = []
else: else:
varlist += vars varlist += vars
@ -183,7 +204,11 @@ def move_variables():
result = [] result = []
old_varlist = [] old_varlist = []
varlist = [] varlist = []
if len(text) > 0:
lenmax = 80 - len(text[0][1].filename)
format = "%"+str(lenmax)+"s ! %s:%4s"
for vars,line in text: for vars,line in text:
line.text = format%(line.text.ljust(lenmax),line.filename,str(line.i))
if vars != []: if vars != []:
vars = make_single(vars) vars = make_single(vars)
if type(line) in [ Begin_provider, Subroutine, Function ]: if type(line) in [ Begin_provider, Subroutine, Function ]:

2
src/version.py
View File

@ -1 +1 @@
version = "1.1.3" version = "1.1.4"