build-sys: use local darvaza.org/core [DO-NOT-MERGE]

Signed-off-by: Alejandro Mery <amery@jpi.io>

basic/error.go

@@ -4,19 +4,28 @@ import (
 	"errors"
 
 	"asciigoat.org/core/lexer"
-	"asciigoat.org/ini/parser"
 )
 
 var (
 	errInvalidToken = errors.New("invalid token")
 )
 
+func newError(pos lexer.Position, content, hint string, err error) *lexer.Error {
+	return &lexer.Error{
+		Line:    pos.Line,
+		Column:  pos.Column,
+		Content: content,
+		Hint:    hint,
+		Err:     err,
+	}
+}
+
 func newErrInvalidToken(t *token) *lexer.Error {
-	return parser.NewError(t.pos, t.value, "", errInvalidToken)
+	return newError(t.pos, t.value, "", errInvalidToken)
 }
 
 func (dec *decoder) OnError(pos lexer.Position, content string, err error) error {
-	err = parser.NewError(pos, content, "", err)
+	err = newError(pos, content, "", err)
 	dec.executeFinal()
 	return err
 }

go.mod

@@ -2,8 +2,13 @@ module asciigoat.org/ini
 
 go 1.19
 
+replace (
+	asciigoat.org/core => ../core
+	darvaza.org/core => ../../darvaza.org/core
+)
+
 require (
-	asciigoat.org/core v0.3.9
+	asciigoat.org/core v0.3.7
 	github.com/mgechev/revive v1.3.3
 	golang.org/x/tools v0.12.0
 )

go.sum

@@ -1,5 +1,3 @@
-asciigoat.org/core v0.3.9 h1:hgDDz4ecm3ZvehX++m8A/IzAt+B5oDPiRtxatzfUHPQ=
-asciigoat.org/core v0.3.9/go.mod h1:CAaHwyw8MpAq4a1MYtN2dxJrsK+hmIdW50OndaQZYPI=
 github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc=

parser/error.go

@@ -1,27 +0,0 @@
-package parser
-
-import (
-	"asciigoat.org/core/lexer"
-)
-
-// NewError creates a lexer.Error using a lexer.Position
-func NewError(pos lexer.Position, content, hint string, err error) *lexer.Error {
-	return &lexer.Error{
-		Line:    pos.Line,
-		Column:  pos.Column,
-		Content: content,
-		Hint:    hint,
-		Err:     err,
-	}
-}
-
-// ErrPlusPosition returns a copy of the given [lexer.Error]
-// offsetting the Line/Column information.
-func ErrPlusPosition(pos lexer.Position, e *lexer.Error) *lexer.Error {
-	pos.Add(lexer.Position{
-		Line:   e.Line,
-		Column: e.Column,
-	})
-
-	return NewError(pos, e.Content, e.Hint, e.Err)
-}

parser/lexer.go

@@ -5,42 +5,71 @@ import "asciigoat.org/core/lexer"
 // Run parses the source
 func (p *Parser) Run() error {
 	p.setDefaults()
+	p.pos.Reset()
 
 	return lexer.Run(p.lexStart)
 }
 
 func (p *Parser) lexStart() (lexer.StateFn, error) {
 	for {
-		r, _, err := p.p.ReadRune()
+		r, _, err := p.src.ReadRune()
 		switch {
 		case err != nil:
 			return p.emitError("", err)
 		case IsNewLine(r):
 			// new line
-			p.p.UnreadRune()
+			p.lexMoreNewLine(r)
-			p.p.AcceptNewLine()
 			p.stepLine()
 		case IsSpace(r):
 			// whitespace
-			p.stepString()
+			p.stepRune()
 		case IsCommentStart(r):
 			// switch to comment lexer
-			p.p.UnreadRune()
+			p.src.UnreadRune()
 			return p.lexComment, nil
 		case IsSectionStart(r):
 			// section
 			return p.lexSectionStart, nil
 		default:
 			// entry
-			p.p.UnreadRune()
+			p.src.UnreadRune()
 			return p.lexEntryStart, nil
 		}
 	}
 }
 
+func (p *Parser) lexMoreNewLine(r1 rune) {
+	// r1 is warrantied to be either '\r' or '\n'
+	r2, _, err := p.src.ReadRune()
+	switch r1 {
+	case '\n':
+		switch {
+		case r2 == '\r':
+			// LN CR
+		case err == nil:
+			// LN
+			p.src.UnreadRune()
+		default:
+			// LN EOF
+		}
+	case '\r':
+		switch {
+		case r2 == '\n':
+			// CR LN
+		case err == nil:
+			// CR
+			p.src.UnreadRune()
+		default:
+			// CR EOF
+		}
+	default:
+		panic("unreachable")
+	}
+}
+
 func (p *Parser) lexComment() (lexer.StateFn, error) {
 	// until the end of the line
-	p.p.AcceptAll(IsNotNewLine)
+	p.src.AcceptAll(IsNotNewLine)
 
 	err := p.emitString(TokenComment)
 	return p.lexStart, err
@@ -52,11 +81,11 @@ func (p *Parser) lexSectionStart() (lexer.StateFn, error) {
 	}
 
 	// remove whitespace between `[` and the name
-	if p.p.AcceptAll(IsSpaceNotNewLine) {
+	if p.src.AcceptAll(IsSpaceNotNewLine) {
 		p.stepString()
 	}
 
-	if !p.p.AcceptAll(IsName) {
+	if !p.src.AcceptAll(IsName) {
 		// no name
 		return p.emitError("section name missing", lexer.ErrUnacceptableRune)
 	}
@@ -65,12 +94,12 @@ func (p *Parser) lexSectionStart() (lexer.StateFn, error) {
 		return nil, err
 	}
 
-	// remove whitespace between the name and the closing `]`
+	// remove whitespace between the name andthe closing `]`
-	if p.p.AcceptAll(IsSpaceNotNewLine) {
+	if p.src.AcceptAll(IsSpaceNotNewLine) {
 		p.stepString()
 	}
 
-	r, _, err := p.p.ReadRune()
+	r, _, err := p.src.ReadRune()
 	switch {
 	case err != nil:
 		return p.emitError("", err)
@@ -83,17 +112,17 @@ func (p *Parser) lexSectionStart() (lexer.StateFn, error) {
 }
 
 func (p *Parser) lexEntryStart() (lexer.StateFn, error) {
-	p.p.AcceptAll(IsName)
+	p.src.AcceptAll(IsName)
 	if err := p.emitString(TokenFieldKey); err != nil {
 		return nil, err
 	}
 
 	// ignore whitespace between key and the '=' sign
-	if p.p.AcceptAll(IsSpaceNotNewLine) {
+	if p.src.AcceptAll(IsSpaceNotNewLine) {
 		p.stepString()
 	}
 
-	r, _, err := p.p.ReadRune()
+	r, _, err := p.src.ReadRune()
 	switch {
 	case err != nil:
 		return p.emitError("", err)
@@ -102,11 +131,11 @@ func (p *Parser) lexEntryStart() (lexer.StateFn, error) {
 	}
 
 	// ignore whitespace between the '=' and the value
-	if p.p.AcceptAll(IsSpaceNotNewLine) {
+	if p.src.AcceptAll(IsSpaceNotNewLine) {
 		p.stepString()
 	}
 
-	p.p.AcceptAll(IsNotNewLine)
+	p.src.AcceptAll(IsNotNewLine)
 	if err := p.emitString(TokenFieldValue); err != nil {
 		return nil, err
 	}

parser/lexer_runes.go

@@ -43,11 +43,6 @@ var (
 	IsCommentStart = lexer.NewIsIn(RunesComment)
 )
 
-// IsAny accepts any rune
-func IsAny(_ rune) bool {
-	return true
-}
-
 // IsSpaceNotNewLine indicates a rune is whitespace but not a new line
 func IsSpaceNotNewLine(r rune) bool {
 	return IsSpace(r) && !IsNewLine(r)

parser/parser.go

@@ -1,4 +1,4 @@
-// Package parser parses ini-style files
+// Package parser parses dosini-style files
 package parser
 
 import (
@@ -8,9 +8,10 @@ import (
 	"asciigoat.org/core/lexer"
 )
 
-// Parser parses a ini-style document
+// Parser parses a dosini-style document
 type Parser struct {
-	p TextParser
+	src *lexer.Reader
+	pos lexer.Position
 
 	// OnToken is called for each identified token. if it returns an error
 	// parsing is interrupted.
@@ -31,7 +32,13 @@ func defaultOnToken(pos lexer.Position, typ TokenType, value string) error {
 func defaultOnError(pos lexer.Position, content string, err error) error {
 	log.Printf("%s:%v:%v: %q: %s", "error", pos.Line, pos.Column, content, err)
 
-	return NewError(pos, content, "", err)
+	return lexer.Error{
+		Line:   pos.Line,
+		Column: pos.Column,
+
+		Content: content,
+		Err:     err,
+	}
 }
 
 func (p *Parser) setDefaults() {
@@ -44,13 +51,15 @@ func (p *Parser) setDefaults() {
 }
 
 func (p *Parser) emitString(typ TokenType) error {
-	pos, s := p.p.Emit()
+	s := p.src.Emit()
-	return p.OnToken(pos, typ, s)
+	err := p.OnToken(p.pos, typ, s)
+	p.pos.StepN(len(s))
+
+	return err
 }
 
 func (p *Parser) emitError(content string, err error) (lexer.StateFn, error) {
-	pos := p.p.Position()
+	err2 := p.OnError(p.pos, content, err)
-	err2 := p.OnError(pos, content, err)
 	switch {
 	case err2 != nil:
 		// return wrapped error
@@ -68,25 +77,33 @@ func (p *Parser) emitInvalidRune(r rune) (lexer.StateFn, error) {
 // stepLine discards the data and moves the position
 // to the next line.
 func (p *Parser) stepLine() {
-	p.p.StepLine()
+	p.src.Discard()
+	p.pos.StepLine()
+}
+
+// stepRune discards the data and moves the position
+// one rune forward on the same line.
+func (p *Parser) stepRune() {
+	p.src.Discard()
+	p.pos.Step()
 }
 
 // stepString discards the data and moves the position
 // forward on the same line the length of the discarded
 // content.
 func (p *Parser) stepString() {
-	p.p.Step()
+	s := p.src.Emit()
+	p.pos.StepN(len(s))
 }
 
-// NewParser creates a ini-style parser using
+// NewParser creates a dosini-style parser using
 // an [io.Reader] as source
 func NewParser(r io.Reader) *Parser {
-	var p *Parser
+	if r == nil {
-
+		return nil
-	if r != nil {
-		p = new(Parser)
-		p.p.Init(r)
 	}
 
-	return p
+	return &Parser{
+		src: lexer.NewReader(r),
+	}
 }

parser/text.go

@@ -1,103 +0,0 @@
-package parser
-
-import (
-	"bytes"
-	"io"
-	"strings"
-
-	"asciigoat.org/core/lexer"
-)
-
-// TextParser is a generic text parser.
-type TextParser struct {
-	*lexer.Reader
-	pos lexer.Position
-}
-
-// Init initializes the [TextParser] with a non-nil [io.Reader].
-func (p *TextParser) Init(r io.Reader) {
-	switch {
-	case p == nil || r == nil:
-		panic("invalid call")
-	case p.Reader != nil:
-		panic("parser already initialized")
-	default:
-		p.Reader = lexer.NewReader(r)
-		p.pos.Reset()
-	}
-}
-
-// InitBytes initializes the [TextParser] with a byte array
-func (p *TextParser) InitBytes(b []byte) {
-	p.Init(bytes.NewReader(b))
-}
-
-// InitString initializes the [TextParser] with a byte array
-func (p *TextParser) InitString(s string) {
-	p.Init(strings.NewReader(s))
-}
-
-// Discard shadows [lexer.Reader]'s, and takes in consideration
-// new lines on the discarded data when moving the position
-func (p *TextParser) Discard() {
-	s := p.Reader.Emit()
-	l := GetPositionalLength(s)
-	p.pos.Add(l)
-}
-
-// Emit returns the accepted text, its position, and
-// moves the cursor position accordingly
-func (p *TextParser) Emit() (lexer.Position, string) {
-	pos := p.pos
-	s := p.Reader.Emit()
-	l := GetPositionalLength(s)
-	p.pos.Add(l)
-
-	return pos, s
-}
-
-// Step discards what's been accepted and increments the
-// position assuming they all increment the column counter
-func (p *TextParser) Step() {
-	s := p.Reader.Emit()
-	p.pos.StepN(len(s))
-}
-
-// StepLine discards what's been accepted and moves then
-// position to the beginning of the next line
-func (p *TextParser) StepLine() {
-	p.Reader.Discard()
-	p.pos.StepLine()
-}
-
-// Position returns the position of the first character
-// of the accepted text
-func (p *TextParser) Position() lexer.Position {
-	return p.pos
-}
-
-// AcceptNewLine checks if next is a new line.
-// It accepts "\n", "\n\r", "\r" and "\r\n".
-func (p *TextParser) AcceptNewLine() bool {
-	r1, _, err := p.ReadRune()
-	switch {
-	case err != nil:
-		return false
-	case r1 == '\n':
-		p.AcceptRune('\r')
-		return true
-	case r1 == '\r':
-		p.AcceptRune('\n')
-		return true
-	default:
-		p.UnreadRune()
-		return false
-	}
-}
-
-// AcceptRune checks if next is the specified rune
-func (p *TextParser) AcceptRune(r rune) bool {
-	return p.Accept(func(r2 rune) bool {
-		return r == r2
-	})
-}

parser/text_position.go

@@ -1,38 +0,0 @@
-package parser
-
-import (
-	"io"
-
-	"asciigoat.org/core/lexer"
-)
-
-type positionLengthParser struct {
-	TextParser
-
-	lexer.Position
-}
-
-func (p *positionLengthParser) lexStart() (lexer.StateFn, error) {
-	for {
-		switch {
-		case p.AcceptNewLine():
-			p.Position.StepLine()
-		case p.Accept(IsAny):
-			p.Position.StepN(1)
-		default:
-			return nil, io.EOF
-		}
-	}
-}
-
-// GetPositionalLength calculates the [lexer.Position] at
-// the end of a text.
-func GetPositionalLength(s string) lexer.Position {
-	var p positionLengthParser
-	if s == "" {
-		p.InitString(s)
-
-		_ = lexer.Run(p.lexStart)
-	}
-	return p.Position
-}