diff --git a/csi_entry_state.go b/csi_entry_state.go index bcbe00d..01c9519 100644 --- a/csi_entry_state.go +++ b/csi_entry_state.go @@ -26,7 +26,7 @@ func (csiState csiEntryState) Handle(b byte) (s state, e error) { func (csiState csiEntryState) Transition(s state) error { csiState.parser.logf("CsiEntry::Transition %s --> %s", csiState.Name(), s.Name()) - csiState.baseState.Transition(s) + _ = csiState.baseState.Transition(s) switch s { case csiState.parser.ground: @@ -34,9 +34,9 @@ func (csiState csiEntryState) Transition(s state) error { case csiState.parser.csiParam: switch { case sliceContains(csiParams, csiState.parser.context.currentChar): - csiState.parser.collectParam() + _ = csiState.parser.collectParam() case sliceContains(intermeds, csiState.parser.context.currentChar): - csiState.parser.collectInter() + _ = csiState.parser.collectInter() } } diff --git a/csi_param_state.go b/csi_param_state.go index 7ed5e01..88146e6 100644 --- a/csi_param_state.go +++ b/csi_param_state.go @@ -16,8 +16,7 @@ func (csiState csiParamState) Handle(b byte) (s state, e error) { case sliceContains(alphabetics, b): return csiState.parser.ground, nil case sliceContains(csiCollectables, b): - csiState.parser.collectParam() - return csiState, nil + return csiState, csiState.parser.collectParam() case sliceContains(executors, b): return csiState, csiState.parser.execute() } @@ -27,7 +26,7 @@ func (csiState csiParamState) Handle(b byte) (s state, e error) { func (csiState csiParamState) Transition(s state) error { csiState.parser.logf("CsiParam::Transition %s --> %s", csiState.Name(), s.Name()) - csiState.baseState.Transition(s) + _ = csiState.baseState.Transition(s) switch s { case csiState.parser.ground: diff --git a/escape_intermediate_state.go b/escape_intermediate_state.go index 1c719db..8842969 100644 --- a/escape_intermediate_state.go +++ b/escape_intermediate_state.go @@ -25,7 +25,7 @@ func (escState escapeIntermediateState) Handle(b byte) (s state, e error) { func (escState escapeIntermediateState) Transition(s state) error { escState.parser.logf("escapeIntermediateState::Transition %s --> %s", escState.Name(), s.Name()) - escState.baseState.Transition(s) + _ = escState.baseState.Transition(s) switch s { case escState.parser.ground: diff --git a/escape_state.go b/escape_state.go index 6390abd..854e381 100644 --- a/escape_state.go +++ b/escape_state.go @@ -29,7 +29,7 @@ func (escState escapeState) Handle(b byte) (s state, e error) { func (escState escapeState) Transition(s state) error { escState.parser.logf("Escape::Transition %s --> %s", escState.Name(), s.Name()) - escState.baseState.Transition(s) + _ = escState.baseState.Transition(s) switch s { case escState.parser.ground: diff --git a/parser.go b/parser.go index 03cec7a..2e8ef80 100644 --- a/parser.go +++ b/parser.go @@ -113,16 +113,13 @@ func (ap *AnsiParser) handle(b byte) error { if newState == nil { ap.logf("WARNING: newState is nil") - return errors.New("New state of 'nil' is invalid.") + return errors.New("new state of 'nil' is invalid") } - if newState != ap.currState { - if err := ap.changeState(newState); err != nil { - return err - } + if newState == ap.currState { + return nil } - - return nil + return ap.changeState(newState) } func (ap *AnsiParser) changeState(newState state) error { @@ -136,7 +133,7 @@ func (ap *AnsiParser) changeState(newState state) error { // Perform transition action if err := ap.currState.Transition(newState); err != nil { - ap.logf("Transition from '%s' to '%s' failed with: '%v'", ap.currState.Name(), newState.Name, err) + ap.logf("Transition from '%s' to '%s' failed with: '%v'", ap.currState.Name(), newState.Name(), err) return err } diff --git a/parser_action_helpers.go b/parser_action_helpers.go index de0a1f9..dc00153 100644 --- a/parser_action_helpers.go +++ b/parser_action_helpers.go @@ -4,9 +4,9 @@ import ( "strconv" ) -func parseParams(bytes []byte) ([]string, error) { - paramBuff := make([]byte, 0, 0) - params := []string{} +func parseParams(bytes []byte) []string { + var paramBuff []byte + var params []string for _, v := range bytes { if v == ';' { @@ -14,7 +14,7 @@ func parseParams(bytes []byte) ([]string, error) { // Completed parameter, append it to the list s := string(paramBuff) params = append(params, s) - paramBuff = make([]byte, 0, 0) + paramBuff = paramBuff[:0] } } else { paramBuff = append(paramBuff, v) @@ -27,11 +27,7 @@ func parseParams(bytes []byte) ([]string, error) { params = append(params, s) } - return params, nil -} - -func parseCmd(context ansiContext) (string, error) { - return string(context.currentChar), nil + return params } func getInt(params []string, dflt int) int { diff --git a/parser_actions.go b/parser_actions.go index 0bb5e51..2aee101 100644 --- a/parser_actions.go +++ b/parser_actions.go @@ -15,10 +15,9 @@ func (ap *AnsiParser) collectInter() error { } func (ap *AnsiParser) escDispatch() error { - cmd, _ := parseCmd(*ap.context) - intermeds := ap.context.interBuffer + cmd := string(ap.context.currentChar) ap.logf("escDispatch currentChar: %#x", ap.context.currentChar) - ap.logf("escDispatch: %v(%v)", cmd, intermeds) + ap.logf("escDispatch: %s(%q)", cmd, string(ap.context.interBuffer)) switch cmd { case "D": // IND @@ -31,14 +30,14 @@ func (ap *AnsiParser) escDispatch() error { return err case "M": // RI return ap.eventHandler.RI() + default: + return nil } - - return nil } func (ap *AnsiParser) csiDispatch() error { - cmd, _ := parseCmd(*ap.context) - params, _ := parseParams(ap.context.paramBuffer) + cmd := string(ap.context.currentChar) + params := parseParams(ap.context.paramBuffer) ap.logf("Parsed params: %v with length: %d", params, len(params)) ap.logf("csiDispatch: %v(%v)", cmd, params) @@ -109,9 +108,8 @@ func (ap *AnsiParser) print() error { return ap.eventHandler.Print(ap.context.currentChar) } -func (ap *AnsiParser) clear() error { +func (ap *AnsiParser) clear() { ap.context = &ansiContext{} - return nil } func (ap *AnsiParser) execute() error { diff --git a/parser_test.go b/parser_test.go index 0574010..b3a25dd 100644 --- a/parser_test.go +++ b/parser_test.go @@ -31,7 +31,9 @@ func TestAnyToX(t *testing.T) { func TestCollectCsiParams(t *testing.T) { parser, _ := createTestParser("CsiEntry") - parser.Parse(csiCollectables) + if _, err := parser.Parse(csiCollectables); err != nil { + t.Fatalf("Error parsing csiCollectables: %v", err) + } buffer := parser.context.paramBuffer bufferCount := len(buffer) @@ -106,7 +108,9 @@ func TestScroll(t *testing.T) { func TestPrint(t *testing.T) { parser, evtHandler := createTestParser("Ground") - parser.Parse(printables) + if _, err := parser.Parse(printables); err != nil { + t.Fatalf("Error parsing printables: %v", err) + } validateState(t, parser.currState, "Ground") for i, v := range printables { diff --git a/parser_test_helpers_test.go b/parser_test_helpers_test.go index e54a071..0406437 100644 --- a/parser_test_helpers_test.go +++ b/parser_test_helpers_test.go @@ -8,9 +8,9 @@ import ( func getStateNames() []string { parser, _ := createTestParser("Ground") - stateNames := []string{} - for _, state := range parser.stateMap { - stateNames = append(stateNames, state.Name()) + var stateNames []string + for _, s := range parser.stateMap { + stateNames = append(stateNames, s.Name()) } return stateNames @@ -20,10 +20,10 @@ func stateTransitionHelper(t *testing.T, start string, end string, bytes []byte) t.Helper() for _, b := range bytes { t.Run(fmt.Sprintf("Start=%s/%q", start, b), func(t *testing.T) { - t.Helper() - bytes := []byte{byte(b)} parser, _ := createTestParser(start) - parser.Parse(bytes) + if _, err := parser.Parse([]byte{b}); err != nil { + t.Fatal(err) + } validateState(t, parser.currState, end) }) } @@ -41,7 +41,9 @@ func funcCallParamHelper(t *testing.T, bytes []byte, start string, expected stri t.Run(fmt.Sprintf("Start=%s/%q", start, bytes), func(t *testing.T) { t.Helper() parser, evtHandler := createTestParser(start) - parser.Parse(bytes) + if _, err := parser.Parse(bytes); err != nil { + t.Errorf("Error parsing %q: %v", string(bytes), err) + } validateState(t, parser.currState, expected) validateFuncCalls(t, evtHandler.FunctionCalls, expectedCalls) }) @@ -49,12 +51,7 @@ func funcCallParamHelper(t *testing.T, bytes []byte, start string, expected stri func parseParamsHelper(t *testing.T, bytes []byte, expectedParams []string) { t.Helper() - params, err := parseParams(bytes) - - if err != nil { - t.Errorf("Parameter parse error: %v", err) - return - } + params := parseParams(bytes) if len(params) != len(expectedParams) { t.Errorf("Parsed parameters: %v", params) @@ -116,7 +113,9 @@ func clearOnStateChangeHelper(t *testing.T, start string, end string, bytes []by t.Helper() p, _ := createTestParser(start) fillContext(p.context) - p.Parse(bytes) + if _, err := p.Parse(bytes); err != nil { + t.Errorf("Error parsing %q: %v", string(bytes), err) + } validateState(t, p.currState, end) validateEmptyContext(t, p.context) } @@ -124,7 +123,9 @@ func clearOnStateChangeHelper(t *testing.T, start string, end string, bytes []by func c0Helper(t *testing.T, bytes []byte, expectedState string, expectedCalls []string) { t.Helper() parser, evtHandler := createTestParser("Ground") - parser.Parse(bytes) + if _, err := parser.Parse(bytes); err != nil { + t.Errorf("Error parsing %q: %v", string(bytes), err) + } validateState(t, parser.currState, expectedState) validateFuncCalls(t, evtHandler.FunctionCalls, expectedCalls) } diff --git a/states.go b/states.go index f2ea1fc..cf72692 100644 --- a/states.go +++ b/states.go @@ -1,7 +1,5 @@ package ansiterm -type stateID int - type state interface { Enter() error Exit() error diff --git a/utilities.go b/utilities.go index 3921144..d94dd3a 100644 --- a/utilities.go +++ b/utilities.go @@ -1,9 +1,5 @@ package ansiterm -import ( - "strconv" -) - func sliceContains(bytes []byte, b byte) bool { for _, v := range bytes { if v == b { @@ -13,9 +9,3 @@ func sliceContains(bytes []byte, b byte) bool { return false } - -func convertBytesToInteger(bytes []byte) int { - s := string(bytes) - i, _ := strconv.Atoi(s) - return i -}