Merge pull request 'parser: Unquoted(), AcceptQuotedString() and SplitCommaArray' (#9)

Reviewed-on: #9

.vscode/settings.json

@@ -1,7 +0,0 @@
-{
-    "cSpell.words": [
-        "asciigoat",
-        "Subname",
-        "unescapes"
-    ]
-}

basic/token.go

@@ -32,21 +32,21 @@ func (dec *decoder) executeFinal() {
 func (dec *decoder) execute(typ parser.TokenType) {
 	switch typ {
 	case parser.TokenSectionEnd:
-		name1, ok1 := dec.queueValue(1, parser.TokenSectionName)
+		name1, ok1 := dec.getValue(1, parser.TokenSectionName)
 
 		if ok1 {
-			name2, ok2 := dec.queueValue(2, parser.TokenSectionSubname)
+			name2, ok2 := dec.getValue(2, parser.TokenSectionSubname)
 
 			dec.addSection(name1, name2, ok2)
 		}
 
-		dec.queueReset()
+		dec.reset()
 	case parser.TokenFieldValue:
-		key, _ := dec.queueValue(0, parser.TokenFieldKey)
+		key, _ := dec.getValue(0, parser.TokenFieldKey)
-		value, _ := dec.queueValue(1, parser.TokenFieldValue)
+		value, _ := dec.getValue(1, parser.TokenFieldValue)
 
 		dec.addField(key, value)
-		dec.queueReset()
+		dec.reset()
 	}
 }
 
@@ -82,8 +82,7 @@ func (dec *decoder) addField(key, value string) {
 	}
 }
 
-// queueValue extracts the value of element on the queue if the type matches.
+func (dec *decoder) getValue(idx int, typ parser.TokenType) (string, bool) {
-func (dec *decoder) queueValue(idx int, typ parser.TokenType) (string, bool) {
 	switch {
 	case idx < 0 || idx >= len(dec.queue):
 		// out of range
@@ -96,48 +95,40 @@ func (dec *decoder) queueValue(idx int, typ parser.TokenType) (string, bool) {
 	}
 }
 
-// queueReset removes all tokens from the queue
+func (dec *decoder) reset() {
-func (dec *decoder) queueReset() {
 	dec.queue = dec.queue[:0]
 }
 
-// queueDepth confirms the current depth of the queue
+func (dec *decoder) depth(depth int) bool {
-func (dec *decoder) queueDepth(depth int) bool {
 	return len(dec.queue) == depth
 }
 
-// queueDepthType confirms the current depth of the queue and the type of the last
+func (dec *decoder) depthAfter(depth int, typ parser.TokenType) bool {
-// element.
+	_, ok := dec.getValue(depth-1, typ)
-func (dec *decoder) queueDepthType(depth int, typ parser.TokenType) bool {
+	if ok {
-	if dec.queueDepth(depth) {
+		return len(dec.queue) == depth
-		return dec.queueType(depth-1, typ)
 	}
 	return false
 }
 
-// queueType tells if the specified element on the queue is of the required type.
-func (dec *decoder) queueType(idx int, typ parser.TokenType) bool {
-	_, ok := dec.queueValue(idx, typ)
-	return ok
-}
-
 func (dec *decoder) typeOK(typ parser.TokenType) bool {
 	switch typ {
 	case parser.TokenSectionStart, parser.TokenFieldKey:
 		// first token only
-		return dec.queueDepth(0)
+		return dec.depth(0)
 	case parser.TokenSectionName:
 		// right after TokenSectionStart
-		return dec.queueDepthType(1, parser.TokenSectionStart)
+		return dec.depthAfter(1, parser.TokenSectionStart)
 	case parser.TokenSectionSubname:
 		// right after TokenSectionName
-		return dec.queueDepthType(2, parser.TokenSectionName)
+		return dec.depthAfter(2, parser.TokenSectionName)
 	case parser.TokenSectionEnd:
 		// only on a section with name
-		return dec.queueType(1, parser.TokenSectionName)
+		_, ok := dec.getValue(1, parser.TokenSectionName)
+		return ok
 	case parser.TokenFieldValue:
 		// right after a TokenFieldKey
-		return dec.queueDepthType(1, parser.TokenFieldKey)
+		return dec.depthAfter(1, parser.TokenFieldKey)
 	default:
 		// never
 		return false
@@ -158,8 +149,6 @@ func (dec *decoder) OnToken(pos lexer.Position, typ parser.TokenType, value stri
 		return nil
 	default:
 		// unacceptable
-		err := newErrInvalidToken(t)
+		return newErrInvalidToken(t)
-		dec.executeFinal()
-		return err
 	}
 }

go.mod

@@ -2,11 +2,6 @@ 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
 	github.com/mgechev/revive v1.3.3

go.sum

@@ -1,3 +1,5 @@
+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

@@ -35,25 +35,9 @@ func NewErrIncompleteQuotedString(p *TextParser) *lexer.Error {
 	return newErrIncomplete(p, "incomplete quoted string")
 }
 
-// NewErrIncompleteEscaped returns a [lexer.Error]
-// indicating the text being parsed wasn't correctly
-// terminated
-func NewErrIncompleteEscaped(p *TextParser) *lexer.Error {
-	return newErrIncomplete(p, "incomplete escaped string")
-}
-
 func newErrIncomplete(p *TextParser, hint string) *lexer.Error {
 	pos, s := p.Emit()
 	pos.Add(GetPositionalLength(s))
 
 	return NewError(pos, s, hint, fs.ErrInvalid)
 }
-
-func NewErrInvalidEscapeSequence(p *TextParser, seq string) *lexer.Error {
-	pos, s := p.Position(), p.String()
-
-	s = s[:len(s)-len(seq)]
-	pos.Add(GetPositionalLength(s))
-
-	return NewError(pos, seq, "invalid escape character", fs.ErrInvalid)
-}

parser/text_quoted.go

@@ -33,34 +33,22 @@ func (p *TextParser) AcceptQuotedString() (string, bool, error) {
 }
 
 func lexQuotedString(p *TextParser) (string, *lexer.Error) {
-	s, ok, err := lexQuotedStringNoEscape(p)
-	switch {
-	case err != nil:
-		return "", err
-	case ok:
-		return s, nil
-	default:
-		// escape character detected
-		return lexQuotedStringEscaped(p)
-	}
-}
-
-func lexQuotedStringNoEscape(p *TextParser) (string, bool, *lexer.Error) {
 	for {
 		r, _, err := p.ReadRune()
 		switch {
 		case err != nil:
 			// incomplete
-			return "", false, NewErrIncompleteQuotedString(p)
+			return "", NewErrIncompleteQuotedString(p)
 		case r == RuneQuotes:
-			// end, just remove the quotes
+			// end, remove quotes and process escaped characters
-			s := p.String()
+			return lexReturnUnescapedQuotedString(p)
-			l := len(s)
-			return s[1 : l-1], true, nil
 		case r == RuneEscape:
-			// things just got complicated...
+			// escaped, take another
-			p.UnreadRune()
+			_, _, err := p.ReadRune()
-			return "", false, nil
+			if err != nil {
+				// incomplete
+				return "", NewErrIncompleteQuotedString(p)
+			}
 		case IsNewLine(r):
 			// new lines within quoted values are acceptable
 			p.UnreadRune()
@@ -71,49 +59,22 @@ func lexQuotedStringNoEscape(p *TextParser) (string, bool, *lexer.Error) {
 	}
 }
 
-// Unquoted removes quotes the content and unescapes the content
+func lexReturnUnescapedQuotedString(p *TextParser) (string, *lexer.Error) {
-func lexQuotedStringEscaped(p *TextParser) (string, *lexer.Error) {
+	// remove quotes
-	var result strings.Builder
+	s := p.String()
+	l := len(s)
+	s = s[1 : l-1]
 
-	// append what was accepted before the escape character
+	if strings.ContainsRune(s, RuneEscape) {
-	result.WriteString(p.String()[1:])
+		// TODO: implement unescaping
-
+		err := NewError(p.Position(), s, "escaped characters", lexer.ErrNotImplemented)
-	for {
+		return "", err
-		r, _, err := p.ReadRune()
-		switch {
-		case err != nil:
-			// incomplete quoted
-			return "", NewErrIncompleteQuotedString(p)
-		case r == RuneQuotes:
-			// end
-			return result.String(), nil
-		case r == RuneEscape:
-			// escaped
-			r2, _, err := p.ReadRune()
-			switch {
-			case err != nil:
-				// incomplete escaped
-				return "", NewErrIncompleteEscaped(p)
-			case IsNewLine(r2):
-				// escaped new line, skip
-				p.UnreadRune()
-				p.AcceptNewLine()
-			default:
-				// TODO: check valid escape character and
-				// append to result
-				p.UnreadRune()
-				s := string([]rune{r, r2})
-				err := NewErrInvalidEscapeSequence(p, s)
-				return "", err
-			}
-		default:
-			// normal, append to result
-			result.WriteRune(r)
-		}
 	}
+
+	return s, nil
 }
 
-// Unquoted removes quotes and unescapes the content
+// Unquoted removes quotes the content and unescapes the content
 func Unquoted(s string) (string, error) {
 	var p TextParser
 	if s == "" {