WIP

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

parser/comma_array.go

@@ -1,8 +1,6 @@
 package parser
 
 import (
-	"strings"
-
 	"asciigoat.org/core/lexer"
 )
 
@@ -48,13 +46,18 @@ func (p *commaArrayParser) lexWord() (lexer.StateFn, error) {
 			_, s := p.Emit()
 			p.out = append(p.out, s)
 			return nil, err
-		case r == ',':
+		case r == RuneEscape:
-			// done
+			// escaped
-			_, s := p.Emit()
+			r2, _, err := p.ReadRune()
-			// remove comma, trim and append to output
+			switch {
-			s = strings.TrimRightFunc(s[:len(s)-1], IsSpace)
+			case err != nil:
-			p.out = append(p.out, s)
+				// incomplete
-			return p.lexStart, nil
+				return nil, NewErrIncompleteEscaped(&p.TextParser)
+			case IsNewLine(r2):
+				// escaped new line
+				p.UnreadRune()
+				p.AcceptNewLine()
+			}
 		}
 	}
 }
@@ -76,8 +79,7 @@ func (p *commaArrayParser) Run() ([]string, error) {
 	return p.out, err
 }
 
-// SplitCommaArray splits comma separated strings, removing whitespace
+// SplitCommaArray splits
-// and respecting quoted literals.
 func SplitCommaArray(s string) ([]string, error) {
 	if s != "" {
 		var p commaArrayParser

parser/error.go

@@ -35,6 +35,13 @@ 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))

parser/text_quoted.go

@@ -1,13 +1,11 @@
 package parser
 
 import (
-	"strings"
-
 	"asciigoat.org/core/lexer"
 )
 
 // AcceptQuotedString consumes a quoted string from the source
-// and returns it unquoted and unescaped
+// and returns it unquoted.
 func (p *TextParser) AcceptQuotedString() (string, bool, error) {
 	r, _, err := p.ReadRune()
 	switch {
@@ -33,22 +31,33 @@ 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 "", NewErrIncompleteQuotedString(p)
+			return "", false, NewErrIncompleteQuotedString(p)
 		case r == RuneQuotes:
-			// end, remove quotes and process escaped characters
+			// end, just remove the quotes
-			return lexReturnUnescapedQuotedString(p)
+			s := p.String()
+			l := len(s)
+			return s[1 : l-2], true, nil
 		case r == RuneEscape:
-			// escaped, take another
+			// things just got complicated...
-			_, _, 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()
@@ -59,22 +68,28 @@ func lexQuotedString(p *TextParser) (string, *lexer.Error) {
 	}
 }
 
-func lexReturnUnescapedQuotedString(p *TextParser) (string, *lexer.Error) {
+func lexQuotedStringEscaped(*TextParser) (string, *lexer.Error) {
-	// remove quotes
+	return "", nil
-	s := p.String()
-	l := len(s)
-	s = s[1 : l-1]
-
-	if strings.ContainsRune(s, RuneEscape) {
-		// TODO: implement unescaping
-		err := NewError(p.Position(), s, "escaped characters", lexer.ErrNotImplemented)
-		return "", err
-	}
-
-	return s, nil
 }
 
-// Unquoted removes quotes the content and unescapes the content
+//	// escaped. append partial
+//	mark = lexQuotedAppendPartial(p, &buf, mark)
+//
+//	r2, _, err := p.ReadRune()
+//	switch {
+//	case err != nil:
+//		// incomplete
+//		return "", NewErrIncompleteQuotedString(p)
+//	case IsNewLine(r2):
+//		// escaped new line
+//		p.UnreadRune()
+//		p.AcceptNewLine()
+//		mark = lexQuotedAppendNewLine(p, &buf, mark)
+//	default:
+//		// bad escaped
+//	}
+
+// Unquoted removes quotes and unescapes the content
 func Unquoted(s string) (string, error) {
 	var p TextParser
 	if s == "" {