Compare commits
6 Commits
0f0c2e9fad
...
v0.1.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 169379f5c6 | |||
| eb36c195c0 | |||
| 1090a374f0 | |||
| a15deb7e42 | |||
| 1dd7cb19a8 | |||
| e85f8c5e3f |
@@ -0,0 +1,50 @@
|
|||||||
|
.PHONY: all clean generate fmt
|
||||||
|
.PHONY: tidy get build test up
|
||||||
|
|
||||||
|
GO ?= go
|
||||||
|
GOFMT ?= gofmt
|
||||||
|
GOFMT_FLAGS = -w -l -s
|
||||||
|
GOGENERATE_FLAGS = -v
|
||||||
|
|
||||||
|
GOPATH ?= $(shell $(GO) env GOPATH)
|
||||||
|
GOBIN ?= $(GOPATH)/bin
|
||||||
|
|
||||||
|
TMPDIR ?= $(CURDIR)/.tmp
|
||||||
|
TOOLSDIR = $(CURDIR)/tools
|
||||||
|
|
||||||
|
REVIVE_CONF ?= $(TOOLSDIR)/revive.toml
|
||||||
|
REVIVE_RUN_ARGS ?= -config $(REVIVE_CONF) -formatter friendly
|
||||||
|
REVIVE ?= $(GO) run -v github.com/mgechev/revive
|
||||||
|
|
||||||
|
V = 0
|
||||||
|
Q = $(if $(filter 1,$V),,@)
|
||||||
|
M = $(shell if [ "$$(tput colors 2> /dev/null || echo 0)" -ge 8 ]; then printf "\033[34;1m▶\033[0m"; else printf "▶"; fi)
|
||||||
|
|
||||||
|
all: get generate tidy build
|
||||||
|
|
||||||
|
clean: ; $(info $(M) cleaning…)
|
||||||
|
rm -rf $(TMPDIR)
|
||||||
|
|
||||||
|
fmt: ; $(info $(M) reformatting sources…)
|
||||||
|
$Q find . -name '*.go' | xargs -r $(GOFMT) $(GOFMT_FLAGS)
|
||||||
|
|
||||||
|
tidy: | fmt ; $(info $(M) tidying up…)
|
||||||
|
$Q $(GO) mod tidy
|
||||||
|
$Q $(GO) vet ./...
|
||||||
|
$Q $(REVIVE) $(REVIVE_RUN_ARGS) ./...
|
||||||
|
|
||||||
|
get: ; $(info $(M) downloading dependencies…)
|
||||||
|
$Q $(GO) get -v -tags tools ./...
|
||||||
|
|
||||||
|
build: ; $(info $(M) building…)
|
||||||
|
$Q $(GO) build -v ./...
|
||||||
|
|
||||||
|
test: ; $(info $(M) building…)
|
||||||
|
$Q $(GO) test ./...
|
||||||
|
|
||||||
|
up: ; $(info $(M) updating dependencies…)
|
||||||
|
$Q $(GO) get -u -v ./...
|
||||||
|
$Q $(GO) mod tidy
|
||||||
|
|
||||||
|
generate: ; $(info $(M) generating data…)
|
||||||
|
$Q git grep -l '^//go:generate' | sort -uV | xargs -r -n1 $(GO) generate $(GOGENERATE_FLAGS)
|
||||||
@@ -1,3 +1,25 @@
|
|||||||
module asciigoat.org/ini
|
module asciigoat.org/ini
|
||||||
|
|
||||||
go 1.19
|
go 1.19
|
||||||
|
|
||||||
|
require (
|
||||||
|
asciigoat.org/core v0.3.6
|
||||||
|
github.com/mgechev/revive v1.3.3
|
||||||
|
golang.org/x/tools v0.12.0
|
||||||
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/BurntSushi/toml v1.3.2 // indirect
|
||||||
|
github.com/chavacava/garif v0.0.0-20230608123814-4bd63c2919ab // indirect
|
||||||
|
github.com/fatih/color v1.15.0 // indirect
|
||||||
|
github.com/fatih/structtag v1.2.0 // indirect
|
||||||
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
|
github.com/mattn/go-isatty v0.0.19 // indirect
|
||||||
|
github.com/mattn/go-runewidth v0.0.9 // indirect
|
||||||
|
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
|
||||||
|
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||||
|
github.com/olekukonko/tablewriter v0.0.5 // indirect
|
||||||
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
|
golang.org/x/mod v0.12.0 // indirect
|
||||||
|
golang.org/x/sys v0.11.0 // indirect
|
||||||
|
)
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
asciigoat.org/core v0.3.6 h1:b1vL090OxylmSOwLQryjrmC8FhhCtktMyeJSy1e6LwI=
|
||||||
|
asciigoat.org/core v0.3.6/go.mod h1:tXj+JUutxRbcO40ZQRuUVaZ4rnYz1kAZ0nblisV8u74=
|
||||||
|
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.0.0-20230608123814-4bd63c2919ab h1:5JxePczlyGAtj6R1MUEFZ/UFud6FfsOejq7xLC2ZIb0=
|
||||||
|
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.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
|
||||||
|
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
|
||||||
|
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
|
||||||
|
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
|
||||||
|
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
|
||||||
|
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
|
||||||
|
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/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/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/revive v1.3.3 h1:GUWzV3g185agbHN4ZdaQvR6zrLVYTUSA2ktvIinivK0=
|
||||||
|
github.com/mgechev/revive v1.3.3/go.mod h1:NhpOtVtDbjYNDj697eDUBTobijCDHQKar4HDKc0TuTo=
|
||||||
|
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
|
||||||
|
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||||
|
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
|
||||||
|
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
|
||||||
|
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||||
|
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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
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.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||||
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
|
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||||
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
|
golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
|
||||||
|
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
|
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
|
||||||
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
|
||||||
|
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
|
||||||
|
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
+144
@@ -0,0 +1,144 @@
|
|||||||
|
package parser
|
||||||
|
|
||||||
|
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.src.ReadRune()
|
||||||
|
switch {
|
||||||
|
case err != nil:
|
||||||
|
return p.emitError("", err)
|
||||||
|
case IsNewLine(r):
|
||||||
|
// new line
|
||||||
|
p.lexMoreNewLine(r)
|
||||||
|
p.stepLine()
|
||||||
|
case IsSpace(r):
|
||||||
|
// whitespace
|
||||||
|
p.stepRune()
|
||||||
|
case IsCommentStart(r):
|
||||||
|
// switch to comment lexer
|
||||||
|
p.src.UnreadRune()
|
||||||
|
return p.lexComment, nil
|
||||||
|
case IsSectionStart(r):
|
||||||
|
// section
|
||||||
|
return p.lexSectionStart, nil
|
||||||
|
default:
|
||||||
|
// entry
|
||||||
|
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.src.AcceptAll(IsNotNewLine)
|
||||||
|
|
||||||
|
err := p.emitString(TokenComment)
|
||||||
|
return p.lexStart, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Parser) lexSectionStart() (lexer.StateFn, error) {
|
||||||
|
if err := p.emitString(TokenSectionStart); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove whitespace between `[` and the name
|
||||||
|
if p.src.AcceptAll(IsSpaceNotNewLine) {
|
||||||
|
p.stepString()
|
||||||
|
}
|
||||||
|
|
||||||
|
if !p.src.AcceptAll(IsName) {
|
||||||
|
// no name
|
||||||
|
return p.emitError("section name missing", lexer.ErrUnacceptableRune)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := p.emitString(TokenSectionName); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove whitespace between the name andthe closing `]`
|
||||||
|
if p.src.AcceptAll(IsSpaceNotNewLine) {
|
||||||
|
p.stepString()
|
||||||
|
}
|
||||||
|
|
||||||
|
r, _, err := p.src.ReadRune()
|
||||||
|
switch {
|
||||||
|
case err != nil:
|
||||||
|
return p.emitError("", err)
|
||||||
|
case IsSectionEnd(r):
|
||||||
|
err := p.emitString(TokenSectionEnd)
|
||||||
|
return p.lexStart, err
|
||||||
|
default:
|
||||||
|
return p.emitInvalidRune(r)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Parser) lexEntryStart() (lexer.StateFn, error) {
|
||||||
|
p.src.AcceptAll(IsName)
|
||||||
|
if err := p.emitString(TokenFieldKey); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// ignore whitespace between key and the '=' sign
|
||||||
|
if p.src.AcceptAll(IsSpaceNotNewLine) {
|
||||||
|
p.stepString()
|
||||||
|
}
|
||||||
|
|
||||||
|
r, _, err := p.src.ReadRune()
|
||||||
|
switch {
|
||||||
|
case err != nil:
|
||||||
|
return p.emitError("", err)
|
||||||
|
case r != RuneFieldEqual:
|
||||||
|
return p.emitInvalidRune(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ignore whitespace between the '=' and the value
|
||||||
|
if p.src.AcceptAll(IsSpaceNotNewLine) {
|
||||||
|
p.stepString()
|
||||||
|
}
|
||||||
|
|
||||||
|
p.src.AcceptAll(IsNotNewLine)
|
||||||
|
if err := p.emitString(TokenFieldValue); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return p.lexStart, err
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
package parser
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"asciigoat.org/core/lexer"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
RuneComment = ';' // RuneComment is the standard dosini comment character
|
||||||
|
RuneCommentExtra = '#' // RuneCommentExtra is UNIX shell's comment character
|
||||||
|
RuneSectionStart = '[' // RuneSectionStart indicates the start of a section declaration
|
||||||
|
RuneSectionEnd = ']' // RuneSectionEnd indiciates the end of a section declaration
|
||||||
|
RuneFieldEqual = '=' // RuneFieldEqual separates field keys from their values
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// RunesComment is a string containing all runes acceptable to start comments
|
||||||
|
RunesComment = string([]rune{
|
||||||
|
RuneComment,
|
||||||
|
RuneCommentExtra,
|
||||||
|
})
|
||||||
|
// RunesSpecial is a string containing all the runes with special meaning
|
||||||
|
RunesSpecial = string([]rune{
|
||||||
|
RuneComment,
|
||||||
|
RuneCommentExtra,
|
||||||
|
RuneSectionStart,
|
||||||
|
RuneSectionEnd,
|
||||||
|
RuneFieldEqual,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// IsNewLine tells if the rune indicates a line break or the start of one
|
||||||
|
IsNewLine = lexer.NewIsIn("\r\n")
|
||||||
|
// IsNotNewLine tells if the rune is not a line break nor the start of one
|
||||||
|
IsNotNewLine = lexer.NewIsNot(IsNewLine)
|
||||||
|
// IsSpace tells if the rune is considered whitespace by Unicode
|
||||||
|
IsSpace = lexer.IsSpace
|
||||||
|
// IsNotSpace tells if the rune is not considered whitespace by Unicode
|
||||||
|
IsNotSpace = lexer.NewIsNot(IsSpace)
|
||||||
|
// IsCommentStart ...
|
||||||
|
IsCommentStart = lexer.NewIsIn(RunesComment)
|
||||||
|
)
|
||||||
|
|
||||||
|
// IsSpaceNotNewLine indicates a rune is whitespace but not a new line
|
||||||
|
func IsSpaceNotNewLine(r rune) bool {
|
||||||
|
return IsSpace(r) && !IsNewLine(r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IsSectionStart indicates the rune starts the section declaration
|
||||||
|
func IsSectionStart(r rune) bool { return r == RuneSectionStart }
|
||||||
|
|
||||||
|
// IsSectionEnd indicates the rune ends the section declaration
|
||||||
|
func IsSectionEnd(r rune) bool { return r == RuneSectionEnd }
|
||||||
|
|
||||||
|
// IsName indicates a rune is acceptable for section or field names
|
||||||
|
func IsName(r rune) bool {
|
||||||
|
switch {
|
||||||
|
case IsSpace(r):
|
||||||
|
return false
|
||||||
|
case strings.ContainsRune(RunesSpecial, r):
|
||||||
|
return false
|
||||||
|
default:
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
// Package parser parses dosini-style files
|
||||||
|
package parser
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
|
||||||
|
"asciigoat.org/core/lexer"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Parser parses a dosini-style document
|
||||||
|
type Parser struct {
|
||||||
|
src *lexer.Reader
|
||||||
|
pos lexer.Position
|
||||||
|
|
||||||
|
// OnToken is called for each identified token. if it returns an error
|
||||||
|
// parsing is interrupted.
|
||||||
|
OnToken func(pos lexer.Position, typ TokenType, value string) error
|
||||||
|
|
||||||
|
// OnError is called in case of a parsing error, and it's allowed
|
||||||
|
// to replace the error returned by [Parser.Run].
|
||||||
|
// OnError is called for io.EOF, but [Parser.Run] will consider it
|
||||||
|
// normal termination.
|
||||||
|
OnError func(pos lexer.Position, content string, err error) error
|
||||||
|
}
|
||||||
|
|
||||||
|
func defaultOnToken(pos lexer.Position, typ TokenType, value string) error {
|
||||||
|
log.Printf("%s:%v:%v: %q", typ, pos.Line, pos.Column, value)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
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 lexer.Error{
|
||||||
|
Line: pos.Line,
|
||||||
|
Column: pos.Column,
|
||||||
|
|
||||||
|
Content: content,
|
||||||
|
Err: err,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Parser) setDefaults() {
|
||||||
|
if p.OnToken == nil {
|
||||||
|
p.OnToken = defaultOnToken
|
||||||
|
}
|
||||||
|
if p.OnError == nil {
|
||||||
|
p.OnError = defaultOnError
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Parser) emitString(typ TokenType) error {
|
||||||
|
s := p.src.Emit()
|
||||||
|
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) {
|
||||||
|
err2 := p.OnError(p.pos, content, err)
|
||||||
|
switch {
|
||||||
|
case err2 != nil:
|
||||||
|
// return wrapped error
|
||||||
|
return nil, err2
|
||||||
|
default:
|
||||||
|
// return original error
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *Parser) emitInvalidRune(r rune) (lexer.StateFn, error) {
|
||||||
|
return p.emitError(string([]rune{r}), lexer.ErrUnacceptableRune)
|
||||||
|
}
|
||||||
|
|
||||||
|
// stepLine discards the data and moves the position
|
||||||
|
// to the next line.
|
||||||
|
func (p *Parser) 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() {
|
||||||
|
s := p.src.Emit()
|
||||||
|
p.pos.StepN(len(s))
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewParser creates a dosini-style parser using
|
||||||
|
// an [io.Reader] as source
|
||||||
|
func NewParser(r io.Reader) *Parser {
|
||||||
|
if r == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return &Parser{
|
||||||
|
src: lexer.NewReader(r),
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package parser
|
||||||
|
|
||||||
|
//go:generate go run golang.org/x/tools/cmd/stringer -type=TokenType
|
||||||
|
|
||||||
|
// A TokenType is a type of Token
|
||||||
|
type TokenType uint
|
||||||
|
|
||||||
|
const (
|
||||||
|
// TokenUnknown represents a Token that hasn't been identified
|
||||||
|
TokenUnknown TokenType = iota
|
||||||
|
// TokenSectionStart indicates the opening marker of a section declaration.
|
||||||
|
// The left squared bracket.
|
||||||
|
TokenSectionStart
|
||||||
|
// TokenSectionEnd indicates the closing marker of a section declaration.
|
||||||
|
// The right squared bracket.
|
||||||
|
TokenSectionEnd
|
||||||
|
// TokenSectionName represents the section name between the squared brackets
|
||||||
|
TokenSectionName
|
||||||
|
// TokenSectionSubname represents a secondary name in the section represented
|
||||||
|
// between quotes after the section name.
|
||||||
|
// e.g.
|
||||||
|
// [section_name "section_subname"]
|
||||||
|
TokenSectionSubname
|
||||||
|
// TokenComment represents a comment, including the initial ';' or '#' until
|
||||||
|
// the end of the line.
|
||||||
|
TokenComment
|
||||||
|
// TokenFieldKey represents a field name in a `key = value` entry
|
||||||
|
TokenFieldKey
|
||||||
|
// TokenFieldValue represents a field value in a `key = value` entry
|
||||||
|
TokenFieldValue
|
||||||
|
)
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
// Code generated by "stringer -type=TokenType"; DO NOT EDIT.
|
||||||
|
|
||||||
|
package parser
|
||||||
|
|
||||||
|
import "strconv"
|
||||||
|
|
||||||
|
func _() {
|
||||||
|
// An "invalid array index" compiler error signifies that the constant values have changed.
|
||||||
|
// Re-run the stringer command to generate them again.
|
||||||
|
var x [1]struct{}
|
||||||
|
_ = x[TokenUnknown-0]
|
||||||
|
_ = x[TokenSectionStart-1]
|
||||||
|
_ = x[TokenSectionEnd-2]
|
||||||
|
_ = x[TokenSectionName-3]
|
||||||
|
_ = x[TokenSectionSubname-4]
|
||||||
|
_ = x[TokenComment-5]
|
||||||
|
_ = x[TokenFieldKey-6]
|
||||||
|
_ = x[TokenFieldValue-7]
|
||||||
|
}
|
||||||
|
|
||||||
|
const _TokenType_name = "TokenUnknownTokenSectionStartTokenSectionEndTokenSectionNameTokenSectionSubnameTokenCommentTokenFieldKeyTokenFieldValue"
|
||||||
|
|
||||||
|
var _TokenType_index = [...]uint8{0, 12, 29, 44, 60, 79, 91, 104, 119}
|
||||||
|
|
||||||
|
func (i TokenType) String() string {
|
||||||
|
if i >= TokenType(len(_TokenType_index)-1) {
|
||||||
|
return "TokenType(" + strconv.FormatInt(int64(i), 10) + ")"
|
||||||
|
}
|
||||||
|
return _TokenType_name[_TokenType_index[i]:_TokenType_index[i+1]]
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
ignoreGeneratedHeader = false
|
||||||
|
severity = "error"
|
||||||
|
confidence = 0.8
|
||||||
|
errorCode = 1
|
||||||
|
warningCode = 0
|
||||||
|
enableAllRules = true
|
||||||
|
|
||||||
|
[rule.function-length]
|
||||||
|
arguments = [40,0]
|
||||||
|
severity = "warning"
|
||||||
|
[rule.function-result-limit]
|
||||||
|
arguments = [3]
|
||||||
|
[rule.argument-limit]
|
||||||
|
arguments = [5]
|
||||||
|
[rule.cognitive-complexity]
|
||||||
|
arguments = [7]
|
||||||
|
[rule.cyclomatic]
|
||||||
|
arguments = [10]
|
||||||
|
[rule.line-length-limit]
|
||||||
|
arguments = [100]
|
||||||
|
severity = "warning"
|
||||||
|
[rule.comment-spacings]
|
||||||
|
severity = "warning"
|
||||||
|
[rule.empty-lines]
|
||||||
|
severity = "warning"
|
||||||
|
|
||||||
|
# Disabled rules
|
||||||
|
[rule.max-public-structs]
|
||||||
|
disabled = true
|
||||||
|
[rule.file-header]
|
||||||
|
disabled = true
|
||||||
|
[rule.add-constant]
|
||||||
|
disabled = true
|
||||||
|
[rule.banned-characters]
|
||||||
|
disabled = true
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
//go:build tools
|
||||||
|
|
||||||
|
package tools
|
||||||
|
|
||||||
|
import (
|
||||||
|
_ "github.com/mgechev/revive"
|
||||||
|
_ "golang.org/x/tools/cmd/stringer"
|
||||||
|
)
|
||||||
Reference in New Issue
Block a user