OpenSourceProjects
/
go-parsekit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use pointers instead of values, since we're updating the structs.

This commit is contained in:
Maurice Makaay 2019-07-20 11:50:36 +00:00
parent 7998d05113
commit acdf83332b
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tokenize/api.go
View File

@ -72,8 +72,8 @@ type API struct {
stackFrames []stackFrame // the stack frames, containing stack level-specific data stackFrames []stackFrame // the stack frames, containing stack level-specific data
stackLevel int // the current stack level stackLevel int // the current stack level
stackFrame *stackFrame // the current stack frame stackFrame *stackFrame // the current stack frame
Input Input // provides input-related functionality Input *Input // provides input-related functionality
Output Output // provides output-related functionality Output *Output // provides output-related functionality
} }
type stackFrame struct { type stackFrame struct {
@ -100,11 +100,11 @@ func NewAPI(input interface{}) *API {
api := &API{ api := &API{
stackFrames: make([]stackFrame, initialStackDepth), stackFrames: make([]stackFrame, initialStackDepth),
} }
api.Input = Input{ api.Input = &Input{
api: api, api: api,
reader: read.New(input), reader: read.New(input),
} }
api.Output = Output{ api.Output = &Output{
api: api, api: api,
data: make([]byte, initialByteStoreLength), data: make([]byte, initialByteStoreLength),
tokens: make([]Token, initialTokenStoreLength), tokens: make([]Token, initialTokenStoreLength),

26
tokenize/api_input.go
View File

@ -16,7 +16,7 @@ type Input struct {
// Reset moves the input cursor back to the beginning for the currently active API child. // Reset moves the input cursor back to the beginning for the currently active API child.
// Aditionally, any output (bytes and tokens) that was emitted from the API child are // Aditionally, any output (bytes and tokens) that was emitted from the API child are
// cleared as well. // cleared as well.
func (i Input) Reset() { func (i *Input) Reset() {
if i.api.stackLevel == 0 { if i.api.stackLevel == 0 {
i.api.stackFrame.column = 0 i.api.stackFrame.column = 0
i.api.stackFrame.line = 0 i.api.stackFrame.line = 0
@ -32,7 +32,7 @@ func (i Input) Reset() {
i.api.stackFrame.err = nil i.api.stackFrame.err = nil
} }
func (i Input) Cursor() string { func (i *Input) Cursor() string {
if i.api.stackFrame.line == 0 && i.api.stackFrame.column == 0 { if i.api.stackFrame.line == 0 && i.api.stackFrame.column == 0 {
return fmt.Sprintf("start of file") return fmt.Sprintf("start of file")
} }
@ -44,7 +44,7 @@ func (i Input) Cursor() string {
// When an error occurs during reading the input, an error will be returned. // When an error occurs during reading the input, an error will be returned.
// When an offset is requested that is beyond the length of the available input // When an offset is requested that is beyond the length of the available input
// data, then the error will be io.EOF. // data, then the error will be io.EOF.
func (i Input) PeekByte(offset int) (byte, error) { func (i *Input) PeekByte(offset int) (byte, error) {
return i.reader.ByteAt(i.api.stackFrame.offset + offset) return i.reader.ByteAt(i.api.stackFrame.offset + offset)
} }
@ -58,7 +58,7 @@ func (i Input) PeekByte(offset int) (byte, error) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the skipped byte. // the first byte after the skipped byte.
func (i Input) SkipByte(b byte) { func (i *Input) SkipByte(b byte) {
i.api.stackFrame.moveCursorByByte(b) i.api.stackFrame.moveCursorByByte(b)
i.api.stackFrame.offset++ i.api.stackFrame.offset++
} }
@ -73,7 +73,7 @@ func (i Input) SkipByte(b byte) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the skipped bytes. // the first byte after the skipped bytes.
func (i Input) SkipBytes(bytes ...byte) { func (i *Input) SkipBytes(bytes ...byte) {
for _, b := range bytes { for _, b := range bytes {
i.api.stackFrame.moveCursorByByte(b) i.api.stackFrame.moveCursorByByte(b)
i.api.stackFrame.offset++ i.api.stackFrame.offset++
@ -91,7 +91,7 @@ func (i Input) SkipBytes(bytes ...byte) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the accepted byte. // the first byte after the accepted byte.
func (i Input) AcceptByte(b byte) { func (i *Input) AcceptByte(b byte) {
curBytesEnd := i.api.stackFrame.bytesEnd curBytesEnd := i.api.stackFrame.bytesEnd
maxRequiredBytes := curBytesEnd + 1 maxRequiredBytes := curBytesEnd + 1
@ -119,7 +119,7 @@ func (i Input) AcceptByte(b byte) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the accepted bytes. // the first byte after the accepted bytes.
func (i Input) AcceptBytes(bytes ...byte) { func (i *Input) AcceptBytes(bytes ...byte) {
curBytesEnd := i.api.stackFrame.bytesEnd curBytesEnd := i.api.stackFrame.bytesEnd
newBytesEnd := curBytesEnd + len(bytes) newBytesEnd := curBytesEnd + len(bytes)
@ -151,7 +151,7 @@ func (i Input) AcceptBytes(bytes ...byte) {
// When an error occurs during reading the input, an error will be returned. // When an error occurs during reading the input, an error will be returned.
// When an offset is requested that is beyond the length of the available input // When an offset is requested that is beyond the length of the available input
// data, then the error will be io.EOF. // data, then the error will be io.EOF.
func (i Input) PeekRune(offset int) (rune, int, error) { func (i *Input) PeekRune(offset int) (rune, int, error) {
return i.reader.RuneAt(i.api.stackFrame.offset + offset) return i.reader.RuneAt(i.api.stackFrame.offset + offset)
} }
@ -165,7 +165,7 @@ func (i Input) PeekRune(offset int) (rune, int, error) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the skipped rune. // the first byte after the skipped rune.
func (i Input) SkipRune(r rune) { func (i *Input) SkipRune(r rune) {
i.api.stackFrame.moveCursorByRune(r) i.api.stackFrame.moveCursorByRune(r)
i.api.stackFrame.offset += utf8.RuneLen(r) i.api.stackFrame.offset += utf8.RuneLen(r)
} }
@ -180,7 +180,7 @@ func (i Input) SkipRune(r rune) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the skipped runes. // the first byte after the skipped runes.
func (i Input) SkipRunes(runes ...rune) { func (i *Input) SkipRunes(runes ...rune) {
for _, r := range runes { for _, r := range runes {
i.api.stackFrame.moveCursorByRune(r) i.api.stackFrame.moveCursorByRune(r)
i.api.stackFrame.offset += utf8.RuneLen(r) i.api.stackFrame.offset += utf8.RuneLen(r)
@ -198,7 +198,7 @@ func (i Input) SkipRunes(runes ...rune) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the accepted rune. // the first byte after the accepted rune.
func (i Input) AcceptRune(r rune) { func (i *Input) AcceptRune(r rune) {
curBytesEnd := i.api.stackFrame.bytesEnd curBytesEnd := i.api.stackFrame.bytesEnd
maxRequiredBytes := curBytesEnd + utf8.UTFMax maxRequiredBytes := curBytesEnd + utf8.UTFMax
@ -226,7 +226,7 @@ func (i Input) AcceptRune(r rune) {
// //
// After the call, byte offset 0 for PeekByte() and PeekRune() will point at // After the call, byte offset 0 for PeekByte() and PeekRune() will point at
// the first byte after the accepted runes. // the first byte after the accepted runes.
func (i Input) AcceptRunes(runes ...rune) { func (i *Input) AcceptRunes(runes ...rune) {
runesAsString := string(runes) runesAsString := string(runes)
byteLen := len(runesAsString) byteLen := len(runesAsString)
curBytesEnd := i.api.stackFrame.bytesEnd curBytesEnd := i.api.stackFrame.bytesEnd
@ -254,7 +254,7 @@ func (i Input) AcceptRunes(runes ...rune) {
// Note: // Note:
// When writing your own TokenHandler, you normally won't have to call this // When writing your own TokenHandler, you normally won't have to call this
// method yourself. It is automatically called by parsekit when possible. // method yourself. It is automatically called by parsekit when possible.
func (i Input) Flush() bool { func (i *Input) Flush() bool {
if i.api.stackFrame.offset > 0 { if i.api.stackFrame.offset > 0 {
i.reader.Flush(i.api.stackFrame.offset) i.reader.Flush(i.api.stackFrame.offset)
i.api.stackFrame.offset = 0 i.api.stackFrame.offset = 0

31
tokenize/api_output.go
View File

@ -11,31 +11,31 @@ type Output struct {
data []byte // accepted data data []byte // accepted data
} }
func (o Output) String() string { func (o *Output) String() string {
bytes := o.data[o.api.stackFrame.bytesStart:o.api.stackFrame.bytesEnd] bytes := o.data[o.api.stackFrame.bytesStart:o.api.stackFrame.bytesEnd]
return string(bytes) return string(bytes)
} }
func (o Output) Runes() []rune { func (o *Output) Runes() []rune {
bytes := o.data[o.api.stackFrame.bytesStart:o.api.stackFrame.bytesEnd] bytes := o.data[o.api.stackFrame.bytesStart:o.api.stackFrame.bytesEnd]
return []rune(string(bytes)) return []rune(string(bytes))
} }
func (o Output) Rune(offset int) rune { func (o *Output) Rune(offset int) rune {
r, _ := utf8.DecodeRune(o.data[o.api.stackFrame.bytesStart+offset:]) r, _ := utf8.DecodeRune(o.data[o.api.stackFrame.bytesStart+offset:])
return r return r
} }
func (o Output) ClearData() { func (o *Output) ClearData() {
o.api.stackFrame.bytesEnd = o.api.stackFrame.bytesStart o.api.stackFrame.bytesEnd = o.api.stackFrame.bytesStart
} }
func (o Output) SetBytes(bytes ...byte) { func (o *Output) SetBytes(bytes ...byte) {
o.ClearData() o.ClearData()
o.AddBytes(bytes...) o.AddBytes(bytes...)
} }
func (o Output) AddBytes(bytes ...byte) { func (o *Output) AddBytes(bytes ...byte) {
// Grow the runes capacity when needed. // Grow the runes capacity when needed.
newBytesEnd := o.api.stackFrame.bytesEnd + len(bytes) newBytesEnd := o.api.stackFrame.bytesEnd + len(bytes)
if cap(o.data) < newBytesEnd { if cap(o.data) < newBytesEnd {
@ -53,7 +53,7 @@ func (o Output) SetRunes(runes ...rune) {
o.AddRunes(runes...) o.AddRunes(runes...)
} }
func (o Output) AddRunes(runes ...rune) { func (o *Output) AddRunes(runes ...rune) {
// Grow the runes capacity when needed. // Grow the runes capacity when needed.
runesAsString := string(runes) runesAsString := string(runes)
newBytesEnd := o.api.stackFrame.bytesEnd + len(runesAsString) newBytesEnd := o.api.stackFrame.bytesEnd + len(runesAsString)
@ -67,37 +67,37 @@ func (o Output) AddRunes(runes ...rune) {
o.api.stackFrame.bytesEnd = newBytesEnd o.api.stackFrame.bytesEnd = newBytesEnd
} }
func (o Output) AddString(s string) { func (o *Output) AddString(s string) {
o.AddBytes([]byte(s)...) o.AddBytes([]byte(s)...)
} }
func (o Output) SetString(s string) { func (o *Output) SetString(s string) {
o.ClearData() o.ClearData()
o.SetBytes([]byte(s)...) o.SetBytes([]byte(s)...)
} }
func (o Output) Tokens() []Token { func (o *Output) Tokens() []Token {
return o.tokens[o.api.stackFrame.tokenStart:o.api.stackFrame.tokenEnd] return o.tokens[o.api.stackFrame.tokenStart:o.api.stackFrame.tokenEnd]
} }
func (o Output) Token(offset int) Token { func (o *Output) Token(offset int) Token {
return o.tokens[o.api.stackFrame.tokenStart+offset] return o.tokens[o.api.stackFrame.tokenStart+offset]
} }
func (o Output) TokenValue(offset int) interface{} { func (o *Output) TokenValue(offset int) interface{} {
return o.tokens[o.api.stackFrame.tokenStart+offset].Value return o.tokens[o.api.stackFrame.tokenStart+offset].Value
} }
func (o Output) ClearTokens() { func (o *Output) ClearTokens() {
o.api.stackFrame.tokenEnd = o.api.stackFrame.tokenStart o.api.stackFrame.tokenEnd = o.api.stackFrame.tokenStart
} }
func (o Output) SetTokens(tokens ...Token) { func (o *Output) SetTokens(tokens ...Token) {
o.ClearTokens() o.ClearTokens()
o.AddTokens(tokens...) o.AddTokens(tokens...)
} }
func (o Output) AddTokens(tokens ...Token) { func (o *Output) AddTokens(tokens ...Token) {
// Grow the tokens capacity when needed. // Grow the tokens capacity when needed.
newTokenEnd := o.api.stackFrame.tokenEnd + len(tokens) newTokenEnd := o.api.stackFrame.tokenEnd + len(tokens)
if cap(o.tokens) < newTokenEnd { if cap(o.tokens) < newTokenEnd {
@ -105,7 +105,6 @@ func (o Output) AddTokens(tokens ...Token) {
copy(newTokens, o.tokens) copy(newTokens, o.tokens)
o.tokens = newTokens o.tokens = newTokens
} }
for offset, t := range tokens { for offset, t := range tokens {
o.tokens[o.api.stackFrame.tokenEnd+offset] = t o.tokens[o.api.stackFrame.tokenEnd+offset] = t
} }