Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d4d9aab5d4 | |||
| 7c19b74fd0 | |||
| 02c0978c6e | |||
| 845c24b20f |
Vendored
-7
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"cSpell.words": [
|
|
||||||
"asciigoat",
|
|
||||||
"Subname",
|
|
||||||
"unescapes"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
+14
-12
@@ -10,22 +10,24 @@ var (
|
|||||||
errInvalidToken = errors.New("invalid token")
|
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 {
|
func newErrInvalidToken(t *token) *lexer.Error {
|
||||||
return newError(t.pos, t.value, "", errInvalidToken)
|
err := &lexer.Error{
|
||||||
|
Line: t.pos.Line,
|
||||||
|
Column: t.pos.Column,
|
||||||
|
Content: t.value,
|
||||||
|
Err: errInvalidToken,
|
||||||
|
}
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dec *decoder) OnError(pos lexer.Position, content string, err error) error {
|
func (dec *decoder) OnError(pos lexer.Position, content string, err error) error {
|
||||||
err = newError(pos, content, "", err)
|
err = &lexer.Error{
|
||||||
|
Line: pos.Line,
|
||||||
|
Column: pos.Column,
|
||||||
|
Content: content,
|
||||||
|
Err: err,
|
||||||
|
}
|
||||||
|
|
||||||
dec.executeFinal()
|
dec.executeFinal()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
+20
-31
@@ -32,21 +32,21 @@ func (dec *decoder) executeFinal() {
|
|||||||
func (dec *decoder) execute(typ parser.TokenType) {
|
func (dec *decoder) execute(typ parser.TokenType) {
|
||||||
switch typ {
|
switch typ {
|
||||||
case parser.TokenSectionEnd:
|
case parser.TokenSectionEnd:
|
||||||
name1, ok1 := dec.queueValue(1, parser.TokenSectionName)
|
name1, ok1 := dec.getValue(1, parser.TokenSectionName)
|
||||||
|
|
||||||
if ok1 {
|
if ok1 {
|
||||||
name2, ok2 := dec.queueValue(2, parser.TokenSectionSubname)
|
name2, ok2 := dec.getValue(2, parser.TokenSectionSubname)
|
||||||
|
|
||||||
dec.addSection(name1, name2, ok2)
|
dec.addSection(name1, name2, ok2)
|
||||||
}
|
}
|
||||||
|
|
||||||
dec.queueReset()
|
dec.reset()
|
||||||
case parser.TokenFieldValue:
|
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.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 {
|
switch {
|
||||||
case idx < 0 || idx >= len(dec.queue):
|
case idx < 0 || idx >= len(dec.queue):
|
||||||
// out of range
|
// 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]
|
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
|
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
|
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 {
|
func (dec *decoder) typeOK(typ parser.TokenType) bool {
|
||||||
switch typ {
|
switch typ {
|
||||||
case parser.TokenSectionStart, parser.TokenFieldKey:
|
case parser.TokenSectionStart, parser.TokenFieldKey:
|
||||||
// first token only
|
// first token only
|
||||||
return dec.queueDepth(0)
|
return dec.depth(0)
|
||||||
case parser.TokenSectionName:
|
case parser.TokenSectionName:
|
||||||
// right after TokenSectionStart
|
// right after TokenSectionStart
|
||||||
return dec.queueDepthType(1, parser.TokenSectionStart)
|
return dec.depthAfter(1, parser.TokenSectionStart)
|
||||||
case parser.TokenSectionSubname:
|
case parser.TokenSectionSubname:
|
||||||
// right after TokenSectionName
|
// right after TokenSectionName
|
||||||
return dec.queueDepthType(2, parser.TokenSectionName)
|
return dec.depthAfter(2, parser.TokenSectionName)
|
||||||
case parser.TokenSectionEnd:
|
case parser.TokenSectionEnd:
|
||||||
// only on a section with name
|
// only on a section with name
|
||||||
return dec.queueType(1, parser.TokenSectionName)
|
_, ok := dec.getValue(1, parser.TokenSectionName)
|
||||||
|
return ok
|
||||||
case parser.TokenFieldValue:
|
case parser.TokenFieldValue:
|
||||||
// right after a TokenFieldKey
|
// right after a TokenFieldKey
|
||||||
return dec.queueDepthType(1, parser.TokenFieldKey)
|
return dec.depthAfter(1, parser.TokenFieldKey)
|
||||||
default:
|
default:
|
||||||
// never
|
// never
|
||||||
return false
|
return false
|
||||||
@@ -158,8 +149,6 @@ func (dec *decoder) OnToken(pos lexer.Position, typ parser.TokenType, value stri
|
|||||||
return nil
|
return nil
|
||||||
default:
|
default:
|
||||||
// unacceptable
|
// unacceptable
|
||||||
err := newErrInvalidToken(t)
|
return newErrInvalidToken(t)
|
||||||
dec.executeFinal()
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-29
@@ -45,20 +45,6 @@ func writeFieldsTo(w io.Writer, fields []Field, nl string) (int64, error) {
|
|||||||
return int64(written), nil
|
return int64(written), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// String generates a string output for "%s"
|
|
||||||
func (field Field) String() string {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
|
|
||||||
_, _ = writeFieldsTo(&buf, []Field{field}, WriteNewLine)
|
|
||||||
return buf.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GoString generates a string output for "%#v"
|
|
||||||
func (*Field) GoString() string {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
return buf.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeSectionToBuffer(w *bytes.Buffer, sec *Section, nl string) int {
|
func writeSectionToBuffer(w *bytes.Buffer, sec *Section, nl string) int {
|
||||||
var written, n int
|
var written, n int
|
||||||
|
|
||||||
@@ -88,20 +74,6 @@ func writeSectionToBuffer(w *bytes.Buffer, sec *Section, nl string) int {
|
|||||||
return written + int(n64)
|
return written + int(n64)
|
||||||
}
|
}
|
||||||
|
|
||||||
// String generates a string output for "%s"
|
|
||||||
func (sec *Section) String() string {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
|
|
||||||
_ = writeSectionToBuffer(&buf, sec, WriteNewLine)
|
|
||||||
return buf.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GoString generates a string output for "%#v"
|
|
||||||
func (*Section) GoString() string {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
return buf.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// WriteTo writes a INI representation of the document
|
// WriteTo writes a INI representation of the document
|
||||||
// onto the provided writer.
|
// onto the provided writer.
|
||||||
func (doc *Document) WriteTo(w io.Writer) (int64, error) {
|
func (doc *Document) WriteTo(w io.Writer) (int64, error) {
|
||||||
@@ -109,7 +81,7 @@ func (doc *Document) WriteTo(w io.Writer) (int64, error) {
|
|||||||
return buf.WriteTo(w)
|
return buf.WriteTo(w)
|
||||||
}
|
}
|
||||||
|
|
||||||
// String generates a string output for "%s"
|
// GoString generates a string output for "%s"
|
||||||
func (doc *Document) String() string {
|
func (doc *Document) String() string {
|
||||||
buf := doc.AsBuffer(WriteNewLine)
|
buf := doc.AsBuffer(WriteNewLine)
|
||||||
return buf.String()
|
return buf.String()
|
||||||
|
|||||||
@@ -2,30 +2,26 @@ module asciigoat.org/ini
|
|||||||
|
|
||||||
go 1.19
|
go 1.19
|
||||||
|
|
||||||
replace (
|
replace asciigoat.org/core => ../core
|
||||||
asciigoat.org/core => ../core
|
|
||||||
darvaza.org/core => ../../darvaza.org/core
|
|
||||||
)
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
asciigoat.org/core v0.3.9
|
asciigoat.org/core v0.3.7
|
||||||
github.com/mgechev/revive v1.3.3
|
github.com/mgechev/revive v1.3.3
|
||||||
golang.org/x/tools v0.12.0
|
golang.org/x/tools v0.12.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/BurntSushi/toml v1.3.2 // indirect
|
github.com/BurntSushi/toml v1.3.2 // indirect
|
||||||
github.com/chavacava/garif v0.1.0 // indirect
|
github.com/chavacava/garif v0.0.0-20230608123814-4bd63c2919ab // indirect
|
||||||
github.com/fatih/color v1.15.0 // indirect
|
github.com/fatih/color v1.15.0 // indirect
|
||||||
github.com/fatih/structtag v1.2.0 // indirect
|
github.com/fatih/structtag v1.2.0 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.13 // indirect
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.19 // indirect
|
github.com/mattn/go-isatty v0.0.19 // indirect
|
||||||
github.com/mattn/go-runewidth v0.0.15 // indirect
|
github.com/mattn/go-runewidth v0.0.9 // indirect
|
||||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
|
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
|
||||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||||
github.com/olekukonko/tablewriter v0.0.5 // indirect
|
github.com/olekukonko/tablewriter v0.0.5 // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/rivo/uniseg v0.4.4 // indirect
|
|
||||||
golang.org/x/mod v0.12.0 // indirect
|
golang.org/x/mod v0.12.0 // indirect
|
||||||
golang.org/x/sys v0.11.0 // indirect
|
golang.org/x/sys v0.11.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
|
github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
|
||||||
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
|
github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
|
||||||
github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc=
|
github.com/chavacava/garif v0.0.0-20230608123814-4bd63c2919ab h1:5JxePczlyGAtj6R1MUEFZ/UFud6FfsOejq7xLC2ZIb0=
|
||||||
github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
|
github.com/chavacava/garif v0.0.0-20230608123814-4bd63c2919ab/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
@@ -14,9 +14,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
|
|||||||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
|
||||||
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
|
||||||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||||
|
github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
|
||||||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
|
||||||
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
|
|
||||||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
|
|
||||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0=
|
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 h1:zpIH83+oKzcpryru8ceC6BxnoG8TBrhgAvRg8obzup0=
|
||||||
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg=
|
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg=
|
||||||
github.com/mgechev/revive v1.3.3 h1:GUWzV3g185agbHN4ZdaQvR6zrLVYTUSA2ktvIinivK0=
|
github.com/mgechev/revive v1.3.3 h1:GUWzV3g185agbHN4ZdaQvR6zrLVYTUSA2ktvIinivK0=
|
||||||
@@ -29,9 +28,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
|||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
|
||||||
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
|
|
||||||
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||||
|
|||||||
+46
-17
@@ -5,42 +5,71 @@ import "asciigoat.org/core/lexer"
|
|||||||
// Run parses the source
|
// Run parses the source
|
||||||
func (p *Parser) Run() error {
|
func (p *Parser) Run() error {
|
||||||
p.setDefaults()
|
p.setDefaults()
|
||||||
|
p.pos.Reset()
|
||||||
|
|
||||||
return lexer.Run(p.lexStart)
|
return lexer.Run(p.lexStart)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *Parser) lexStart() (lexer.StateFn, error) {
|
func (p *Parser) lexStart() (lexer.StateFn, error) {
|
||||||
for {
|
for {
|
||||||
r, _, err := p.p.ReadRune()
|
r, _, err := p.src.ReadRune()
|
||||||
switch {
|
switch {
|
||||||
case err != nil:
|
case err != nil:
|
||||||
return p.emitError("", err)
|
return p.emitError("", err)
|
||||||
case IsNewLine(r):
|
case IsNewLine(r):
|
||||||
// new line
|
// new line
|
||||||
p.p.UnreadRune()
|
p.lexMoreNewLine(r)
|
||||||
p.p.AcceptNewLine()
|
|
||||||
p.stepLine()
|
p.stepLine()
|
||||||
case IsSpace(r):
|
case IsSpace(r):
|
||||||
// whitespace
|
// whitespace
|
||||||
p.stepString()
|
p.stepRune()
|
||||||
case IsCommentStart(r):
|
case IsCommentStart(r):
|
||||||
// switch to comment lexer
|
// switch to comment lexer
|
||||||
p.p.UnreadRune()
|
p.src.UnreadRune()
|
||||||
return p.lexComment, nil
|
return p.lexComment, nil
|
||||||
case IsSectionStart(r):
|
case IsSectionStart(r):
|
||||||
// section
|
// section
|
||||||
return p.lexSectionStart, nil
|
return p.lexSectionStart, nil
|
||||||
default:
|
default:
|
||||||
// entry
|
// entry
|
||||||
p.p.UnreadRune()
|
p.src.UnreadRune()
|
||||||
return p.lexEntryStart, nil
|
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) {
|
func (p *Parser) lexComment() (lexer.StateFn, error) {
|
||||||
// until the end of the line
|
// until the end of the line
|
||||||
p.p.AcceptAll(IsNotNewLine)
|
p.src.AcceptAll(IsNotNewLine)
|
||||||
|
|
||||||
err := p.emitString(TokenComment)
|
err := p.emitString(TokenComment)
|
||||||
return p.lexStart, err
|
return p.lexStart, err
|
||||||
@@ -52,11 +81,11 @@ func (p *Parser) lexSectionStart() (lexer.StateFn, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// remove whitespace between `[` and the name
|
// remove whitespace between `[` and the name
|
||||||
if p.p.AcceptAll(IsSpaceNotNewLine) {
|
if p.src.AcceptAll(IsSpaceNotNewLine) {
|
||||||
p.stepString()
|
p.stepString()
|
||||||
}
|
}
|
||||||
|
|
||||||
if !p.p.AcceptAll(IsName) {
|
if !p.src.AcceptAll(IsName) {
|
||||||
// no name
|
// no name
|
||||||
return p.emitError("section name missing", lexer.ErrUnacceptableRune)
|
return p.emitError("section name missing", lexer.ErrUnacceptableRune)
|
||||||
}
|
}
|
||||||
@@ -65,12 +94,12 @@ func (p *Parser) lexSectionStart() (lexer.StateFn, error) {
|
|||||||
return nil, err
|
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()
|
p.stepString()
|
||||||
}
|
}
|
||||||
|
|
||||||
r, _, err := p.p.ReadRune()
|
r, _, err := p.src.ReadRune()
|
||||||
switch {
|
switch {
|
||||||
case err != nil:
|
case err != nil:
|
||||||
return p.emitError("", err)
|
return p.emitError("", err)
|
||||||
@@ -83,17 +112,17 @@ func (p *Parser) lexSectionStart() (lexer.StateFn, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *Parser) lexEntryStart() (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 {
|
if err := p.emitString(TokenFieldKey); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// ignore whitespace between key and the '=' sign
|
// ignore whitespace between key and the '=' sign
|
||||||
if p.p.AcceptAll(IsSpaceNotNewLine) {
|
if p.src.AcceptAll(IsSpaceNotNewLine) {
|
||||||
p.stepString()
|
p.stepString()
|
||||||
}
|
}
|
||||||
|
|
||||||
r, _, err := p.p.ReadRune()
|
r, _, err := p.src.ReadRune()
|
||||||
switch {
|
switch {
|
||||||
case err != nil:
|
case err != nil:
|
||||||
return p.emitError("", err)
|
return p.emitError("", err)
|
||||||
@@ -102,11 +131,11 @@ func (p *Parser) lexEntryStart() (lexer.StateFn, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ignore whitespace between the '=' and the value
|
// ignore whitespace between the '=' and the value
|
||||||
if p.p.AcceptAll(IsSpaceNotNewLine) {
|
if p.src.AcceptAll(IsSpaceNotNewLine) {
|
||||||
p.stepString()
|
p.stepString()
|
||||||
}
|
}
|
||||||
|
|
||||||
p.p.AcceptAll(IsNotNewLine)
|
p.src.AcceptAll(IsNotNewLine)
|
||||||
if err := p.emitString(TokenFieldValue); err != nil {
|
if err := p.emitString(TokenFieldValue); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,11 +43,6 @@ var (
|
|||||||
IsCommentStart = lexer.NewIsIn(RunesComment)
|
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
|
// IsSpaceNotNewLine indicates a rune is whitespace but not a new line
|
||||||
func IsSpaceNotNewLine(r rune) bool {
|
func IsSpaceNotNewLine(r rune) bool {
|
||||||
return IsSpace(r) && !IsNewLine(r)
|
return IsSpace(r) && !IsNewLine(r)
|
||||||
|
|||||||
+27
-16
@@ -1,4 +1,4 @@
|
|||||||
// Package parser parses ini-style files
|
// Package parser parses dosini-style files
|
||||||
package parser
|
package parser
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -8,9 +8,10 @@ import (
|
|||||||
"asciigoat.org/core/lexer"
|
"asciigoat.org/core/lexer"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Parser parses a ini-style document
|
// Parser parses a dosini-style document
|
||||||
type Parser struct {
|
type Parser struct {
|
||||||
p TextParser
|
src *lexer.Reader
|
||||||
|
pos lexer.Position
|
||||||
|
|
||||||
// OnToken is called for each identified token. if it returns an error
|
// OnToken is called for each identified token. if it returns an error
|
||||||
// parsing is interrupted.
|
// parsing is interrupted.
|
||||||
@@ -50,13 +51,15 @@ func (p *Parser) setDefaults() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *Parser) emitString(typ TokenType) error {
|
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) {
|
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 {
|
switch {
|
||||||
case err2 != nil:
|
case err2 != nil:
|
||||||
// return wrapped error
|
// return wrapped error
|
||||||
@@ -74,25 +77,33 @@ func (p *Parser) emitInvalidRune(r rune) (lexer.StateFn, error) {
|
|||||||
// stepLine discards the data and moves the position
|
// stepLine discards the data and moves the position
|
||||||
// to the next line.
|
// to the next line.
|
||||||
func (p *Parser) stepLine() {
|
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
|
// stepString discards the data and moves the position
|
||||||
// forward on the same line the length of the discarded
|
// forward on the same line the length of the discarded
|
||||||
// content.
|
// content.
|
||||||
func (p *Parser) stepString() {
|
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
|
// an [io.Reader] as source
|
||||||
func NewParser(r io.Reader) *Parser {
|
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),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-103
@@ -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
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -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
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user