adyxax/gofunge98
1
0
Fork 0
Code Issues Releases Activity

Fixed some more resizing bugs in certain situations not covered by mycology

Browse source
This commit is contained in:
Julien Dessaux 2021-10-01 17:24:09 +02:00
parent 2f66ddcb91
commit 749caa9e26
4 changed files with 43 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkg/field/blank.go
View file

@ -86,6 +86,9 @@ func (f *Field) Blank(x, y int) {
f.x = f.lines[0].x
x2 := f.lines[0].l + f.lines[0].x
for i := 1; i < f.ly; i++ {
if f.lines[i].l == 0 {
continue
}
if f.x > f.lines[i].x {
f.x = f.lines[i].x
}

10
pkg/field/blank_test.go
View file

@ -45,13 +45,13 @@ func TestBlankInside(t *testing.T) {
func TestBlankInsideLine(t *testing.T) {
input := Field{
x: 0,
x: -5,
y: 0,
lx: 3,
lx: 8,
ly: 3,
lines: []Line{
Line{x: 0, l: 3, columns: []int{'@', 'a', 'b'}},
Line{x: 0, l: 1, columns: []int{'d'}},
Line{x: -5, l: 1, columns: []int{'d'}},
Line{x: 0, l: 1, columns: []int{'c'}},
},
}
@ -62,7 +62,7 @@ func TestBlankInsideLine(t *testing.T) {
ly: 3,
lines: []Line{
Line{x: 0, l: 3, columns: []int{'@', 'a', 'b'}},
Line{columns: []int{}},
Line{x: -5, columns: []int{}},
Line{x: 0, l: 1, columns: []int{'c'}},
},
}
@ -74,7 +74,7 @@ func TestBlankInsideLine(t *testing.T) {
inputY int
expected *Field
}{
{"inside", &input, 0, 1, &expected},
{"inside", &input, -5, 1, &expected},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {

7
pkg/field/set.go
View file

@ -13,6 +13,13 @@ func (f *Field) Set(x, y, v int) {
l.x = x
l.l = 1
l.columns = append(l.columns, v)
if f.x > x {
f.lx = f.lx + f.x - x
f.x = x
}
if f.lx < x-f.x+1 {
f.lx = x - f.x + 1
}
} else if x >= l.x {
if x < l.x+l.l {
// just set the value

28
pkg/field/set_test.go
View file

@ -237,6 +237,13 @@ func TestSetAppendResize(t *testing.T) {
Line{x: 0, l: 1, columns: []int{'d'}},
},
}
blank := Field{
x: 0, y: -1, lx: 2, ly: 3, lines: []Line{
Line{x: 0, l: 1, columns: []int{'u'}},
Line{x: 0, l: 2, columns: []int{'0', 'r'}},
Line{x: 0, l: 1, columns: []int{'d'}},
},
}
xappend := Field{
x: -1, y: -1, lx: 5, ly: 3, lines: []Line{
Line{x: 0, l: 1, columns: []int{'u'}},
@ -287,6 +294,24 @@ func TestSetAppendResize(t *testing.T) {
Line{x: 3, l: 1, columns: []int{'n'}},
},
}
xappendyappendEp := Field{
x: -5, y: -1, lx: 9, ly: 5, lines: []Line{
Line{x: 0, l: 1, columns: []int{'u'}},
Line{x: -1, l: 3, columns: []int{'l', '0', 'r'}},
Line{x: 0, l: 1, columns: []int{'d'}},
Line{x: -5, l: 1, columns: []int{'e'}},
Line{x: 3, l: 1, columns: []int{'n'}},
},
}
xappendyappendEa := Field{
x: -1, y: -1, lx: 7, ly: 5, lines: []Line{
Line{x: 0, l: 1, columns: []int{'u'}},
Line{x: -1, l: 3, columns: []int{'l', '0', 'r'}},
Line{x: 0, l: 1, columns: []int{'d'}},
Line{x: 5, l: 1, columns: []int{'e'}},
Line{x: 3, l: 1, columns: []int{'n'}},
},
}
// Test cases
testCases := []struct {
name string
@ -296,12 +321,15 @@ func TestSetAppendResize(t *testing.T) {
inputV int
expected Field
}{
{"blank", base, -1, 0, ' ', blank},
{"xappend", base, 3, 1, 'n', xappend},
{"xprepend", base, -3, 1, 'n', xprepend},
{"xprependyprepend", base, -3, -3, 'n', xprependyprepend},
{"xappendyprepend", base, 3, -3, 'n', xappendyprepend},
{"xprependyappend", base, -3, 3, 'n', xprependyappend},
{"xappendyappend", base, 3, 3, 'n', xappendyappend},
{"xappendyappendEp", xappendyappend, -5, 2, 'e', xappendyappendEp},
{"xappendyappendEa", xappendyappend, 5, 2, 'e', xappendyappendEa},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {