2 Commits

Author SHA1 Message Date
amery 8aff8959d9 parser: implement initial tokeniser
only logging position, errors and non-whitespace elements

Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-30 02:04:53 +00:00
amery 00fcde4c5b parser: add placeholder for ini Parser
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-30 02:06:31 +01:00
3 changed files with 14 additions and 26 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ module asciigoat.org/ini
go 1.19 go 1.19
require ( require (
asciigoat.org/core v0.3.6 asciigoat.org/core v0.3.4
github.com/mgechev/revive v1.3.3 github.com/mgechev/revive v1.3.3
) )
+2 -2
View File
@@ -1,5 +1,5 @@
asciigoat.org/core v0.3.6 h1:b1vL090OxylmSOwLQryjrmC8FhhCtktMyeJSy1e6LwI= asciigoat.org/core v0.3.4 h1:FQ4IvqQS7T1wke0dOeKUABtNY+JQHmccmedBjz18j9s=
asciigoat.org/core v0.3.6/go.mod h1:tXj+JUutxRbcO40ZQRuUVaZ4rnYz1kAZ0nblisV8u74= asciigoat.org/core v0.3.4/go.mod h1:tXj+JUutxRbcO40ZQRuUVaZ4rnYz1kAZ0nblisV8u74=
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.0.0-20230608123814-4bd63c2919ab h1:5JxePczlyGAtj6R1MUEFZ/UFud6FfsOejq7xLC2ZIb0= github.com/chavacava/garif v0.0.0-20230608123814-4bd63c2919ab h1:5JxePczlyGAtj6R1MUEFZ/UFud6FfsOejq7xLC2ZIb0=
+11 -23
View File
@@ -51,28 +51,16 @@ func (p *Parser) lexNewLine(r1 rune) {
// r1 is warrantied to be either \n or \r // r1 is warrantied to be either \n or \r
r2, _, err := p.src.ReadRune() r2, _, err := p.src.ReadRune()
switch r1 { switch {
case '\r': case r1 == '\r' && r2 == '\n':
switch { // CR LN
case r2 == '\n': case r1 == '\r' && err == nil:
// CR LN // CR
case err == nil: p.src.UnreadRune()
// CR case r2 == '\r':
p.src.UnreadRune() // LN CR
default: case err == nil:
// CR EOF // LN
} p.src.UnreadRune()
case '\n':
switch {
case r2 == '\r':
// LN CR
case err == nil:
// LN
p.src.UnreadRune()
default:
// LN EOF
}
default:
panic("unreachable")
} }
} }