From e6250b237be8f68dcdb4ad58174e88eb7c1eac43 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Tue, 12 Oct 2021 00:31:17 +0200
Subject: Removed useless ly field

---
 tests/field.nim | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'tests/field.nim')

diff --git a/tests/field.nim b/tests/field.nim
index b3c16a3..e386e37 100644
--- a/tests/field.nim
+++ b/tests/field.nim
@@ -3,18 +3,18 @@ import unittest
 include ../src/field
 
 func `==`(a, b: Line): bool = a.x == b.x and a.columns == b.columns
-func `==`(a, b: Field): bool = a.x == b.x and a.lx == b.lx and a.y == b.y and a.ly == b.ly and a.lines == b.lines
+func `==`(a, b: Field): bool = a.x == b.x and a.lx == b.lx and a.y == b.y and a.lines == b.lines
 
 func cols(a: openarray[char]): seq[int] =
   result.setlen(a.len)
   for i in 0..<a.len:
     result[i] = a[i].int()
 
-const minimal = Field(x: 0, y: 0, lx: 1, ly: 1, lines: @[Line(x: 0, columns: @[int('@')])])
+const minimal = Field(x: 0, y: 0, lx: 1, lines: @[Line(x: 0, columns: @[int('@')])])
 
 suite "Field":
   test "Blank":
-    var f = Field(x: -7, y: -5, lx: 17, ly: 10, lines: @[
+    var f = Field(x: -7, y: -5, lx: 17, lines: @[
       Line(x: -5, columns: @[int('x')]),
       Line(x: 0, columns: @[]),
       Line(x: 8, columns: @[int('u')]),
@@ -26,7 +26,7 @@ suite "Field":
       Line(x: 0, columns: @[]),
       Line(x: -7, columns: @[int('y')]),
     ])
-    const moinsz = Field(x: -7, y: -5, lx: 17, ly: 10, lines: @[
+    const moinsz = Field(x: -7, y: -5, lx: 17, lines: @[
       Line(x: -5, columns: @[int('x')]),
       Line(x: 0, columns: @[]),
       Line(x: 8, columns: @[int('u')]),
@@ -40,7 +40,7 @@ suite "Field":
     ])
     f.Blank(1, 0)
     check f == moinsz
-    const moinsy = Field(x: -5, y: -5, lx: 15, ly: 8, lines: @[
+    const moinsy = Field(x: -5, y: -5, lx: 15, lines: @[
       Line(x: -5, columns: @[int('x')]),
       Line(x: 0, columns: @[]),
       Line(x: 8, columns: @[int('u')]),
@@ -52,7 +52,7 @@ suite "Field":
     ])
     f.Blank(-7, 4)
     check f == moinsy
-    const moinsx = Field(x: -3, y: -3, lx: 13, ly: 6, lines: @[
+    const moinsx = Field(x: -3, y: -3, lx: 13, lines: @[
       Line(x: 8, columns: @[int('u')]),
       Line(x: 9, columns: @[int('e')]),
       Line(x: 0, columns: @[]),
@@ -62,7 +62,7 @@ suite "Field":
     ])
     f.Blank(-5, -5)
     check f == moinsx
-    const moinsf = Field(x: -2, y: -3, lx: 12, ly: 6, lines: @[
+    const moinsf = Field(x: -2, y: -3, lx: 12, lines: @[
       Line(x: 8, columns: @[int('u')]),
       Line(x: 9, columns: @[int('e')]),
       Line(x: 0, columns: @[]),
@@ -72,7 +72,7 @@ suite "Field":
     ])
     f.Blank(-3, 1)
     check f == moinsf
-    const moinse = Field(x: -2, y: -3, lx: 11, ly: 6, lines: @[
+    const moinse = Field(x: -2, y: -3, lx: 11, lines: @[
       Line(x: 8, columns: @[int('u')]),
       Line(x: 9, columns: @[]),
       Line(x: 0, columns: @[]),
@@ -82,20 +82,20 @@ suite "Field":
     ])
     f.Blank(9, -2)
     check f == moinse
-    const moinsu = Field(x: -2, y: 0, lx: 8, ly: 3, lines: @[
+    const moinsu = Field(x: -2, y: 0, lx: 8, lines: @[
       Line(x: -2, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')]),
       Line(x: -3, columns: @[]),
       Line(x: 5, columns: @[int('d')]),
     ])
     f.Blank(8, -3)
     check f == moinsu
-    const moinsd = Field(x: -2, y: 0, lx: 7, ly: 1, lines: @[Line(x: -2, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')])])
+    const moinsd = Field(x: -2, y: 0, lx: 7, lines: @[Line(x: -2, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')])])
     f.Blank(5, 2)
     check f == moinsd
-    const moinsl = Field(x: 0, y: 0, lx: 5, ly: 1, lines: @[Line(x: 0, columns: @[int('@'), 32, 32, 32, int('r')])])
+    const moinsl = Field(x: 0, y: 0, lx: 5, lines: @[Line(x: 0, columns: @[int('@'), 32, 32, 32, int('r')])])
     f.Blank(-2, 0)
     check f == moinsl
-    const moinsr = Field(x: 0, y: 0, lx: 1, ly: 1, lines: @[Line(x: 0, columns: @[int('@')])])
+    const moinsr = Field(x: 0, y: 0, lx: 1, lines: @[Line(x: 0, columns: @[int('@')])])
     f.Blank(4, 0)
     check f == moinsr
   test "Get":
@@ -108,20 +108,20 @@ suite "Field":
     check Load("nonexistant") == nil
     check Load("examples/invalid.b98") == nil
     check Load("examples/empty.b98") == nil
-    check Load("examples/minimal.b98")[] == Field(lx: 1, ly: 1, lines: @[Line(columns: @['@'].cols)])
-    let hello = Field(lx: 24, ly: 1, lines: @[Line(columns: @['6', '4', '+', '"', '!', 'd', 'l', 'r', 'o', 'W', ' ', ',', 'o', 'l', 'l', 'e', 'H', '"', '>', ':', '#', ',', '_', '@'].cols)])
+    check Load("examples/minimal.b98")[] == Field(lx: 1, lines: @[Line(columns: @['@'].cols)])
+    let hello = Field(lx: 24, lines: @[Line(columns: @['6', '4', '+', '"', '!', 'd', 'l', 'r', 'o', 'W', ' ', ',', 'o', 'l', 'l', 'e', 'H', '"', '>', ':', '#', ',', '_', '@'].cols)])
     check Load("examples/hello.b98")[] == hello
     check Load("examples/rn.b98")[] == hello
-    check Load("examples/hello2.b98")[] == Field(x: 1, lx: 33, ly: 2, lines: @[
+    check Load("examples/hello2.b98")[] == Field(x: 1, lx: 33, lines: @[
       Line(x: 33, columns: @['v'].cols),
       Line(x: 1, columns: @['@', ' ', '>', ' ', '#', ';', '>', ':', '#', ',', '_', 'e', '-', 'j', ';', ' ', '"', 'H', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', '!',
           '"', 'd', 'a', '<'].cols)
     ])
-    check Load("examples/factorial.b98")[] == Field(x: 0, lx: 15, ly: 2, lines: @[
+    check Load("examples/factorial.b98")[] == Field(x: 0, lx: 15, lines: @[
       Line(x: 0, columns: @['&', '>', ':', '1', '-', ':', 'v', ' ', 'v', ' ', '*', '_', '$', '.', '@'].cols),
       Line(x: 1, columns: @['^', ' ', ' ', ' ', ' ', '_', '$', '>', '\\', ':', '^'].cols)
     ])
-    check Load("examples/dna.b98")[] == Field(x: 0, lx: 7, ly: 8, lines: @[
+    check Load("examples/dna.b98")[] == Field(x: 0, lx: 7, lines: @[
       Line(x: 0, columns: @['7', '^', 'D', 'N', '>', 'v', 'A'].cols),
       Line(x: 0, columns: @['v', '_', '#', 'v', '?', ' ', 'v'].cols),
       Line(x: 0, columns: @['7', '^', '<', '"', '"', '"', '"'].cols),
@@ -132,25 +132,25 @@ suite "Field":
       Line(x: 0, columns: @['>', ' ', ',', '+', ',', '@', ')'].cols),
     ])
   test "Set":
-    var f = Field(x: 0, y: 0, lx: 1, ly: 1, lines: @[Line(x: 0, columns: @['>'].cols)])
+    var f = Field(x: 0, y: 0, lx: 1, lines: @[Line(x: 0, columns: @['>'].cols)])
     f.Set(0, 0, int('@'))
     check f == minimal
     f.Set(1, 0, int(' '))
     check f == minimal
-    const xappend = Field(x: 0, y: 0, lx: 5, ly: 1, lines: @[Line(x: 0, columns: @[int('@'), 32, 32, 32, int('r')])])
+    const xappend = Field(x: 0, y: 0, lx: 5, lines: @[Line(x: 0, columns: @[int('@'), 32, 32, 32, int('r')])])
     f.Set(4, 0, int('r'))
     check f == xappend
-    const xprepend = Field(x: -2, y: 0, lx: 7, ly: 1, lines: @[Line(x: -2, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')])])
+    const xprepend = Field(x: -2, y: 0, lx: 7, lines: @[Line(x: -2, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')])])
     f.Set(-2, 0, int('l'))
     check f == xprepend
-    const yappend = Field(x: -2, y: 0, lx: 8, ly: 3, lines: @[
+    const yappend = Field(x: -2, y: 0, lx: 8, lines: @[
       Line(x: -2, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')]),
       Line(x: 0, columns: @[]),
       Line(x: 5, columns: @[int('d')]),
     ])
     f.Set(5, 2, int('d'))
     check f == yappend
-    const yprepend = Field(x: -2, y: -3, lx: 11, ly: 6, lines: @[
+    const yprepend = Field(x: -2, y: -3, lx: 11, lines: @[
       Line(x: 8, columns: @[int('u')]),
       Line(x: 0, columns: @[]),
       Line(x: 0, columns: @[]),
@@ -160,7 +160,7 @@ suite "Field":
     ])
     f.Set(8, -3, int('u'))
     check f == yprepend
-    const xappendEmptyline = Field(x: -2, y: -3, lx: 12, ly: 6, lines: @[
+    const xappendEmptyline = Field(x: -2, y: -3, lx: 12, lines: @[
       Line(x: 8, columns: @[int('u')]),
       Line(x: 9, columns: @[int('e')]),
       Line(x: 0, columns: @[]),
@@ -170,7 +170,7 @@ suite "Field":
     ])
     f.Set(9, -2, int('e'))
     check f == xappendEmptyline
-    const xprependEmptyline = Field(x: -3, y: -3, lx: 13, ly: 6, lines: @[
+    const xprependEmptyline = Field(x: -3, y: -3, lx: 13, lines: @[
       Line(x: 8, columns: @[int('u')]),
       Line(x: 9, columns: @[int('e')]),
       Line(x: 0, columns: @[]),
@@ -180,7 +180,7 @@ suite "Field":
     ])
     f.Set(-3, 1, int('f'))
     check f == xprependEmptyline
-    const xprependyprepend = Field(x: -5, y: -5, lx: 15, ly: 8, lines: @[
+    const xprependyprepend = Field(x: -5, y: -5, lx: 15, lines: @[
       Line(x: -5, columns: @[int('x')]),
       Line(x: 0, columns: @[]),
       Line(x: 8, columns: @[int('u')]),
@@ -192,7 +192,7 @@ suite "Field":
     ])
     f.Set(-5, -5, int('x'))
     check f == xprependyprepend
-    const xprependyappend = Field(x: -7, y: -5, lx: 17, ly: 10, lines: @[
+    const xprependyappend = Field(x: -7, y: -5, lx: 17, lines: @[
       Line(x: -5, columns: @[int('x')]),
       Line(x: 0, columns: @[]),
       Line(x: 8, columns: @[int('u')]),
-- 
cgit v1.2.3