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

[wmlparser2] Last fix introduced a different bug.

Browse source 
Should work properly now.
This commit is contained in:
Allefant 2014-01-06 00:12:14 +01:00
parent 22c1b23e82
commit 3799631bd4
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
data/tools/wesnoth/wmlparser2.py
View file

@ -351,17 +351,17 @@ class Parser:
else:
for i, segment in enumerate(line.split("+")):
segment = segment.lstrip(" ")
empty = not segment.strip()
at_line_end = segment.endswith("\n")
# if a plus sign is followed by only whitespace on that line,
# if a plus sign is followed by the end of the line,
# we need to ignore the following empty lines to find the
# continuation
if i > 0 and empty:
if i > 0 and at_line_end:
self.skip_newlines = True
elif not empty:
elif not at_line_end:
self.skip_newlines = False
if not segment: continue
if segment[0] == "_":
@ -458,7 +458,7 @@ class Parser:
# Everything from chr(254) to newline is the command.
compos = rawline.find(command_marker_byte)
if compos >= 0:
self.parse_line_without_commands(rawline[:compos])
self.parse_line_without_commands(rawline[:compos] + "\n")
self.handle_command(rawline[compos + 1:-1])
else:
self.parse_line_without_commands(rawline)
@ -721,6 +721,14 @@ foo="bar"+{baz}
foo='bar' .. 'baz'
""", "defined multi line string")
test(
"""
foo="bar" + "baz" # blah
""",
"""
foo='bar' .. 'baz'
""", "comment after +")
test2(
"""
[test]