6 Commits

Author SHA1 Message Date
amery ff03ee922d lexer: introduce Error{}
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-29 02:41:48 +00:00
amery 868786cb9f lexer: introduce a Position (Line, Column) handler
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-29 02:10:46 +00:00
amery 3e964d1455 lexer: introduce StateFn and the basic state machine loop
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-29 02:10:03 +00:00
amery 530eff87e9 lexer: introduce Reader.Accept()/AcceptAll()
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-29 02:10:03 +00:00
amery c3339a2cdb build-sys: import build system from darvaza.org/core
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-29 02:03:53 +00:00
amery 5e3171d891 Merge branch 'pr-amery-reader' 2023-08-29 02:03:36 +00:00
3 changed files with 63 additions and 11 deletions
+15
View File
@@ -1,2 +1,17 @@
// Package lexer provides basic helpers to implement parsers
package lexer
// StateFn is a State Function of the parser
type StateFn func() (StateFn, error)
// Run runs a state machine until the state function either
// returns nil or an error
func Run(fn StateFn) error {
var err error
for fn != nil && err == nil {
fn, err = fn()
}
return err
}
+13 -11
View File
@@ -41,26 +41,28 @@ func (p *Position) Step() {
p.Column++
}
// StepN moves the column N places forward
func (p *Position) StepN(n int) {
// Next returns a new Position one rune forward
// on the line
func (p Position) Next() Position {
if p.Line == 0 {
p.Reset()
}
switch {
case n > 0:
p.Column += n
default:
panic(fmt.Errorf("invalid %v increment", n))
return Position{
Line: p.Line,
Column: p.Column + 1,
}
}
// StepLine moves position to the start of the next line
func (p *Position) StepLine() {
// NextLine returns a new Position at the begining of the next
// line.
func (p Position) NextLine() Position {
if p.Line == 0 {
p.Reset()
}
p.Line++
p.Column = 1
return Position{
Line: p.Line + 1,
Column: 1,
}
}
+35
View File
@@ -198,6 +198,41 @@ func (b *Reader) PeekRune() (rune, int, error) {
return r, l, err
}
// Accept consumes a rune from the source if it meets the condition.
// it returns true if the condition was met and false if it wasn't.
func (b *Reader) Accept(cond func(r rune) bool) bool {
r, _, err := b.ReadRune()
switch {
case err != nil:
return false
case cond(r):
return true
default:
_ = b.UnreadRune()
return false
}
}
// AcceptAll consumes runes from the source as long as they meet the
// condition. it returns true if the condition was met for at least one rune,
// and false if it wasn't.
func (b *Reader) AcceptAll(cond func(r rune) bool) bool {
var accepted bool
for {
r, _, err := b.ReadRune()
switch {
case err != nil:
return accepted
case cond(r):
accepted = true
default:
_ = b.UnreadRune()
return accepted
}
}
}
// NewReader creates a new runes [Reader] using the given [io.Reader]
func NewReader(r io.Reader) *Reader {
if r == nil {