Removed a useless len field for field lines

1 files changed, 41 insertions, 49 deletions

diff --git a/src/field.nim b/src/field.nim
index 215a0e3..82a8575 100644
--- a/src/field.nim
+++ b/src/field.nim
@@ -1,6 +1,6 @@
 type
   Line = ref object
-    x, l: int
+    x: int
     columns: seq[int]
 
   Field* = object
@@ -12,57 +12,54 @@ func Blank*(f: var Field, x, y: int) =
   if y < f.y or y >= f.y+f.ly: # outside the field
     return
   var l = f.lines[y-f.y]
-  if x < l.x or x >= l.x+l.l: # outside the field
+  if x < l.x or x >= l.x+l.columns.len: # outside the field
     return
-  if x > l.x and x < l.x+l.l-1: # just set the value
+  if x > l.x and x < l.x+l.columns.len-1: # just set the value
     l.columns[x-l.x] = int(' ')
     return
-  if l.l == 1: # this was the last character on the line
+  if l.columns.len == 1: # this was the last character on the line
     if y == f.y: # we need to trim the leading lines
       var i = 1
-      while f.lines[i] == nil or f.lines[i].l == 0:
+      while f.lines[i] == nil or f.lines[i].columns.len == 0:
         inc i
       f.y += i
       f.lines = f.lines[i..<f.ly]
       f.ly -= i
     elif y == f.y+f.ly-1: # we need to trim the trailing lines
       var i = f.ly-2
-      while f.lines[i] == nil or f.lines[i].l == 0:
+      while f.lines[i] == nil or f.lines[i].columns.len == 0:
         dec i
       f.ly = i+1
       f.lines = f.lines[0..<f.ly]
     else: # it was a line in the middle
-      l.l = 0
       l.columns = @[]
   elif x == l.x: # we need to remove leading spaces
     var i = 1
     while l.columns[i] == int(' '):
       inc i
     l.x += i
-    l.columns = l.columns[i..<l.l]
-    l.l -= i
-  elif x == l.l+l.x-1: # we need to remove trailing spaces
-    var i = l.l-2
+    l.columns = l.columns[i..<l.columns.len]
+  elif x == l.columns.len+l.x-1: # we need to remove trailing spaces
+    var i = l.columns.len-2
     while l.columns[i] == int(' '):
       dec i
-    l.l = i+1
-    l.columns = l.columns[0..<l.l]
+    l.columns = l.columns[0..i]
   # we now need to calculate the new field limits
   f.x = f.lines[0].x
-  var x2 = f.lines[0].l + f.lines[0].x
+  var x2 = f.lines[0].columns.len + f.lines[0].x
   for i in 1..<f.ly:
-    if f.lines[i] == nil or f.lines[i].l == 0:
+    if f.lines[i] == nil or f.lines[i].columns.len == 0:
       continue
     if f.x > f.lines[i].x:
       f.x = f.lines[i].x
-    if x2 < f.lines[i].x + f.lines[i].l:
-      x2 = f.lines[i].x + f.lines[i].l
+    if x2 < f.lines[i].x + f.lines[i].columns.len:
+      x2 = f.lines[i].x + f.lines[i].columns.len
   f.lx = x2-f.x
 
 func Get*(f: Field, x, y: int): int =
   if y >= f.y and y < f.y+f.ly:
     let l = f.lines[y-f.y]
-    if x >= l.x and x < l.x+l.l:
+    if x >= l.x and x < l.x+l.columns.len:
       return l.columns[x-l.x]
   return int(' ')
 
@@ -83,12 +80,12 @@ proc Load*(filename: string): ref Field =
     let n = file.readChars(data, 0, 4096)
     if n <= 0:
       if f.ly == 0:
-        if l.l == 0: # we got en empty file!
+        if l.columns.len == 0: # we got en empty file!
           return nil
         f.x = l.x
-      if l.l > 0:
-        if f.lx < l.l+l.x-f.x:
-          f.lx = l.l+l.x-f.x
+      if l.columns.len > 0:
+        if f.lx < l.columns.len+l.x-f.x:
+          f.lx = l.columns.len+l.x-f.x
         f.lines.add(l)
         inc f.ly
       break
@@ -103,14 +100,14 @@ proc Load*(filename: string): ref Field =
         continue
       if data[i] == '\n' or data[i] == '\r':
         if f.ly == 0:
-          if l.l == 0:
+          if l.columns.len == 0:
             return nil
           f.x = l.x
-        if l.l > 0:
+        if l.columns.len > 0:
           if f.x > l.x:
             f.x = l.x
-          if f.lx < l.l+l.x-f.x:
-            f.lx = l.l+l.x-f.x
+          if f.lx < l.columns.len+l.x-f.x:
+            f.lx = l.columns.len+l.x-f.x
         inc f.ly
         f.lines.add(l)
         l = new(Line)
@@ -122,22 +119,20 @@ proc Load*(filename: string): ref Field =
             lastReadIsCR = true
       else:
         if data[i] == ' ':
-          if l.l == 0: # trim leading spaces
+          if l.columns.len == 0: # trim leading spaces
             inc l.x
           else:
             inc trailingSpaces
         else:
           if trailingSpaces > 0:
-            let newL = l.l + trailingSpaces + 1
-            l.columns.setlen(newL)
-            for j in l.l..<newL-1:
+            let oldL = l.columns.len
+            l.columns.setlen(oldL+trailingSpaces+1)
+            for j in oldL..<l.columns.len-1:
               l.columns[j] = int(' ')
-            l.columns[newL-1] = int(data[i])
-            l.l = newL
+            l.columns[^1] = int(data[i])
             trailingSpaces = 0
           else:
             l.columns.add(int(data[i]))
-            inc l.l
       inc i
   return f
 
@@ -147,11 +142,10 @@ func Set*(f: var Field, x, y, v: int) =
   elif y >= f.y:
     if y < f.y+f.ly: # the line exists
       var l = f.lines[y-f.y]
-      if l == nil or l.l == 0: # An empty line is a special case
+      if l == nil or l.columns.len == 0: # An empty line is a special case
         if l == nil:
           new(l)
         l.x = x
-        l.l = 1
         l.columns = @[v]
         f.lines[y-f.y] = l
         if f.x > x:
@@ -160,35 +154,33 @@ func Set*(f: var Field, x, y, v: int) =
         if f.lx < x-f.x+1:
           f.lx = x-f.x+1
       elif x >= l.x:
-        if x < l.x+l.l: # just set the value
+        if x < l.x+l.columns.len: # just set the value
           l.columns[x-l.x] = v
         else: # append columns
-          let newL = x-l.x+1
-          l.columns.setlen(newL)
-          for i in l.l..<newL-1:
+          let oldL = l.columns.len
+          l.columns.setlen(x-l.x+1)
+          for i in oldL..<l.columns.len-1:
             l.columns[i] = int(' ')
-          l.columns[newL-1] = v
-          l.l = newL
-          if f.lx < l.l+l.x-f.x:
-            f.lx = l.l+l.x-f.x
+          l.columns[^1] = v
+          if f.lx < l.columns.len+l.x-f.x:
+            f.lx = l.columns.len+l.x-f.x
       else: # preprend columns
-        let newL = l.l + l.x - x
-        var newline = newSeqUninitialized[int](newL)
+        let oldL = l.columns.len
+        var newline = newSeqUninitialized[int](oldL+l.x-x)
         newline[0] = v
         for i in 1..<l.x-x:
           newline[i] = int(' ')
-        for i in l.x-x..<newL:
+        for i in l.x-x..<newline.len:
           newline[i] = l.columns[i-l.x+x]
         l.columns = newline
         l.x = x
-        l.l = newL
         if f.x > x:
           f.lx = f.lx + f.x - x
           f.x = x
     else: # append lines
       f.ly = y-f.y+1
       f.lines.setlen(f.ly)
-      f.lines[f.ly-1] = Line(x: x, l: 1, columns: @[v])
+      f.lines[f.ly-1] = Line(x: x, columns: @[v])
       if f.x > x:
         f.lx = f.lx + f.x - x
         f.x = x
@@ -197,7 +189,7 @@ func Set*(f: var Field, x, y, v: int) =
   else: # prepend lines
     let newLy = f.ly+f.y-y
     var newlines = newSeq[Line](newLy)
-    newlines[0] = Line(x: x, l: 1, columns: @[v])
+    newlines[0] = Line(x: x, columns: @[v])
     for i in f.y-y..<newLy:
       newlines[i] = f.lines[i-f.y+y]
     f.lines = newlines