maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename lastToken to currentToken

Browse Source
This commit is contained in:
z7zmey 2018-04-15 23:04:24 +03:00
parent 435dc5c706
commit a28fd2e8ec
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
php5/parser.go
View File

@ -18,7 +18,7 @@ func (lval *yySymType) Token(t *scanner.Token) {
type Parser struct { type Parser struct {
*scanner.Lexer *scanner.Lexer
path string path string
lastToken *scanner.Token currentToken *scanner.Token
positionBuilder *parser.PositionBuilder positionBuilder *parser.PositionBuilder
errors []*errors.Error errors []*errors.Error
rootNode node.Node rootNode node.Node
@ -45,12 +45,12 @@ func NewParser(src io.Reader, path string) *Parser {
// Lex proxy to lexer Lex // Lex proxy to lexer Lex
func (l *Parser) Lex(lval *yySymType) int { func (l *Parser) Lex(lval *yySymType) int {
t := l.Lexer.Lex(lval) t := l.Lexer.Lex(lval)
l.lastToken = lval.token l.currentToken = lval.token
return t return t
} }
func (l *Parser) Error(msg string) { func (l *Parser) Error(msg string) {
l.errors = append(l.errors, errors.NewError(msg, l.lastToken)) l.errors = append(l.errors, errors.NewError(msg, l.currentToken))
} }
// Parse the php7 Parser entrypoint // Parse the php7 Parser entrypoint

6
php7/parser.go
View File

@ -18,7 +18,7 @@ func (lval *yySymType) Token(t *scanner.Token) {
type Parser struct { type Parser struct {
*scanner.Lexer *scanner.Lexer
path string path string
lastToken *scanner.Token currentToken *scanner.Token
positionBuilder *parser.PositionBuilder positionBuilder *parser.PositionBuilder
errors []*errors.Error errors []*errors.Error
rootNode node.Node rootNode node.Node
@ -45,12 +45,12 @@ func NewParser(src io.Reader, path string) *Parser {
// Lex proxy to lexer Lex // Lex proxy to lexer Lex
func (l *Parser) Lex(lval *yySymType) int { func (l *Parser) Lex(lval *yySymType) int {
t := l.Lexer.Lex(lval) t := l.Lexer.Lex(lval)
l.lastToken = lval.token l.currentToken = lval.token
return t return t
} }
func (l *Parser) Error(msg string) { func (l *Parser) Error(msg string) {
l.errors = append(l.errors, errors.NewError(msg, l.lastToken)) l.errors = append(l.errors, errors.NewError(msg, l.currentToken))
} }
// Parse the php7 Parser entrypoint // Parse the php7 Parser entrypoint