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

[refactoring] remove scanner.Lexer.PhpDocComment

Browse Source
This commit is contained in:
Vadym Slizov 2020-05-18 00:23:02 +03:00
parent 5620697cab
commit 8a50bd254a
5 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
internal/php7/php7.go
View File

Binary file not shown.

9
internal/php7/php7.y
View File

@ -16,7 +16,6 @@ import (
node ast.Vertex node ast.Vertex
token *scanner.Token token *scanner.Token
list []ast.Vertex list []ast.Vertex
str string
ClassExtends *ast.StmtClassExtends ClassExtends *ast.StmtClassExtends
ClassImplements *ast.StmtClassImplements ClassImplements *ast.StmtClassImplements
@ -285,8 +284,6 @@ import (
%type <list> method_modifiers variable_modifiers %type <list> method_modifiers variable_modifiers
%type <list> non_empty_member_modifiers name_list class_modifiers %type <list> non_empty_member_modifiers name_list class_modifiers
%type <str> backup_doc_comment
%% %%
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
@ -4234,12 +4231,6 @@ inline_function:
backup_doc_comment: backup_doc_comment:
/* empty */ /* empty */
{
$$ = yylex.(*Parser).Lexer.GetPhpDocComment()
yylex.(*Parser).Lexer.SetPhpDocComment("")
yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL)
}
; ;
returns_ref: returns_ref:

11
internal/scanner/lexer.go
View File

@ -13,8 +13,6 @@ import (
type Scanner interface { type Scanner interface {
Lex(lval Lval) int Lex(lval Lval) int
ReturnTokenToPool(t *Token) ReturnTokenToPool(t *Token)
GetPhpDocComment() string
SetPhpDocComment(string)
GetErrors() []*errors.Error GetErrors() []*errors.Error
GetWithHiddenTokens() bool GetWithHiddenTokens() bool
SetWithHiddenTokens(bool) SetWithHiddenTokens(bool)
@ -38,7 +36,6 @@ type Lexer struct {
TokenPool *TokenPool TokenPool *TokenPool
HiddenTokens []token.Token HiddenTokens []token.Token
WithHiddenTokens bool WithHiddenTokens bool
PhpDocComment string
lastToken *Token lastToken *Token
Errors []*errors.Error Errors []*errors.Error
NewLines NewLines NewLines NewLines
@ -49,14 +46,6 @@ func (l *Lexer) ReturnTokenToPool(t *Token) {
l.TokenPool.Put(t) l.TokenPool.Put(t)
} }
func (l *Lexer) GetPhpDocComment() string {
return l.PhpDocComment
}
func (l *Lexer) SetPhpDocComment(s string) {
l.PhpDocComment = s
}
func (l *Lexer) GetErrors() []*errors.Error { func (l *Lexer) GetErrors() []*errors.Error {
return l.Errors return l.Errors
} }

BIN
internal/scanner/scanner.go
View File

Binary file not shown.

3
internal/scanner/scanner.rl
View File

@ -336,7 +336,6 @@ func (lex *Lexer) Lex(lval Lval) int {
} }
if isDocComment { if isDocComment {
lex.PhpDocComment = string(lex.data[lex.ts:lex.te])
lex.addToken(T_DOC_COMMENT, lex.ts, lex.te) lex.addToken(T_DOC_COMMENT, lex.ts, lex.te)
} else { } else {
lex.addToken(T_COMMENT, lex.ts, lex.te) lex.addToken(T_COMMENT, lex.ts, lex.te)
@ -352,7 +351,7 @@ func (lex *Lexer) Lex(lval Lval) int {
}; };
"{" => { lex.setTokenPosition(token); tok = TokenID(int('{')); lex.call(ftargs, fentry(php)); goto _out; }; "{" => { lex.setTokenPosition(token); tok = TokenID(int('{')); lex.call(ftargs, fentry(php)); goto _out; };
"}" => { lex.setTokenPosition(token); tok = TokenID(int('}')); lex.ret(1); lex.PhpDocComment = ""; goto _out;}; "}" => { lex.setTokenPosition(token); tok = TokenID(int('}')); lex.ret(1); goto _out;};
"$" varname => { lex.setTokenPosition(token); tok = T_VARIABLE; fbreak; }; "$" varname => { lex.setTokenPosition(token); tok = T_VARIABLE; fbreak; };
varname => { lex.setTokenPosition(token); tok = T_STRING; fbreak; }; varname => { lex.setTokenPosition(token); tok = T_STRING; fbreak; };