Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions csi_entry_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ 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:
return csiState.parser.csiDispatch()
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()
}
}

Expand Down
5 changes: 2 additions & 3 deletions csi_param_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion escape_intermediate_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion escape_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 5 additions & 8 deletions parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
}

Expand Down
14 changes: 5 additions & 9 deletions parser_action_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ 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 == ';' {
if len(paramBuff) > 0 {
// 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)
Expand All @@ -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 {
Expand Down
16 changes: 7 additions & 9 deletions parser_actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 6 additions & 2 deletions parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down
31 changes: 16 additions & 15 deletions parser_test_helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
})
}
Expand All @@ -41,20 +41,17 @@ 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)
})
}

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)
Expand Down Expand Up @@ -116,15 +113,19 @@ 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)
}

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)
}
2 changes: 0 additions & 2 deletions states.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package ansiterm

type stateID int

type state interface {
Enter() error
Exit() error
Expand Down
10 changes: 0 additions & 10 deletions utilities.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package ansiterm

import (
"strconv"
)

func sliceContains(bytes []byte, b byte) bool {
for _, v := range bytes {
if v == b {
Expand All @@ -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
}