From 436287bbe1b9ad84f8d6f198e25222467379b760 Mon Sep 17 00:00:00 2001
From: Vadym Slizov <vadym.slizov@miacar.ch>
Date: Mon, 18 May 2020 21:40:49 +0300
Subject: [PATCH] [refactoring] scanner DefaultConfig

---
 internal/scanner/lexer.go        |   2 ++
 internal/scanner/scanner.go      | Bin 383542 -> 384730 bytes
 internal/scanner/scanner_test.go |  60 +++++++++++++++----------------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/internal/scanner/lexer.go b/internal/scanner/lexer.go
index 4b242d3..8cfc2b3 100644
--- a/internal/scanner/lexer.go
+++ b/internal/scanner/lexer.go
@@ -20,6 +20,8 @@ type Config struct {
 	ErrHandlerFunc   func(*errors.Error)
 }
 
+var DefaultConfig = Config{}
+
 type Lexer struct {
 	data             []byte
 	phpVersion       string
diff --git a/internal/scanner/scanner.go b/internal/scanner/scanner.go
index 0a3ecd8d212164c15f9b4c3623b56b6c696f10cf..c4b5ae58209aa13baa797cba467c654341cf4d94 100644
GIT binary patch
delta 6643
zcmZu#d0bV+9{-GY4uav50h&u{a*sl0+zW_cnqbQ(3yYqnmhJV*9Tl}crMO^GKmrFF
zd)lI;WDrUhy(*w!x#!yQGEE~x#aAyCHI1S-zu%lQb2#_?bMMUew|{?gX6Bqtm0iBC
z>9S#!i-Z`fT(9!qg^S!qGChOyNZ$im_qlCCLW~(%x{>?ZWNX-S-b6JFGiv9J;!{>1
zPVPnfx%1Ouo)$vJ7<XodgKAo4U-<Lnx{Y@;M}oBAHZ8`uX~B3C_7yBhAuwLJNH?x8
z%of94@HZptwB|`_XGNHib;Z)lU6L<`Jm=TT_)z5FdE+3AG5+XmXZ(unDW>KqWAdBh
zzyYLn?o9=+e#?Y)qjwHe4Sq)%$8rGnd2(NdOhpC9^2`c!-?+DzyTDuWLETvJZ)$Wa
zoCE6lg|FQXaDA=Y@YHS)!^0q{s2hqU7o5<Iu+LY41ct{yUu_MGzxdD^PTVO`&#n(F
z^y)5&ZrhC>E;hK0tUYK3iHzKfLmu4Mao-3G$6M^1yZ;v)gG&AdYUCZL1eeJN5AnZc
zt4OqwbZ8|XGEWeRE<C&fhBs~{I=j?N!;HgcV~w1R9gK)0sbE!K8*StrSp&n0x@g~o
zqn*(=WMX`Ue(P&>W9ru>T!Z`8jihf3YuNNn4%i9KrfYGk&jOkWQW2mNUua>*@bBIP
zhzBwz92L;@x{GbSakxZ`iw(MwcPWge&!$6+uP==cit~a?#I@so;Y~MwI=&u;1t&`R
zpI9{oCrX0iV?Y^mOgs58Xn?<7rzEotr#=#>+bI7LsfQ|O*W=LBq#HwjDz+4~)24!M
z95@XOa%XNM?`Km%Hy&*;(eJnrgZ_2~I6}Ruvq&gsfpwfrf{nM&Vbj6IBaP^o_mRCn
zn?I@JPxkhuoZo6SlvTe>f_>4yEJpykefHPYvLofcRYM5T_-%YBsu%Oppuvi+yh~WC
zr)duuKyke;18c$nR#d{3=g=?6YOnf04fuNZ_f^*L>1!rmx)FUH2?gD2*G<p5vEvWu
z0D3o?C5w;$iS0=~$eY~qv2o(B&N8mRq|xnvORvp;ujN{t$1g>6H!CCrNMseIeC0mT
zhJaj5qFg8erdgAVKsvD0byh<Ov_MSW(&S`62cbB2Yg=Mg=Vs?@<MLnvjfGuj66l&c
z-YQq5zfC)`C<J7%=XLOSz3oCWW_n}eajkPK3K)He4GJS;!IGP>iZF7(vS8)mB-EUs
zDwKg*r4i%^2)KDF+uMbtnSzpGT}d0uf<HYv%jrfkEUUiV$!-|)4zi9tNQ;U4Jw3@?
z6s$0t?R{i6{-j$;rji8rQ<BB~NIzK``#y%?ZU_~O^^kXMQ9flmykv|OYDg@(A65=B
z!Ybn|Gq>LxPe#T_N!bfZ68%qt`xn?m!TN>gq6ho-MJpS(|B;tSx~kh$nI(d{{UwtL
z?zbXn*i`A76;36KAtv(p>@=AtJ3fuTNhbsa)0LoIx=m1<t^|oQ$RacSC^!t^3GK-u
zXIe={`ahUSZnkQ-)zK$Is<4$AWRug0)jt2AIV7=lk^Ff#i;VRD;}vpQd4~jyS7qz{
zx4lMAS<)DmG~c2ilKJP823cuirYh*!1>|QbFcvC7=pxc61u2V_plUI>UkcK)lwe;L
zkw-tfdx;G0uUkR}sFFNQ16fKof#Vofx&LT3+2Mi-EZ8l%s@8||$R?-;SNMRXy!XO_
z)h;EIZFqM!C0_<(jrpXTP1u9oQ$R+Wmj0RoQfIovSiRT|LrIg0WI$6I_l}a5y+cYg
z?ntb!#VcjVP4AHse0*T#^8INbd;dEU#yYJgH<;>CY~e?I^Lc4C(OV<OZ3u2wsl}vU
zYn8fUr%@dDW!HJoKG9jXHLb-u%d;UE<?l7lD6`foBUEWvt5gseSK<KnJAq*zJ2Wbs
zK;$~5AvWse>l|_0eWFw_?mQ=O!3GE?&-49Xa=;G*MF^e@Bg<Ng`6&>9#C+=1DGop)
z%9ReLmR;`1wb=<wTkp`QcLJj~I5c)UfusthA<nJx3Y7?}|BSD!KKw^AfJl)8k(^-W
zulQ^}QU6z;)5Fu13PGczmC6W#dp0US<gsO=vJuFDO-|&40Hm|urh~`y5<7zVU9%&2
zRh_)qW`)Sf03>aTQ|Ai@B6$(_-%t1@SQ3d&dsaD-`~bvNt#pu?+0`~?&`qOFMRajO
zjWQC*p#UUhn^R|_4Z%?Tw%bA>c`LRnBUEW$t5gtJ-~^g#)gh8oN47;+99Y}g6b`^{
z{l>s!#6R#@n+wNGjTkn{=Ym@SyIAGY{Re!mdfe*qtZm-pf;$0<*c`v>FPNaDcC(WB
zhiq}V@Yq68&Q>L2K~*kw*sQEViJwQx%jd4}#3+7{PPNAIsq{H(T$4)S)P!*Nq9O;<
z#R~{dxo$Xr<LJt^M`;~d%NZKPrl(SOPy*iDP^Io6YQ9mp*?SLDyg2gv-)OcxjRHgF
zCD4B)jTTwwTTF+zL5Xky9F!nlYOM=kDhnS&ktnXNv!XE+-o@}R=@6F?BTVpijyE7d
z(@kS-CWT|^VY8xCwtgH%YQdR5dOUpwkI?+WC{}i-b_Y8>fqvDh`d&}c%>eNHd-1%(
zS;$lLQ4W|jK#TYl>M44kJjsv(ZWh9tpQl}+qQR{z60}+xutJ2F+!yFA)^#$K{XS8Y
zfB|Mt5+d}yc^X{}8Nj)pIi1#6<3sa#%t`6A7=Zl3Xn(>CD(-#IOSY<(y8WFpsE$j<
znsp-V@RO8k33%(qF729Q?~=$ZaxRSxf=sb3V9dCy5LPyi_L8s+BV|1_b(_b0d5--p
zeFR2i(%ArDnLlLG6^enKSvCenETN}5fFj1euZUL2NzY{zUUr1!{4yj&Ozv1iLyVWM
zC9~3W8p)Cv9me&Ln$?Ul>v<E@u*?;-f_E#y6N^+}9FAGtAI)-B2J+Ill0N3(WofZ0
zQKZ2W3}K-k{a>cIc4Uypwtg`#Ph8R@d=#&-@icTT%~d=_l-hVIDy5%UJn3x8R=UBY
zMrSEi;!)%g_)9`Hg%@6MuCt5P6yF?S(d?>mF!O_{_HD?ljJUyxYMrd#5y(gT&mDXW
zWYv3Zg=4t>`>49CS&If0duYPHwaRohdcRE<t$9ts?C^f79-L>sw9}Dv#74*FBec$<
zgTHkANXwuaT;}iB2d4jLJ?#V=g5ccK!1pI>a=w99$;rMmv`|hKp0%kZoumJflI!Q_
zIyu?hXxj;QoDU4%`#<!&wTpPzkP8$(tBD6=^95R}^2)wU@%^3C;bxPr^Zoen*-#^@
zZXUaEg@($2>#m_BmOY(8yRwB>X`B>&f0b^Olgi&|E=;UWxEZ&^uUuAu&!jFl42O?M
zNi6>lI!(fTn{9<&Y{u0jIIR2AR(17XfmL^Fp{2p#i1*yXt_EqcYBsB_hMO@;<_0T?
z|8lU_gxeU3y53+DExSQ$u|!_Bv%Ll%4+M+J9kgU*k=&$3v$7kt7eT})I!o-V?J*}y
z&Hp6pl#A8G<B6+gN|<Il!i3*_VcH-S(i>q5SstNXwnFM`PdDvV8FFHGZK9l9>#pH3
ziOKBjp~3e((GUxn&N|(q;rAXyxHWuX#$!0v{62^Yw%ihsAe+!jI}Z*yTi(!kI5HCw
z#4g8?C~;(7?X6kY5jV@|qv016G#Dfd#5YJ~aOGB;!K}W*fUluZtT0mbgLQOkCn5HY
zah&E({WZ$E=-OO~RO*5S6p!d9Sg>>z3l=h+Jsu@kK!jUM76yS&q~QMOKnhBtB?Why
zRG5V)53tp-eSj?7)831>i-f`I3=>ohA851KHqci24|muqe=J5;9&Py6-OOTi?QXW+
zqrrQ&csg1<8hjNKlRU46=NPYSneB@&Fo$acpGIyWuV3CEuWe-(#Rpb>DPC6XVeJz%
z^<vE%mCAAxY=yKNtV(C0iB8>|M4N6%lC9|eLu^H_8G=RgLl$pTpFnkLW7$4bn*#`M
zle|q0XC=b|GuQ6Y9so^TZ&*3E4Pj3V*SfNryR^1a*2+05$b*6XcerqZ#lD`b3h>hu
O?L$UP;`biYrv49n_g@D9

delta 5531
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

diff --git a/internal/scanner/scanner_test.go b/internal/scanner/scanner_test.go
index 9199f1d..41a7092 100644
--- a/internal/scanner/scanner_test.go
+++ b/internal/scanner/scanner_test.go
@@ -353,7 +353,7 @@ func TestTokens(t *testing.T) {
 		T_UNSET_CAST.String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -381,7 +381,7 @@ func TestShebang(t *testing.T) {
 		"\n",
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -401,7 +401,7 @@ func TestShebangHtml(t *testing.T) {
 0.1
 `
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	tkn := lexer.Lex()
@@ -451,7 +451,7 @@ func TestNumberTokens(t *testing.T) {
 		T_DNUMBER.String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -508,7 +508,7 @@ func TestConstantStrings(t *testing.T) {
 		T_CONSTANT_ENCAPSED_STRING.String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -555,7 +555,7 @@ func TestSingleQuoteStringTokens(t *testing.T) {
 		T_CONSTANT_ENCAPSED_STRING.String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	actual := []string{}
 
 	for {
@@ -642,7 +642,7 @@ func TestTeplateStringTokens(t *testing.T) {
 		TokenID(int('"')).String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -727,7 +727,7 @@ func TestBackquoteStringTokens(t *testing.T) {
 		TokenID(int('`')).String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -821,7 +821,7 @@ CAT;
 		TokenID(int(';')).String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -894,7 +894,7 @@ CAT
 		T_END_HEREDOC.String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -933,7 +933,7 @@ CAT;
 		TokenID(int(';')).String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -964,7 +964,7 @@ func TestHereDocTokens73(t *testing.T) {
 		T_VARIABLE.String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -994,7 +994,7 @@ CAT;`
 		TokenID(int(';')).String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.phpVersion = "7.2"
 	lexer.withHiddenTokens = true
 	actual := []string{}
@@ -1027,7 +1027,7 @@ func TestInlineHtmlNopTokens(t *testing.T) {
 		T_INLINE_HTML.String(),
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 	actual := []string{}
 
@@ -1062,7 +1062,7 @@ func TestStringTokensAfterVariable(t *testing.T) {
 		"\"",
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	actual := []string{}
 	actualTokens := []string{}
 
@@ -1095,7 +1095,7 @@ func TestSlashAfterVariable(t *testing.T) {
 		"3",
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	actual := []string{}
 	actualTokens := []string{}
 
@@ -1132,7 +1132,7 @@ func TestCommentEnd(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	lexer.Lex()
@@ -1161,7 +1161,7 @@ func TestCommentNewLine(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	tkn := lexer.Lex()
@@ -1190,7 +1190,7 @@ func TestCommentNewLine1(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	tkn := lexer.Lex()
@@ -1219,7 +1219,7 @@ func TestCommentNewLine2(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	tkn := lexer.Lex()
@@ -1249,7 +1249,7 @@ func TestCommentWithPhpEndTag(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	tkn := lexer.Lex()
@@ -1279,7 +1279,7 @@ func TestInlineComment(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	tkn := lexer.Lex()
@@ -1309,7 +1309,7 @@ func TestInlineComment2(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	lexer.Lex()
@@ -1343,7 +1343,7 @@ func TestEmptyInlineComment(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	lexer.Lex()
@@ -1373,7 +1373,7 @@ func TestEmptyInlineComment2(t *testing.T) {
 		},
 	}
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	tkn := lexer.Lex()
@@ -1387,7 +1387,7 @@ func TestMethodCallTokens(t *testing.T) {
 	src := `<?php
 	$a -> bar ( '' ) ;`
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	expected := []token.Token{
@@ -1469,7 +1469,7 @@ func TestYieldFromTokens(t *testing.T) {
 	src := `<?php
 	yield from $a`
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 	lexer.withHiddenTokens = true
 
 	expected := []token.Token{
@@ -1500,7 +1500,7 @@ func TestYieldFromTokens(t *testing.T) {
 func TestVarNameByteChars(t *testing.T) {
 	src := "<?php $\x80 $\xff"
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 
 	tkn := lexer.Lex()
 	assert.Equal(t, "$\x80", string(tkn.Value))
@@ -1512,7 +1512,7 @@ func TestVarNameByteChars(t *testing.T) {
 func TestStringVarNameByteChars(t *testing.T) {
 	src := "<?php \"$\x80 $\xff\""
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 
 	tkn := lexer.Lex()
 	assert.Equal(t, "\"", string(tkn.Value))
@@ -1562,7 +1562,7 @@ func TestIgnoreControllCharacters(t *testing.T) {
 func TestIgnoreControllCharactersAtStringVarOffset(t *testing.T) {
 	src := "<?php \"$a[test\004]\";"
 
-	lexer := NewLexer([]byte(src), "7.4", Config{})
+	lexer := NewLexer([]byte(src), "7.4", DefaultConfig)
 
 	expected := "\""
 	tkn := lexer.Lex()