reduce: try to reduce blocks better

This commit is contained in:
Daniel Marjamäki 2016-01-27 15:03:52 +01:00
parent ef1dd89d72
commit 4d2caff360
1 changed files with 5 additions and 3 deletions

View File

@ -178,15 +178,17 @@ def removeblocks(filedata):
i2 = i1 i2 = i1
indent = 0 indent = 0
while i2 < len(filedata): while i2 < len(filedata) and indent>=0:
for c in filedata[i2]: for c in filedata[i2]:
if c == '}': if c == '}':
indent = indent - 1 indent = indent - 1
if indent <= 0: if indent == 0:
break indent = -100
elif c == '{': elif c == '{':
indent = indent + 1 indent = indent + 1
i2 = i2 + 1 i2 = i2 + 1
if indent == -100:
indent = 0
if i2 == i1 or i2 >= len(filedata): if i2 == i1 or i2 >= len(filedata):
continue continue
if filedata[i2].strip() != '}' and filedata[i2].strip() != '};': if filedata[i2].strip() != '}' and filedata[i2].strip() != '};':