0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor macro reference-parsing into its own function

Browse source 
I have need for a macro-parsing ability, and realized that there was already existing code locked inside the CrossRef class.
This commit is contained in:
Groggy Dice 2013-12-16 17:59:23 -05:00
parent 096417df47
commit 7a014e8030
1 changed files with 41 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
data/tools/wesnoth/wmltools.py
View file

@ -139,6 +139,46 @@ def isresource(filename):
(root, ext) = os.path.splitext(filename)
return ext and ext[1:] in resource_extensions
def parse_macroref(start, line):
brackdepth = parendepth = 0
instring = False
args = []
arg = ""
for i in xrange(start, len(line)):
if instring:
if line[i] == '"':
instring = False
else:
arg += line[i]
elif line[i] == '"':
instring = not instring
elif line[i] == "{":
if brackdepth > 0:
arg += line[i]
brackdepth += 1
elif line[i] == "}":
brackdepth -= 1
if brackdepth == 0:
if not line[i-1].isspace():
args.append(arg)
arg = ""
break
else:
arg += line[i]
elif line[i] == "(":
parendepth += 1
elif line[i] == ")":
parendepth -= 1
elif not line[i-1].isspace() and \
line[i].isspace() and \
brackdepth == 1 and \
parendepth == 0:
args.append(arg)
arg = ""
elif not line[i].isspace():
arg += line[i]
return (args, brackdepth, parendepth)
def formaltype(f):
# Deduce the expected type of the formal
if f.startswith("_"):
@ -570,43 +610,7 @@ class CrossRef:
# Count the number of actual arguments.
# Set args to None if the call doesn't
# close on this line
brackdepth = parendepth = 0
instring = False
args = []
arg = ""
for i in xrange(match.start(0), len(line)):
if instring:
if line[i] == '"':
instring = False
else:
arg += line[i]
elif line[i] == '"':
instring = not instring
elif line[i] == "{":
if brackdepth > 0:
arg += line[i]
brackdepth += 1
elif line[i] == "}":
brackdepth -= 1
if brackdepth == 0:
if not line[i-1].isspace():
args.append(arg)
arg = ""
break
else:
arg += line[i]
elif line[i] == "(":
parendepth += 1
elif line[i] == ")":
parendepth -= 1
elif not line[i-1].isspace() and \
line[i].isspace() and \
brackdepth == 1 and \
parendepth == 0:
args.append(arg)
arg = ""
elif not line[i].isspace():
arg += line[i]
(args, brackdepth, parendepth) = parse_macroref(match.start(0), line)
if brackdepth > 0 or parendepth > 0:
args = None
else: