scanner.go: New function UnreadToken().
Currently it only supports one staging level.
This commit is contained in:
parent
5f8ca47ef0
commit
463e3634ba
18
scanner.go
18
scanner.go
@ -16,6 +16,7 @@ import (
|
||||
type scanner struct {
|
||||
current *Token
|
||||
prev *Token
|
||||
stage *Token
|
||||
stream *bufio.Reader
|
||||
row int
|
||||
column int
|
||||
@ -74,6 +75,16 @@ func (scanner *scanner) unreadChar() (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func (scanner *scanner) UnreadToken() (err error) {
|
||||
if scanner.stage == nil {
|
||||
scanner.stage = scanner.current
|
||||
scanner.current = scanner.prev
|
||||
} else {
|
||||
err = fmt.Errorf("staging already present, currently one level only of staging is allowed")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (scanner *scanner) lastPos() (r, c int) {
|
||||
if scanner.prev != nil {
|
||||
r = scanner.prev.row
|
||||
@ -89,7 +100,12 @@ func (scanner *scanner) Previous() *Token {
|
||||
func (scanner *scanner) Next() (tk *Token) {
|
||||
scanner.prev = scanner.current
|
||||
tk = scanner.current
|
||||
if scanner.stage != nil {
|
||||
scanner.current = scanner.stage
|
||||
scanner.stage = nil
|
||||
} else {
|
||||
scanner.current = scanner.fetchNextToken()
|
||||
}
|
||||
return tk
|
||||
}
|
||||
|
||||
@ -124,6 +140,8 @@ func (scanner *scanner) fetchNextToken() (tk *Token) {
|
||||
tk = scanner.moveOn(SymDoubleStar, ch, next)
|
||||
// } else if next == '/' {
|
||||
// tk = self.moveOn(SymClosedComment, ch, next)
|
||||
} else if next, _ = scanner.peek(); next == '=' {
|
||||
tk = scanner.moveOn(SymStarEqual, ch, next)
|
||||
} else {
|
||||
tk = scanner.makeToken(SymStar, ch)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user