Profouzors
/
boxespy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TrayLayout: Give more descriptive parse errors 

Also allow both X and now also x for removed floor
This commit is contained in:
Florian Festi 2021-03-14 17:22:54 +01:00
parent 7397e49b2b
commit 7355d0d612
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boxes/generators/traylayout.py
View File

@ -360,7 +360,7 @@ You can replace the space characters representing the floor by a "X" to remove t
hwalls = [] hwalls = []
vwalls = [] vwalls = []
floors = [] floors = []
for line in input: for nr, line in enumerate(input):
if not line or line[0] == "#": if not line or line[0] == "#":
continue continue
m = re.match(r"( \|)* ,>\s*(\d*\.?\d+)\s*mm\s*", line) m = re.match(r"( \|)* ,>\s*(\d*\.?\d+)\s*mm\s*", line)
@ -389,25 +389,25 @@ You can replace the space characters representing the floor by a "X" to remove t
f = [] f = []
for n, c in enumerate(line[:len(x) * 2 + 1]): for n, c in enumerate(line[:len(x) * 2 + 1]):
if n % 2: if n % 2:
if c == 'X': if c in 'xX':
f.append(False) f.append(False)
elif c == ' ': elif c == ' ':
f.append(True) f.append(True)
else: else:
raise ValueError(line) raise ValueError('''Can't parse line %i in layout: expected " ", "x" or "X" for char #%i''' % (nr+1, n+1))
else: else:
if c == ' ': if c == ' ':
w.append(False) w.append(False)
elif c == '|': elif c == '|':
w.append(True) w.append(True)
else: else:
raise ValueError(line) raise ValueError('''Can't parse line %i in layout: expected " ", or "|" for char #%i''' % (nr+1, n+1))
floors.append(f) floors.append(f)
vwalls.append(w) vwalls.append(w)
m = re.match(r"([ |][ X])+[ |]\s*(\d*\.?\d+)\s*mm\s*", line) m = re.match(r"([ |][ xX])+[ |]\s*(\d*\.?\d+)\s*mm\s*", line)
if not m: if not m:
raise ValueError(line) raise ValueError('''Can't parse line %i in layout: Can read height of the row''' % (nr+1))
else: else:
y.append(float(m.group(2))) y.append(float(m.group(2)))