diff options
Diffstat (limited to '')
| -rw-r--r-- | src/field.nim | 12 | ||||
| -rw-r--r-- | tests/field.nim | 74 |
2 files changed, 43 insertions, 43 deletions
diff --git a/src/field.nim b/src/field.nim index 1cd1874..e7280f8 100644 --- a/src/field.nim +++ b/src/field.nim @@ -8,7 +8,7 @@ type lx, ly: int 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.ly: # outside the field return var l = addr f.lines[y-f.y] @@ -59,17 +59,17 @@ func blank*(f: var Field, x, y: int) = x2 = f.lines[i].x + f.lines[i].l f.lx = x2-f.x -func get*(f: Field, x, y: int): int = +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: return l.columns[x-l.x] return int(' ') -func isIn*(f: Field, x, y: int): bool = +func IsIn*(f: Field, x, y: int): bool = return x >= f.x and y >= f.y and x < f.x+f.lx and y < f.y+f.ly -proc load*(f: var Field, filename: string): bool = +proc Load*(f: var Field, filename: string): bool = var file: File if not open(file, filename): return false @@ -132,9 +132,9 @@ proc load*(f: var Field, filename: string): bool = f.lines = f.lines[0..<f.ly] return true -func set*(f: var Field, x, y, v: int) = +func Set*(f: var Field, x, y, v: int) = if v == int(' '): - f.blank(x, y) + f.Blank(x, y) elif y >= f.y: if y < f.y+f.ly: # the line exists var l = addr f.lines[y-f.y] diff --git a/tests/field.nim b/tests/field.nim index 8d5a1dc..8acd6b3 100644 --- a/tests/field.nim +++ b/tests/field.nim @@ -12,7 +12,7 @@ func cols(a: openarray[char]): seq[int] = const minimal = Field(x: 0, y: 0, lx: 1, ly: 1, lines: @[Line(x: 0, l: 1, columns: @[int('@')])]) suite "Field": - test "blank": + test "Blank": var f = Field(x: -7, y: -5, lx: 17, ly: 10, lines: @[ Line(x: -5, l: 1, columns: @[int('x')]), Line(x: 0, l: 0, columns: @[]), @@ -37,7 +37,7 @@ suite "Field": Line(x: 0, l: 0, columns: @[]), Line(x: -7, l: 1, columns: @[int('y')]), ]) - f.blank(1, 0) + f.Blank(1, 0) check f == moinsz const moinsy = Field(x: -5, y: -5, lx: 15, ly: 8, lines: @[ Line(x: -5, l: 1, columns: @[int('x')]), @@ -49,7 +49,7 @@ suite "Field": Line(x: -3, l: 1, columns: @[int('f')]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.blank(-7, 4) + f.Blank(-7, 4) check f == moinsy const moinsx = Field(x: -3, y: -3, lx: 13, ly: 6, lines: @[ Line(x: 8, l: 1, columns: @[int('u')]), @@ -59,7 +59,7 @@ suite "Field": Line(x: -3, l: 1, columns: @[int('f')]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.blank(-5, -5) + f.Blank(-5, -5) check f == moinsx const moinsf = Field(x: -2, y: -3, lx: 12, ly: 6, lines: @[ Line(x: 8, l: 1, columns: @[int('u')]), @@ -69,7 +69,7 @@ suite "Field": Line(x: -3, l: 0, columns: @[]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.blank(-3, 1) + f.Blank(-3, 1) check f == moinsf const moinse = Field(x: -2, y: -3, lx: 11, ly: 6, lines: @[ Line(x: 8, l: 1, columns: @[int('u')]), @@ -79,57 +79,57 @@ suite "Field": Line(x: -3, l: 0, columns: @[]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.blank(9, -2) + f.Blank(9, -2) check f == moinse const moinsu = Field(x: -2, y: 0, lx: 8, ly: 3, lines: @[ Line(x: -2, l: 7, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')]), Line(x: -3, l: 0, columns: @[]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.blank(8, -3) + f.Blank(8, -3) check f == moinsu const moinsd = Field(x: -2, y: 0, lx: 7, ly: 1, lines: @[Line(x: -2, l: 7, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')])]) - f.blank(5, 2) + f.Blank(5, 2) check f == moinsd const moinsl = Field(x: 0, y: 0, lx: 5, ly: 1, lines: @[Line(x: 0, l: 5, columns: @[int('@'), 32, 32, 32, int('r')])]) - f.blank(-2,0) + f.Blank(-2,0) check f == moinsl const moinsr = Field(x: 0, y: 0, lx: 1, ly: 1, lines: @[Line(x: 0, l: 1, columns: @[int('@')])]) - f.blank(4,0) + f.Blank(4,0) check f == moinsr - test "get": - check minimal.get(0,0) == int('@') - check minimal.get(1,0) == int(' ') - test "isIn": - check minimal.isIn(0, 0) == true - check minimal.isIn(1, 0) == false - test "load": + test "Get": + check minimal.Get(0,0) == int('@') + check minimal.Get(1,0) == int(' ') + test "IsIn": + check minimal.IsIn(0, 0) == true + check minimal.IsIn(1, 0) == false + test "Load": var nonexistant: Field - check nonexistant.load("nonexistant") == false + check nonexistant.Load("nonexistant") == false var invalid: Field - check invalid.load("examples/invalid.b98") == false + check invalid.Load("examples/invalid.b98") == false var empty: Field - check empty.load("examples/empty.b98") == false + check empty.Load("examples/empty.b98") == false var min: Field - check min.load("examples/minimal.b98") == true + check min.Load("examples/minimal.b98") == true check min == minimal var hello1A: Field; var hello1B = Field(lx: 24, ly: 1, lines: @[Line(l:24, columns: @['6', '4', '+', '"', '!', 'd', 'l', 'r', 'o', 'W', ' ', ',', 'o', 'l', 'l', 'e', 'H', '"', '>', ':', '#', ',', '_', '@'].cols)]) - check hello1A.load("examples/hello.b98") == true + check hello1A.Load("examples/hello.b98") == true check hello1A == hello1B var rn: Field - check rn.load("examples/rn.b98") == true + check rn.Load("examples/rn.b98") == true check rn == hello1B var hello2A: Field; var hello2B = Field(x: 1, lx: 33, ly: 2,lines: @[ Line(x:33, l:1, columns: @['v'].cols), Line(x:1, l:33, columns: @['@', ' ', '>', ' ', '#', ';', '>', ':', '#', ',', '_', 'e', '-', 'j', ';', ' ', '"', 'H', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd', '!', '"', 'd', 'a', '<'].cols) ]) - check hello2A.load("examples/hello2.b98") == true + check hello2A.Load("examples/hello2.b98") == true check hello2A == hello2B var factorial2A: Field; var factorial2B = Field(x: 0, lx: 15, ly: 2,lines: @[ Line(x:0, l:15, columns: @['&', '>', ':', '1', '-', ':', 'v', ' ', 'v', ' ', '*', '_', '$', '.', '@'].cols), Line(x:1, l:11, columns: @['^', ' ', ' ', ' ', ' ', '_', '$', '>', '\\', ':', '^'].cols) ]) - check factorial2A.load("examples/factorial.b98") == true + check factorial2A.Load("examples/factorial.b98") == true check factorial2A == factorial2B var dna2A: Field; var dna2B = Field(x: 0, lx: 7, ly: 8,lines: @[ Line(x:0, l:7, columns: @['7', '^', 'D', 'N', '>', 'v', 'A'].cols), @@ -141,26 +141,26 @@ suite "Field": Line(x:0, l:7, columns: @['+', '8', '^', '-', '1', ',', '<'].cols), Line(x:0, l:7, columns: @['>', ' ', ',', '+', ',', '@', ')'].cols), ]) - check dna2A.load("examples/dna.b98") == true + check dna2A.Load("examples/dna.b98") == true check dna2A == dna2B - test "set": + test "Set": var f = Field(x: 0, y: 0, lx: 1, ly: 1, lines: @[Line(x: 0, l: 1, columns: @['>'].cols)]) - f.set(0,0,int('@')) + f.Set(0,0,int('@')) check f == minimal - f.set(1,0,int(' ')) + f.Set(1,0,int(' ')) check f == minimal const xappend = Field(x: 0, y: 0, lx: 5, ly: 1, lines: @[Line(x: 0, l: 5, columns: @[int('@'), 32, 32, 32, int('r')])]) - f.set(4, 0, 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, l: 7, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')])]) - f.set(-2, 0, int('l')) + f.Set(-2, 0, int('l')) check f == xprepend const yappend = Field(x: -2, y: 0, lx: 8, ly: 3, lines: @[ Line(x: -2, l: 7, columns: @[int('l'), 32, int('@'), 32, 32, 32, int('r')]), Line(x: 0, l: 0, columns: @[]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.set(5, 2, int('d')) + f.Set(5, 2, int('d')) check f == yappend const yprepend = Field(x: -2, y: -3, lx: 11, ly: 6, lines: @[ Line(x: 8, l: 1, columns: @[int('u')]), @@ -170,7 +170,7 @@ suite "Field": Line(x: 0, l: 0, columns: @[]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.set(8, -3, int('u')) + f.Set(8, -3, int('u')) check f == yprepend const xappendEmptyline = Field(x: -2, y: -3, lx: 12, ly: 6, lines: @[ Line(x: 8, l: 1, columns: @[int('u')]), @@ -180,7 +180,7 @@ suite "Field": Line(x: 0, l: 0, columns: @[]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.set(9, -2, int('e')) + f.Set(9, -2, int('e')) check f == xappendEmptyline const xprependEmptyline = Field(x: -3, y: -3, lx: 13, ly: 6, lines: @[ Line(x: 8, l: 1, columns: @[int('u')]), @@ -190,7 +190,7 @@ suite "Field": Line(x: -3, l: 1, columns: @[int('f')]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.set(-3, 1, int('f')) + f.Set(-3, 1, int('f')) check f == xprependEmptyline const xprependyprepend = Field(x: -5, y: -5, lx: 15, ly: 8, lines: @[ Line(x: -5, l: 1, columns: @[int('x')]), @@ -202,7 +202,7 @@ suite "Field": Line(x: -3, l: 1, columns: @[int('f')]), Line(x: 5, l: 1, columns: @[int('d')]), ]) - f.set(-5, -5, int('x')) + f.Set(-5, -5, int('x')) check f == xprependyprepend const xprependyappend = Field(x: -7, y: -5, lx: 17, ly: 10, lines: @[ Line(x: -5, l: 1, columns: @[int('x')]), @@ -216,5 +216,5 @@ suite "Field": Line(x: 0, l: 0, columns: @[]), Line(x: -7, l: 1, columns: @[int('y')]), ]) - f.set(-7, 4, int('y')) + f.Set(-7, 4, int('y')) check f == xprependyappend |