basic: refactor error handling

Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-02 01:06:01 +00:00
parent 754642e98f
commit 652f7a7aa0
2 changed files with 23 additions and 17 deletions
@@ -29,7 +29,7 @@ func (dec *decoder) executeFinal() {
 	}
 }

-func (dec *decoder) execute(typ parser.TokenType) {
+func (dec *decoder) execute(typ parser.TokenType) error {
 	switch typ {
 	case parser.TokenSectionEnd:
 		name1, ok1 := dec.getValue(1, parser.TokenSectionName)
@@ -48,6 +48,8 @@ func (dec *decoder) execute(typ parser.TokenType) {
 		dec.addField(key, value)
 		dec.reset()
 	}
+
+	return nil
 }

 func (dec *decoder) addSection(key, id string, allowEmptyID bool) {
@@ -136,19 +138,25 @@ func (dec *decoder) typeOK(typ parser.TokenType) bool {
 }

 func (dec *decoder) OnToken(pos lexer.Position, typ parser.TokenType, value string) error {
+	var err error
 	t := &token{pos, typ, value}

 	switch {
 	case typ == parser.TokenComment:
 		// ignore comments
-		return nil
 	case dec.typeOK(typ):
 		// acceptable token
 		dec.queue = append(dec.queue, t)
-		dec.execute(typ)
-		return nil
+		err = dec.execute(typ)
 	default:
 		// unacceptable
-		return newErrInvalidToken(t)
+		err = newErrInvalidToken(t)
 	}
+
+	if err != nil {
+		dec.executeFinal()
+		return err
+	}
+
+	return nil
 }