comp-chem/cp2k
1
0
Fork 0
mirror of https://github.com/cp2k/cp2k.git synced 2026-07-27 21:55:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prettify: improved handling of comments after declarations

Browse source 
svn-origin-rev: 16789
This commit is contained in:
Patrick Seewald 2016-04-05 12:36:16 +00:00
parent f2b011890e
commit 39ca4b2181
1 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tools/formatting/normalizeFortranFile.py
View file

@ -172,6 +172,7 @@ def parseRoutine(inFile):
'preDeclComments': [],
'declarations': [],
'declComments': [],
'postDeclComments': [],
'parsedDeclarations': [],
'postRoutine': [],
'kind': None, 'name': None, 'arguments': None, 'result': None,
@ -221,12 +222,17 @@ def parseRoutine(inFile):
routine['result'] = routine['name']
while 1:
(jline, comment_list, lines) = stream.nextFortranLine()
comments = '\n'.join(_ for _ in comment_list if _)
comments = '\n'.join(_ for _ in comment_list)
if len(lines) == 0:
break
if lines[0].lower().startswith("#include"):
break
if not ignoreRe.match(jline):
if typeBeginRe.match(jline):
if routine['postDeclComments']:
routine['declComments'].extend(routine['postDeclComments'])
routine['postDeclComments'] = []
if typeBeginRe.match(jline):
m = typeRe.match(jline)
if (m.group('type').lower() == 'type' and
@ -311,8 +317,8 @@ def parseRoutine(inFile):
if (len(routine['parsedDeclarations']) == 0 and len(routine['use']) == 0 and
not re.match(" *implicit +none *$", jline, re.IGNORECASE)):
routine['preDeclComments'].append("".join(lines))
elif comments:
routine['declComments'].append(comments)
else:
routine['postDeclComments'].append(comments)
containsRe = re.compile(r" *contains *$", re.IGNORECASE)
while len(lines) > 0:
@ -732,8 +738,8 @@ def cleanDeclarations(routine, logFile=sys.stdout):
newDecl.write("\n")
wrote = 0
for comment in routine['declComments']:
if not commentToRemoveRe.match(comment):
newDecl.write(comment)
if comment.strip() and not commentToRemoveRe.match(comment):
newDecl.write(comment.strip())
newDecl.write("\n")
wrote = 1
if wrote:
@ -747,6 +753,21 @@ def cleanDeclarations(routine, logFile=sys.stdout):
str(routine['parsedDeclarations']))
raise
newDecl = StringIO()
if routine['postDeclComments']:
comment_start = 0
for comment in routine['postDeclComments']:
if comment.strip():
break
else:
comment_start += 1
for comment in routine['postDeclComments'][comment_start:]:
if not commentToRemoveRe.match(comment):
newDecl.write(comment)
newDecl.write("\n")
routine['declarations'][0] += newDecl.getvalue()
def rmNullify(var, strings):
removed = 0