From 2fd8313af853a198fd14a79ded6ee547227fe229 Mon Sep 17 00:00:00 2001 From: Patrick Stephen Date: Sat, 22 May 2021 22:54:02 -0500 Subject: [PATCH] oak: address some basic linting (deadcode, misspell) --- alg/range/intrange/infinite.go | 2 +- audio/fontManager_test.go | 2 +- config.go | 2 +- debugConsole.go | 2 +- entities/x/btn/button.go | 2 +- event/bus_test.go | 9 ++++++-- event/entity.go | 2 +- event/entity_test.go | 10 -------- oakerr/errors_test.go | 3 +-- oakerr/format_string.go | 2 +- render/decoder_test.go | 4 ++-- scene/map_test.go | 2 +- shape/bezier_test.go | 6 ++--- shiny/driver/internal/win32/win32.go | 2 +- .../driver/internal/win32/zsyscall_windows.go | 1 - shiny/driver/x11driver/texture.go | 16 ++++++------- viewport.go | 23 ------------------- 17 files changed, 30 insertions(+), 60 deletions(-) diff --git a/alg/range/intrange/infinite.go b/alg/range/intrange/infinite.go index 24e5217d..7d494e10 100644 --- a/alg/range/intrange/infinite.go +++ b/alg/range/intrange/infinite.go @@ -5,7 +5,7 @@ import ( ) // NewInfinite returns a range which will always return math.MaxInt32 and -// is unchangable. +// is unchangeable. func NewInfinite() Range { return Infinite{} } diff --git a/audio/fontManager_test.go b/audio/fontManager_test.go index 9ddd3feb..afa9c92f 100644 --- a/audio/fontManager_test.go +++ b/audio/fontManager_test.go @@ -15,7 +15,7 @@ func TestFontManager(t *testing.T) { t.Fatalf("expected duplicate font to fail") } if fm.Get("notafont") != nil { - t.Fatalf("expected non existant get font to fail") + t.Fatalf("expected non existent get font to fail") } if fm.GetDefault() == nil { t.Fatalf("expected def get font to succeed") diff --git a/config.go b/config.go index b929dd1c..79d7a7ec 100644 --- a/config.go +++ b/config.go @@ -32,7 +32,7 @@ type Config struct { Fullscreen bool `json:"fullscreen"` } -// A Duration is a wrapper arouind time.Duration that allows for easier json formatting. +// A Duration is a wrapper around time.Duration that allows for easier json formatting. type Duration time.Duration func (d Duration) MarshalJSON() ([]byte, error) { diff --git a/debugConsole.go b/debugConsole.go index 33f6bbcb..337c7c92 100644 --- a/debugConsole.go +++ b/debugConsole.go @@ -232,7 +232,7 @@ func (c *Controller) fullScreen(sub []string) { // It returns an error if the command doesn't exist. func (c *Controller) RunCommand(cmd string, args ...string) error { fn, ok := c.commands[cmd] - if ok == false { + if !ok { return fmt.Errorf("Unknown command %s", cmd) } fn(args) diff --git a/entities/x/btn/button.go b/entities/x/btn/button.go index 584aad65..efe23617 100644 --- a/entities/x/btn/button.go +++ b/entities/x/btn/button.go @@ -80,7 +80,7 @@ func (g Generator) Generate() Btn { func (g Generator) generate(parent *Generator) Btn { var box render.Modifiable - // handle differnt renderable options that could be passed to the generator + // handle different renderable options that could be passed to the generator switch { case g.Toggle != nil: //Handles checks and other toggle situations diff --git a/event/bus_test.go b/event/bus_test.go index 27c45d13..56e4d7a1 100644 --- a/event/bus_test.go +++ b/event/bus_test.go @@ -1,6 +1,7 @@ package event import ( + "fmt" "testing" ) @@ -8,12 +9,13 @@ func TestBusStop(t *testing.T) { b := NewBus() phase := 0 wait := make(chan struct{}) + var topErr error go func() { if err := b.Stop(); err != nil { - t.Fatalf("stop errored: %v", err) + topErr = fmt.Errorf("stop errored: %v", err) } if phase != 1 { - t.Fatalf("expected phase %v, got %v", 1, phase) + topErr = fmt.Errorf("expected phase %v, got %v", 1, phase) } wait <- struct{}{} }() @@ -22,4 +24,7 @@ func TestBusStop(t *testing.T) { phase = 1 b.doneCh <- struct{}{} <-wait + if topErr != nil { + t.Fatal(topErr) + } } diff --git a/event/entity.go b/event/entity.go index 3e2081e4..50345953 100644 --- a/event/entity.go +++ b/event/entity.go @@ -46,7 +46,7 @@ type Entity interface { // So to effectively do this you would need something like: // func DefaultEntity(parent interface{}) *DefaultEntity {} // ... where the structure would store and pass down the parent. -// This introduces empty interfaces, would make initalization +// This introduces empty interfaces, would make initialization // more difficult, and would use slightly more memory. // // Feel free to use this idea in your own implementations, but diff --git a/event/entity_test.go b/event/entity_test.go index 89fdc20a..212a2aff 100644 --- a/event/entity_test.go +++ b/event/entity_test.go @@ -4,16 +4,6 @@ import ( "testing" ) -type testEntity struct { - id CID - name string -} - -func (t *testEntity) Init() CID { - t.id = NextID(t) - return t.id -} - func TestGetEntityFails(t *testing.T) { entity := GetEntity(100) if entity != nil { diff --git a/oakerr/errors_test.go b/oakerr/errors_test.go index 00511dde..fdaa021c 100644 --- a/oakerr/errors_test.go +++ b/oakerr/errors_test.go @@ -8,8 +8,7 @@ func TestErrorsAreErrors(t *testing.T) { languages := []Language{English, Deutsch} for _, lang := range languages { SetLanguage(lang) - var err error - err = NotFound{} + var err error = NotFound{} if err.Error() == "" { t.Fatalf("NotFound error was empty") } diff --git a/oakerr/format_string.go b/oakerr/format_string.go index 0ba36518..bbcf7769 100644 --- a/oakerr/format_string.go +++ b/oakerr/format_string.go @@ -19,7 +19,7 @@ const ( func errorString(code errCode, inputs ...interface{}) string { format, ok := errFmtStrings[currentLanguage][code] if !ok { - format, _ = errFmtStrings[English][code] + format = errFmtStrings[English][code] } return fmt.Sprintf(format, inputs...) } diff --git a/render/decoder_test.go b/render/decoder_test.go index b88c4a75..6eda71de 100644 --- a/render/decoder_test.go +++ b/render/decoder_test.go @@ -15,7 +15,7 @@ func TestRegisterDecoder(t *testing.T) { } err = RegisterDecoder(".new", nil) if err != nil { - t.Fatalf("expected registering .new to suceed: %v", err) + t.Fatalf("expected registering .new to succeed: %v", err) } } @@ -26,6 +26,6 @@ func TestRegisterCfgDecoder(t *testing.T) { } err = RegisterCfgDecoder(".new", nil) if err != nil { - t.Fatalf("expected registering .new to suceed: %v", err) + t.Fatalf("expected registering .new to succeed: %v", err) } } diff --git a/scene/map_test.go b/scene/map_test.go index 5cdb4bf7..eb370898 100644 --- a/scene/map_test.go +++ b/scene/map_test.go @@ -24,7 +24,7 @@ func TestMap(t *testing.T) { } exists := &oakerr.ExistingElement{} if !errors.As(err, exists) { - t.Fatalf("expected ExistingElement error type, got %+t", err) + t.Fatalf("expected ExistingElement error type, got %+T", err) } if exists.InputName != "test" { t.Fatalf("expected error input 'test', got %q", exists.InputName) diff --git a/shape/bezier_test.go b/shape/bezier_test.go index 71ae1832..4d6dff98 100644 --- a/shape/bezier_test.go +++ b/shape/bezier_test.go @@ -56,12 +56,12 @@ func TestBezierCurve(t *testing.T) { } bn, ok := b.(BezierNode) if !ok { - t.Fatalf("expected BezierNode, got %+t", b) + t.Fatalf("expected BezierNode, got %+T", b) } expectedLeft := BezierPoint{x1, y1} left, ok := bn.Left.(BezierPoint) if !ok { - t.Fatalf("expected left of bezier to be BezierNode, got %+t", bn.Left) + t.Fatalf("expected left of bezier to be BezierNode, got %+T", bn.Left) } if left != expectedLeft { t.Fatalf("expected left point %+v, got %+v", expectedLeft, left) @@ -163,7 +163,7 @@ func TestBezierCurveErrors(t *testing.T) { } insufficient := &oakerr.InsufficientInputs{} if !errors.As(err, insufficient) { - t.Fatalf("expected insufficent error, got %+t", err) + t.Fatalf("expected insufficient error, got %+t", err) } if insufficient.AtLeast != 2 { t.Fatalf("expected at least to be '2', got %v", insufficient.AtLeast) diff --git a/shiny/driver/internal/win32/win32.go b/shiny/driver/internal/win32/win32.go index 2442328b..d1b07725 100644 --- a/shiny/driver/internal/win32/win32.go +++ b/shiny/driver/internal/win32/win32.go @@ -478,7 +478,7 @@ var ( ) // initCommon attempts to set up some standard icons. -// TODO: Consider running this only once if succesful. +// TODO: Consider running this only once if successful. func initCommon() (err error) { hDefaultIcon, err = LoadIcon(0, IDI_APPLICATION) if err != nil { diff --git a/shiny/driver/internal/win32/zsyscall_windows.go b/shiny/driver/internal/win32/zsyscall_windows.go index e4ffc897..b8742cc5 100644 --- a/shiny/driver/internal/win32/zsyscall_windows.go +++ b/shiny/driver/internal/win32/zsyscall_windows.go @@ -101,7 +101,6 @@ func _GetKeyState(virtkey int32) (keystatus int16) { func _PostQuitMessage(exitCode int32) { syscall.Syscall(procPostQuitMessage.Addr(), 1, uintptr(exitCode), 0, 0) - return } func _ToUnicodeEx(wVirtKey uint32, wScanCode uint32, lpKeyState *byte, pwszBuff *uint16, cchBuff int32, wFlags uint32, dwhkl syscall.Handle) (ret int32) { diff --git a/shiny/driver/x11driver/texture.go b/shiny/driver/x11driver/texture.go index 5d638492..31d52391 100644 --- a/shiny/driver/x11driver/texture.go +++ b/shiny/driver/x11driver/texture.go @@ -178,17 +178,17 @@ func trifanPoints(src2dst *f64.Aff3, sr image.Rectangle) [4]render.Pointfix { minY := float64(sr.Min.Y) maxY := float64(sr.Max.Y) return [4]render.Pointfix{{ - f64ToFixed(src2dst[0]*minX + src2dst[1]*minY + src2dst[2]), - f64ToFixed(src2dst[3]*minX + src2dst[4]*minY + src2dst[5]), + X: f64ToFixed(src2dst[0]*minX + src2dst[1]*minY + src2dst[2]), + Y: f64ToFixed(src2dst[3]*minX + src2dst[4]*minY + src2dst[5]), }, { - f64ToFixed(src2dst[0]*maxX + src2dst[1]*minY + src2dst[2]), - f64ToFixed(src2dst[3]*maxX + src2dst[4]*minY + src2dst[5]), + X: f64ToFixed(src2dst[0]*maxX + src2dst[1]*minY + src2dst[2]), + Y: f64ToFixed(src2dst[3]*maxX + src2dst[4]*minY + src2dst[5]), }, { - f64ToFixed(src2dst[0]*maxX + src2dst[1]*maxY + src2dst[2]), - f64ToFixed(src2dst[3]*maxX + src2dst[4]*maxY + src2dst[5]), + X: f64ToFixed(src2dst[0]*maxX + src2dst[1]*maxY + src2dst[2]), + Y: f64ToFixed(src2dst[3]*maxX + src2dst[4]*maxY + src2dst[5]), }, { - f64ToFixed(src2dst[0]*minX + src2dst[1]*maxY + src2dst[2]), - f64ToFixed(src2dst[3]*minX + src2dst[4]*maxY + src2dst[5]), + X: f64ToFixed(src2dst[0]*minX + src2dst[1]*maxY + src2dst[2]), + Y: f64ToFixed(src2dst[3]*minX + src2dst[4]*maxY + src2dst[5]), }} } diff --git a/viewport.go b/viewport.go index bced2ef0..ac0378e2 100644 --- a/viewport.go +++ b/viewport.go @@ -3,7 +3,6 @@ package oak import ( "github.com/oakmound/oak/v3/alg/intgeom" "github.com/oakmound/oak/v3/event" - "github.com/oakmound/oak/v3/key" ) // SetScreen positions the viewport to be at x,y @@ -78,25 +77,3 @@ func (c *Controller) SetViewportBounds(rect intgeom.Rect2) { c.setViewport(intgeom.Point2{newViewX, newViewY}) } } - -func (c *Controller) moveViewportBinding(speed int) func(event.CID, interface{}) int { - return func(cID event.CID, n interface{}) int { - dX := 0 - dY := 0 - if c.IsDown(key.UpArrow) { - dY-- - } - if c.IsDown(key.DownArrow) { - dY++ - } - if c.IsDown(key.LeftArrow) { - dX-- - } - if c.IsDown(key.RightArrow) { - dX++ - } - c.viewPos[0] += dX * speed - c.viewPos[1] += dY * speed - return 0 - } -}