LCPQ
/
irpf90
mirror of https://gitlab.com/scemama/irpf90.git
10
0
Fork 0
Code Releases Activity

Merge branch 'master' of ssh://git.code.sf.net/p/irpf90/code 

Conflicts:
	src/version.py
This commit is contained in:
Anthony Scemama 2013-10-03 11:21:46 +02:00
parent b0d955cb85 27a799df35
commit 51b1598bb0
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/parsed_text.py
View File

@ -81,9 +81,9 @@ def check_touch(line,vars,main_vars):
return [main_var]+x.others
all_others = make_single(flatten( map(fun,main_vars) ))
all_others.sort()
if len(all_others) == len(vars):
vars.sort()
for x,y in zip(vars,all_others):
vars.sort()
print vars
for x,y in zip(vars,all_others):
if x != y:
message = "The following entities should be touched:\n"
message = "\n".join([message]+map(lambda x: "- %s"%(x,),all_others))

16
src/preprocessed_text.py
View File

@ -355,15 +355,24 @@ def add_operators(text):
for line in text:
buffer = line.text
if "+=" in buffer:
if buffer.lstrip().startswith("if "):
if "if" in buffer:
re_incr = re.compile(r"(.*)(\))(\s*)(.*)(\+=)(.*$)",re.S)
line.text = re.sub(re_incr,r'\1\2\4=\4+(\6)', buffer)
else:
line.text = re.sub(re_incr,r'\1\2=\2+(\4)', buffer)
elif "-=" in buffer:
line.text = re.sub(re_decr,r'\1\2=\2-(\4)', buffer)
if "if" in buffer:
re_decr = re.compile(r"(.*)(\))(\s*)(.*)(\-=)(.*$)",re.S)
line.text = re.sub(re_decr,r'\1\2\4=\4-(\6)', buffer)
else:
line.text = re.sub(re_decr,r'\1\2=\2-(\4)', buffer)
# line.text = re.sub(re_decr,r'\1\2=\2-(\4)', buffer)
elif "*=" in buffer:
line.text = re.sub(re_mult,r'\1\2=\2*(\4)', buffer)
if "if" in buffer:
re_mult = re.compile(r"(.*)(\))(\s*)(.*)(\*=)(.*$)",re.S)
line.text = re.sub(re_mult,r'\1\2\4=\4*(\6)', buffer)
else:
line.text = re.sub(re_mult,r'\1\2=\2*(\4)', buffer)
result.append(line)
return result
@ -662,7 +671,6 @@ def change_includes(text):
if type(line) == Include:
txt = line.text.replace('"',"'").split("'")
if len(txt) != 3:
print txt
error.fail(line,"Error in include statement")
filename = txt[1].strip()
try: