adyxax/nimfunge98
Archived
1
0
Fork 0
Code Issues Activity

Refactoring

Browse source
This commit is contained in:
Julien Dessaux 2021-10-17 21:45:28 +02:00
parent e6250b237b
commit a14c946d25
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/field.nim
View file

@ -9,23 +9,25 @@ type
lines: seq[Line] lines: seq[Line]
func Blank*(f: var Field, x, y: int) = func Blank*(f: var Field, x, y: int) =
if y < f.y or y >= f.y+f.lines.len: # outside the field let ly = f.lines.len
if y < f.y or y >= f.y+ly: # outside the field
return return
var l = addr f.lines[y-f.y] var l = addr f.lines[y-f.y]
if x < l.x or x >= l.x+l.columns.len: # outside the field let ll = l.columns.len
if x < l.x or x >= l.x+ll: # outside the field
return return
if x > l.x and x < l.x+l.columns.len-1: # just set the value if x > l.x and x < l.x+ll-1: # just set the value
l.columns[x-l.x] = int(' ') l.columns[x-l.x] = int(' ')
return return
if l.columns.len == 1: # this was the last character on the line if ll == 1: # this was the last character on the line
if y == f.y: # we need to trim the leading lines if y == f.y: # we need to trim the leading lines
var i = 1 var i = 1
while f.lines[i].columns.len == 0: while f.lines[i].columns.len == 0:
inc i inc i
f.y += i f.y += i
f.lines = f.lines[i..<f.lines.len] f.lines = f.lines[i..<ly]
elif y == f.y+f.lines.len-1: # we need to trim the trailing lines elif y == f.y+ly-1: # we need to trim the trailing lines
var i = f.lines.len-2 var i = ly-2
while f.lines[i].columns.len == 0: while f.lines[i].columns.len == 0:
dec i dec i
f.lines = f.lines[0..i] f.lines = f.lines[0..i]
@ -36,9 +38,9 @@ func Blank*(f: var Field, x, y: int) =
while l.columns[i] == int(' '): while l.columns[i] == int(' '):
inc i inc i
l.x += i l.x += i
l.columns = l.columns[i..<l.columns.len] l.columns = l.columns[i..<ll]
elif x == l.columns.len+l.x-1: # we need to remove trailing spaces elif x == ll+l.x-1: # we need to remove trailing spaces
var i = l.columns.len-2 var i = ll-2
while l.columns[i] == int(' '): while l.columns[i] == int(' '):
dec i dec i
l.columns = l.columns[0..i] l.columns = l.columns[0..i]