Merge branch 'master' into dev

2018-07-24 22:24:32 +03:00
parent f89d7d3a17 623a90a418
commit 0138749c6d
10 changed files with 15348 additions and 15226 deletions
--- a/scanner/lexer.go
+++ b/scanner/lexer.go
@@ -108,7 +108,7 @@ func (l *Lexer) popState() {
 	l.StateStack = l.StateStack[:len-1]
 }

-func (l *Lexer) begin(state int) {
+func (l *Lexer) Begin(state int) {
 	len := len(l.StateStack)
 	l.StateStack = l.StateStack[:len-1]
 	l.StateStack = append(l.StateStack, state)