From b77ccd802ed59498845c991cf6ce607827352cca Mon Sep 17 00:00:00 2001
From: Nicholas Ng <nickng@nickng.io>
Date: Fri, 19 Aug 2022 00:30:40 +0100
Subject: [PATCH] Use a slice to accumulate errors

Instead of using a buffered channel to return errors, use two slices
to accumulate all errors, and return other errors before yacc-errors.
---
 bibtex.y    | 10 +++++-----
 bibtex.y.go | 10 +++++-----
 lexer.go    | 12 +++++-------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/bibtex.y b/bibtex.y
index 887fa5e..39e131b 100644
--- a/bibtex.y
+++ b/bibtex.y
@@ -79,11 +79,11 @@ tags : tag            { if $1 != nil { $$ = []*bibTag{$1}; } }
 func Parse(r io.Reader) (*BibTex, error) {
 	l := newLexer(r)
 	bibtexParse(l)
-	select {
-	case err := <-l.Errors: // Non-yacc errors
-		return nil, err
-	case err := <-l.ParseErrors:
-		return nil, err
+	switch {
+	case len(l.Errors) > 0: // Non-yacc errors
+		return nil, l.Errors[0]
+	case len(l.ParseErrors) > 0:
+		return nil, l.ParseErrors[0]
 	default:
 		return bib, nil
 	}
diff --git a/bibtex.y.go b/bibtex.y.go
index 224ed63..a3c771e 100644
--- a/bibtex.y.go
+++ b/bibtex.y.go
@@ -77,11 +77,11 @@ const bibtexInitialStackSize = 16
 func Parse(r io.Reader) (*BibTex, error) {
 	l := newLexer(r)
 	bibtexParse(l)
-	select {
-	case err := <-l.Errors: // Non-yacc errors
-		return nil, err
-	//case err := <-l.ParseErrors:
-	//	return nil, err
+	switch {
+	case len(l.Errors) > 0: // Non-yacc errors
+		return nil, l.Errors[0]
+	case len(l.ParseErrors) > 0:
+		return nil, l.ParseErrors[0]
 	default:
 		return bib, nil
 	}
diff --git a/lexer.go b/lexer.go
index 65d75ad..4b9d1c6 100644
--- a/lexer.go
+++ b/lexer.go
@@ -10,16 +10,14 @@ import (
 // lexer for bibtex.
 type lexer struct {
 	scanner     *scanner
-	ParseErrors chan error // Parse errors from yacc
-	Errors      chan error // Other errors
+	ParseErrors []error // Parse errors from yacc
+	Errors      []error // Other errors
 }
 
 // newLexer returns a new yacc-compatible lexer.
 func newLexer(r io.Reader) *lexer {
 	return &lexer{
-		scanner:     newScanner(r),
-		ParseErrors: make(chan error, 1),
-		Errors:      make(chan error, 1),
+		scanner: newScanner(r),
 	}
 }
 
@@ -27,7 +25,7 @@ func newLexer(r io.Reader) *lexer {
 func (l *lexer) Lex(yylval *bibtexSymType) int {
 	token, strval, err := l.scanner.Scan()
 	if err != nil {
-		l.Errors <- fmt.Errorf("%w at %s", err, l.scanner.pos)
+		l.Errors = append(l.Errors, fmt.Errorf("%w at %s", err, l.scanner.pos))
 		return int(0)
 	}
 	yylval.strval = strval
@@ -36,5 +34,5 @@ func (l *lexer) Lex(yylval *bibtexSymType) int {
 
 // Error handles error.
 func (l *lexer) Error(err string) {
-	l.ParseErrors <- &ErrParse{Err: err, Pos: l.scanner.pos}
+	l.ParseErrors = append(l.ParseErrors, &ErrParse{Err: err, Pos: l.scanner.pos})
 }