From 8a50bd254aee4e3e12e2d1cf07d7de4d4aefd070 Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Mon, 18 May 2020 00:23:02 +0300 Subject: [PATCH] [refactoring] remove scanner.Lexer.PhpDocComment --- internal/php7/php7.go | Bin 289200 -> 288939 bytes internal/php7/php7.y | 9 --------- internal/scanner/lexer.go | 11 ----------- internal/scanner/scanner.go | Bin 384855 -> 384773 bytes internal/scanner/scanner.rl | 3 +-- 5 files changed, 1 insertion(+), 22 deletions(-) diff --git a/internal/php7/php7.go b/internal/php7/php7.go index b26e86405145207dc3a1d4f2fb16940de9374be1..ff4af9bee78e4ed3a7cbc4d5294e27f6a990fac8 100644 GIT binary patch delta 7819 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 B85>pz))@% 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 method_modifiers variable_modifiers %type non_empty_member_modifiers name_list class_modifiers -%type backup_doc_comment - %% ///////////////////////////////////////////////////////////////////////// @@ -4234,12 +4231,6 @@ inline_function: backup_doc_comment: /* empty */ - { - $$ = yylex.(*Parser).Lexer.GetPhpDocComment() - yylex.(*Parser).Lexer.SetPhpDocComment("") - - yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) - } ; returns_ref: diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go index 2a24948..8a68d86 100644 --- a/internal/scanner/lexer.go +++ b/internal/scanner/lexer.go @@ -13,8 +13,6 @@ import ( type Scanner interface { Lex(lval Lval) int ReturnTokenToPool(t *Token) - GetPhpDocComment() string - SetPhpDocComment(string) GetErrors() []*errors.Error GetWithHiddenTokens() bool SetWithHiddenTokens(bool) @@ -38,7 +36,6 @@ type Lexer struct { TokenPool *TokenPool HiddenTokens []token.Token WithHiddenTokens bool - PhpDocComment string lastToken *Token Errors []*errors.Error NewLines NewLines @@ -49,14 +46,6 @@ func (l *Lexer) ReturnTokenToPool(t *Token) { 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 { return l.Errors } diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go index b1cf6d357285c1e1260ae109c2ebb4338a5edf21..185e7a9ed2c49c059ce57c538f422814fad73d2f 100644 GIT binary patch delta 2951 zcmZ`*c~F(t6`%8c=PJk^2s|Q&HK;7g<2`uqi7~We+~S5}m1v{2wGr!vT4O*|NE4H3 z8;D=vpkOdf(`aYh=GD2ADr-ee?4Ti0XAHq*YGV;Ki)KnFUA{pS`N?~|G@-rd+Wdayxk`Y5wewJ61@dtxUuDU zs`tj}MxbBVM1;}Y(EwRS*zs8J&X0S6O--QvO&DlgJyU8agkH|HIPz?vvE=M5W6ilp z`pY_uG8VQE_BNlZH4Tj*+g&W(cHRkDRV^^wyWspsno)fw!nk;Aj5Gyb7G(lvP^Y)Dh|e0Cqf{V#=>~He;DKg zxCe?Piwp#Z3`>Hk0^I7Ggt9yxyaF;U-5FW%oNRNzJaw6ggE=RFDyt!xc1?pI`JD$+ zHHzB;C|~rzj!|SUz+~xJ3Vs@6DXY*NRJ#G9005%}nUCNkx?HNZb-KYN(0Tnj@%1t^(3K@co2tmC+VtN*4UvS&Rk zR;EnjN{3h{M>cGLzbQy2fVvX!YFs}iQM?I$rD+Z`vk)1x^rJ(0 zxaI*?#VkxyhtiCUE@1?1@~1`Da4_AOg?ThB4-S{}Q&BkBTwAswMcxx=x zgYc)SQ6j|n`BoQwn2#-5c3<%~&cU_%y$WSwsN7V5??WF)7S6|Is%FgI@GZc0tZIfC zbh@4uU5jx9H-gM7#6YCw&*Q6{qTA17gY}7}j-^=2rJxjgkQ2h+7M*-WSZ2I^B8gUa zV>VrDL>qmz2Io@xIuot!e%}J<^|e?}Th?F_<+k8tidm0=G`9zBvT+?I>NIIBrc;xE zLyJfh&k9a}d;YUs7xSF${@e=L?yV6cT z`NdY82#{@2#8ix2|3_>aLPezzZG3S&px=>b+E;^1=<;@Uq<`{VJrhPgj~K+E_t2s3 z4ENZMA92)9^LF4$%Biuuog$sJxKgKZwnw=-jHS&lViYZG!vspL$DjR}U^v-#v9}q- z_}k=`12|o$g~TC?eHS;XuC03yU*McZ?B-ONR07@FjdM8XQ}(dLPOW>ePWA9T1Iu(- zu@6(Bx&)6YgJHqucvq!6L1l0gxto9R`8BFPg??2hAnE^7X{UY7xYD@PJDEai@d*n2 z2L@Q_+}ncB=v3JBpsO1m!kbK6kFkS1WY1zaD&L~yx|3XMRM?Iolzj>xrAON_pEJ3v z9UJ<&g%oufLuvmhT*~9hcAAsyQZ`1Tyz&XV$9>Jzm0)uXO_xt!!6-GR)LT{aOze~J|29_UWKbP(l6iAr_AWvM0FSdGbnIS6%$ zcsgPetpwvmO!e0oD*qZSj;JB1mZ1E@Q1P|SmBmwhK6S;j*-Nn^hxWz^9#L^(1#OHs zBW^u>$QLI{&G!k-R};T8UK9@`{i!KIj8W$wf+Igsv|6jqE+-|48-07`H_4*I{OgoO zBgAsxF6IH9L(wVXILC^i)lqPo1t^m~PG!->6pqv3bP?J=nP^d(D1}UZaiv<=o=g|T z577P;H;Tcrt%ra+G>XAl?;yEnG=sC2w_Sc<7iap3(+;sxtrG^AMt8GB2o+~BO1DD! zEY-WkV0tH;0j_f0!|QYj4?UI5k&W@(hu4_DC)JJ@4b~@?HasmhvA+igvx)TaB8of{#5q;WF?4eQhRB?WVmq<_ JXSziB{{W?VES>-W delta 3075 zcmZuzdr(%_5ud$x4;Hh?dDixTz#35@NuZ|puPr@DE&GPaG@eaybymCzLf@gA< zFJHJK-#*fAoch$}-uFo!!f>S(Zj`lzQrsV%Y?nAA$K=tKlr=54P$oQbu+Xy)w zZR|c_cP~7B7mT(G!PM#yql}u*i;Qb$CK~I`>}mm<$REOC(DSRJIReqih`t^K|*m5QtR!U83GSDes8x zqK7V+C099NnsUL1osuO@VA&3*x=G+K_oaYCqncbmy8Syq=}3X?v232z!)aYU_{kp@ z!2@-sSGDG(ven>2HTe)I)0RMh4vDlo3ZvxjmqVk+Nw}PwtKcLk6A5Hn1vdI(C45Z> zpJubSUV(>vNNq{pN(GCmaLKMNg3^hg^l1HTceU$ zIDjT(pudb*3omP$%cM0y9xH|-u!2Y+Ui^hRHb4)0YCW_n7m3pL2CVh)9!X7a!VR{2 za0A@)pq3Xm!WB(RVRNS;!iajuSN>-cWTAzx_yV)CdJBwJ$ufhyu@&w!|5yJAXS8AQ zDw~n=ssYn9E7WjGaWZ3tTOc3kTY{6+u!+qEy%Q*}mqVCW*V0dps)E0(;;C(e{?u{+ zykyuOc-KxDwfX>x{~iOWXfwo6&=(L#9b2H226ljt{7nA9UKrqjqQ<=TVM2XI3WHn2#~JG02#+F^Sep z#(HhIr>JtL;7Z+$oaRlzAu@V89_B{COfbm-GGrz$22O>lGD@F~LGtJ`Kg$ z|C*0KmrukfvjADN zR;RXAIGAdZL~pW};|SW7hc8iC0f*8RxeukS!YcYP&x)MVDsX@tm5L~Fgc*OG!qh6&rnX$fHiUqW=6oaUv6yN3S zcO9Os%gT-TysE#SMZ}^3a`0w6?nC)I9|>SLWmRH#ckX4(ZtTHXNTvllFy{Z0YKE3T zUORCGmF;*WKH~U%7!~qWJwE@6K{IB7gy4cdpXo~`*1V3Bqt~sRY?9a_5gCLNmLelTOwjn zpe%P|wGWLyrR8H8rd4qmyXur45~WGy9XN4&l*lVHVhsc-4q-?#uW5D_Sn7l zP%x{GDY&XO`Er{nHYuRP4Qx)dV?Q~w9$(O{oA{PdR_A3jUE)e_LP1lHW8AN7G{@%@B>Q_Mt58I5+qXQDcpA)Fj}E|2H*WgK1Zi2vheytgD_& zAkpa69LDWp8)db7ZW4Wa6La`nc01P5z3V1}Bh>sYp=~!=$F9L|>1`gzRD8?4_}pv5 z<>K#fwV;{}FjV&VFIMYDMp1-%XKX7J(Wy)b3V!lXUsZ|yY5zT(PG8^W ze$)CBcNTdc9aP!bg~s&&tJQ%_s;uOzz{)X{*QxBOaX&;oCl0F9s)42Q3&K}f*|hC} z$THsywCO&^{D~XP%!fE(+pA(dwLQQI=EFd34W$YY4PEWHOcRctT*@jUW8;zl`JJ!G z=30~){$h{D{PQKc422=PzP!YOT$f+v2G)uqQpi6CkoDw;W56VLT1HfmlX3r~rI@i-h7p7-g9!vm!~ znxQEcI4wNyCo-PMMA2+s zw?M;1FD46b%1&Ywo@cVJ0=ASkC5Z@&quk-l(ZJy*u%@n`DHN9?Qq`GXCd5X~DdHH1 z?94^tVH^;Bs~V@>B`=Q>OU<_<53&*R?R0TL{Xr+6 r6;IK>pAl18W$YMEv-z=6#Is_p6_u&;y`>)|uRkYt5VNxWOHukiG0jkj diff --git a/internal/scanner/scanner.rl b/internal/scanner/scanner.rl index 3379bef..d8efac1 100644 --- a/internal/scanner/scanner.rl +++ b/internal/scanner/scanner.rl @@ -336,7 +336,6 @@ func (lex *Lexer) Lex(lval Lval) int { } if isDocComment { - lex.PhpDocComment = string(lex.data[lex.ts:lex.te]) lex.addToken(T_DOC_COMMENT, lex.ts, lex.te) } else { 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.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_STRING; fbreak; };