diff --git a/internal/php7/php7.go b/internal/php7/php7.go index b26e864..ff4af9b 100644 --- a/internal/php7/php7.go +++ b/internal/php7/php7.go @@ -22,7 +22,6 @@ type yySymType struct { node ast.Vertex token *scanner.Token list []ast.Vertex - str string ClassExtends *ast.StmtClassExtends ClassImplements *ast.StmtClassImplements @@ -346,7 +345,7 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -// line internal/php7/php7.y:5671 +// line internal/php7/php7.y:5662 // line yacctab:1 var yyExca = [...]int{ @@ -1435,11 +1434,11 @@ var yyPgo = [...]int{ 9, 762, 20, 553, 868, 18, 867, 864, 862, 88, 860, 36, 858, 855, 25, 33, 854, 853, 45, 848, 846, 554, 845, 844, 839, 34, 837, 80, 1, 3, - 832, 17, 831, 821, 803, 7, 767, 28, 752, + 832, 17, 831, 821, 803, 7, 767, 752, 28, } var yyR1 = [...]int{ - 0, 128, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 127, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, @@ -1476,7 +1475,7 @@ var yyR1 = [...]int{ 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 85, 85, 127, 3, 3, 89, 89, + 32, 32, 32, 85, 85, 128, 3, 3, 89, 89, 112, 112, 51, 51, 52, 52, 52, 52, 45, 45, 46, 46, 49, 49, 94, 94, 94, 78, 78, 56, 56, 56, 50, 50, 50, 50, 50, 50, 50, 50, @@ -1545,7 +1544,7 @@ var yyR2 = [...]int{ } var yyChk = [...]int{ - -1000, -128, -117, -9, 2, -11, -12, -13, -14, -15, + -1000, -127, -117, -9, 2, -11, -12, -13, -14, -15, 52, 80, 45, 39, 144, -65, -66, 21, 20, 23, 30, 34, 35, 40, 47, 99, 19, 14, -23, 49, 25, 27, 146, 41, 44, 36, 10, 37, -126, 53, @@ -1583,7 +1582,7 @@ var yyChk = [...]int{ -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -46, -23, 147, -23, -110, -27, -28, -23, -99, -118, 146, 146, 10, - -127, 10, -86, 56, -127, -88, 56, 148, -11, 148, + -128, 10, -86, 56, -128, -88, 56, 148, -11, 148, 146, 147, -23, 153, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -23, -24, -23, -54, 10, 144, -47, -115, 151, 160, 59, -28, -23, @@ -1602,42 +1601,42 @@ var yyChk = [...]int{ -31, -23, 84, -115, 10, 146, -117, 145, 146, 146, 83, -95, -19, 83, -95, 144, 10, 83, -21, -23, 148, 149, 148, 146, 160, 149, -33, -34, -23, -42, - 147, -23, -7, 160, 29, 149, 145, -127, 148, -86, - -87, 57, -10, 144, -127, -125, -10, -23, -23, -118, + 147, -23, -7, 160, 29, 149, 145, -128, 148, -86, + -87, 57, -10, 144, -128, -125, -10, -23, -23, -118, -23, 149, 151, 145, -77, -23, 149, 162, -71, -23, 153, 60, -115, 149, 151, 149, -64, 10, 13, 154, 12, 10, 145, 145, 150, 145, -23, 151, -77, -23, -77, -47, -24, -23, -54, -47, -86, -7, 160, 149, 149, -119, -120, -29, -30, -75, -73, 152, 61, 62, -10, 145, -7, 160, -23, 149, 145, 144, 83, -105, - -17, -20, -91, 144, -127, 149, -84, -11, 147, -23, + -17, -20, -91, 144, -128, 149, -84, -11, 147, -23, -101, -23, -80, 144, 147, -23, 149, -27, -92, -28, 153, 60, 150, -25, -11, 147, -97, 148, -119, -87, - -127, -125, -121, 144, 160, 149, 149, 96, -11, 147, + -128, -125, -121, 144, 160, 149, 149, 96, -11, 147, 145, 162, -23, -28, 148, 149, 151, 13, -23, 145, 151, 145, -87, 149, -72, 149, 160, -1, 153, -73, 149, -31, -104, -20, 144, -7, 160, -20, -105, 146, -118, 149, 146, -108, 146, -108, 146, 146, 149, 59, - -28, 148, -115, -118, -26, 42, 43, -119, 149, -127, + -28, 148, -115, -118, -26, 42, 43, -119, 149, -128, 144, 145, -35, -123, -122, 45, -124, 48, -90, 104, 103, 102, 99, 100, 101, -121, -10, -11, 147, 146, - -118, -23, -115, 151, -127, -74, 147, -29, -2, 84, + -118, -23, -115, 151, -128, -74, 147, -29, -2, 84, -7, 160, -104, 145, -17, -7, 22, 146, -101, 145, 32, 33, -108, 31, -108, -82, -11, 147, -92, -28, -115, 151, 28, 148, 144, 149, -89, 45, 144, -121, -30, 39, 37, -125, -90, 145, -118, 149, 145, 144, - -127, -75, 12, 145, -20, -7, 145, 146, 149, -23, + -128, -75, 12, 145, -20, -7, 145, 146, 149, -23, -8, 147, 146, 145, 146, 31, -118, 149, 149, 146, -96, -10, -118, -74, -74, 148, -121, 145, -106, -41, 12, -98, -68, -6, -3, -79, 146, 144, -121, 59, 162, 145, -83, -11, 147, -8, -118, 146, 26, -82, 12, 161, 145, 144, 144, -112, -51, 12, 153, 145, - 146, 160, -127, 162, 146, 160, 162, -6, 145, -109, + 146, 160, -128, 162, 146, 160, 162, -6, 145, -109, -36, -37, -38, -39, -40, -10, -6, 80, 10, 145, -23, -23, -118, -118, 146, 149, -10, -118, -118, 149, - 160, 12, -41, -23, -68, -23, -127, 145, -36, 146, - 146, 46, 29, 79, 24, 144, 145, 145, -51, -127, - -127, 148, -125, 10, -4, -90, -6, 146, -118, -119, + 160, 12, -41, -23, -68, -23, -128, 145, -36, 146, + 146, 46, 29, 79, 24, 144, 145, 145, -51, -128, + -128, 148, -125, 10, -4, -90, -6, 146, -118, -119, -6, 145, 149, -74, -81, 146, 144, -118, 145, } var yyDef = [...]int{ @@ -2113,7 +2112,7 @@ yydefault: case 1: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:296 + // line internal/php7/php7.y:293 { yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, yyDollar[1].list} @@ -2126,469 +2125,469 @@ yydefault: } case 2: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 3: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 4: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 5: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 6: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 7: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 8: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 9: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:309 + // line internal/php7/php7.y:306 { yyVAL.token = yyDollar[1].token } case 10: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 11: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 12: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 13: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 14: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 15: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 16: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 17: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 18: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 19: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 20: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 21: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:310 + // line internal/php7/php7.y:307 { yyVAL.token = yyDollar[1].token } case 22: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 23: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 24: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 25: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 26: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 27: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 28: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 29: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 30: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 31: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:311 + // line internal/php7/php7.y:308 { yyVAL.token = yyDollar[1].token } case 32: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 33: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 34: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 35: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 36: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 37: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 38: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 39: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 40: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 41: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:312 + // line internal/php7/php7.y:309 { yyVAL.token = yyDollar[1].token } case 42: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 43: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 44: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 45: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 46: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 47: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 48: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 49: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 50: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 51: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 52: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:313 + // line internal/php7/php7.y:310 { yyVAL.token = yyDollar[1].token } case 53: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 54: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 55: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 56: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 57: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 58: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 59: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 60: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:314 + // line internal/php7/php7.y:311 { yyVAL.token = yyDollar[1].token } case 61: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 62: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 63: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 64: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 65: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 66: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 67: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 68: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 69: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:315 + // line internal/php7/php7.y:312 { yyVAL.token = yyDollar[1].token } case 70: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:320 + // line internal/php7/php7.y:317 { yyVAL.token = yyDollar[1].token } case 71: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:323 + // line internal/php7/php7.y:320 { yyVAL.token = yyDollar[1].token } case 72: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:323 + // line internal/php7/php7.y:320 { yyVAL.token = yyDollar[1].token } case 73: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:323 + // line internal/php7/php7.y:320 { yyVAL.token = yyDollar[1].token } case 74: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:323 + // line internal/php7/php7.y:320 { yyVAL.token = yyDollar[1].token } case 75: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:323 + // line internal/php7/php7.y:320 { yyVAL.token = yyDollar[1].token } case 76: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:323 + // line internal/php7/php7.y:320 { yyVAL.token = yyDollar[1].token } case 77: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:328 + // line internal/php7/php7.y:325 { yyVAL.token = yyDollar[1].token } case 78: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:332 + // line internal/php7/php7.y:329 { yyVAL.token = yyDollar[1].token } case 79: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:339 + // line internal/php7/php7.y:336 { if inlineHtmlNode, ok := yyDollar[2].node.(*ast.StmtInlineHtml); ok && len(yyDollar[1].list) > 0 { prevNode := lastNode(yyDollar[1].list) @@ -2603,7 +2602,7 @@ yydefault: } case 80: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:352 + // line internal/php7/php7.y:349 { yyVAL.list = []ast.Vertex{} @@ -2611,7 +2610,7 @@ yydefault: } case 81: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:361 + // line internal/php7/php7.y:358 { namePart := &ast.NameNamePart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{namePart} @@ -2626,7 +2625,7 @@ yydefault: } case 82: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:374 + // line internal/php7/php7.y:371 { namePart := &ast.NameNamePart{ast.Node{}, yyDollar[3].token.Value} yyVAL.list = append(yyDollar[1].list, namePart) @@ -2642,7 +2641,7 @@ yydefault: } case 83: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:391 + // line internal/php7/php7.y:388 { yyVAL.node = &ast.NameName{ast.Node{}, yyDollar[1].list} @@ -2656,7 +2655,7 @@ yydefault: } case 84: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:403 + // line internal/php7/php7.y:400 { yyVAL.node = &ast.NameRelative{ast.Node{}, yyDollar[3].list} @@ -2671,7 +2670,7 @@ yydefault: } case 85: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:416 + // line internal/php7/php7.y:413 { yyVAL.node = &ast.NameFullyQualified{ast.Node{}, yyDollar[2].list} @@ -2685,7 +2684,7 @@ yydefault: } case 86: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:431 + // line internal/php7/php7.y:428 { // error yyVAL.node = nil @@ -2694,7 +2693,7 @@ yydefault: } case 87: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:438 + // line internal/php7/php7.y:435 { yyVAL.node = yyDollar[1].node @@ -2702,7 +2701,7 @@ yydefault: } case 88: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:444 + // line internal/php7/php7.y:441 { yyVAL.node = yyDollar[1].node @@ -2710,7 +2709,7 @@ yydefault: } case 89: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:450 + // line internal/php7/php7.y:447 { yyVAL.node = yyDollar[1].node @@ -2718,7 +2717,7 @@ yydefault: } case 90: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:456 + // line internal/php7/php7.y:453 { yyVAL.node = yyDollar[1].node @@ -2726,7 +2725,7 @@ yydefault: } case 91: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:462 + // line internal/php7/php7.y:459 { yyVAL.node = yyDollar[1].node @@ -2734,7 +2733,7 @@ yydefault: } case 92: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:468 + // line internal/php7/php7.y:465 { yyVAL.node = &ast.StmtHaltCompiler{ast.Node{}} @@ -2752,7 +2751,7 @@ yydefault: } case 93: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:484 + // line internal/php7/php7.y:481 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtNamespace{ast.Node{}, name, nil} @@ -2771,7 +2770,7 @@ yydefault: } case 94: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:501 + // line internal/php7/php7.y:498 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtNamespace{ast.Node{}, name, yyDollar[4].list} @@ -2790,7 +2789,7 @@ yydefault: } case 95: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:518 + // line internal/php7/php7.y:515 { yyVAL.node = &ast.StmtNamespace{ast.Node{}, nil, yyDollar[3].list} @@ -2806,7 +2805,7 @@ yydefault: } case 96: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:532 + // line internal/php7/php7.y:529 { yyVAL.node = yyDollar[2].node @@ -2822,7 +2821,7 @@ yydefault: } case 97: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:546 + // line internal/php7/php7.y:543 { yyDollar[3].node.(*ast.StmtGroupUse).UseType = yyDollar[2].node yyVAL.node = yyDollar[3].node @@ -2839,7 +2838,7 @@ yydefault: } case 98: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:561 + // line internal/php7/php7.y:558 { yyVAL.node = &ast.StmtUseList{ast.Node{}, nil, yyDollar[2].list} @@ -2855,7 +2854,7 @@ yydefault: } case 99: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:575 + // line internal/php7/php7.y:572 { yyVAL.node = &ast.StmtUseList{ast.Node{}, yyDollar[2].node, yyDollar[3].list} @@ -2871,7 +2870,7 @@ yydefault: } case 100: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:589 + // line internal/php7/php7.y:586 { yyVAL.node = &ast.StmtConstList{ast.Node{}, yyDollar[2].list} @@ -2887,7 +2886,7 @@ yydefault: } case 101: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:606 + // line internal/php7/php7.y:603 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -2901,7 +2900,7 @@ yydefault: } case 102: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:618 + // line internal/php7/php7.y:615 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -2915,7 +2914,7 @@ yydefault: } case 103: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:633 + // line internal/php7/php7.y:630 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[4].list} @@ -2938,7 +2937,7 @@ yydefault: } case 104: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:654 + // line internal/php7/php7.y:651 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[5].list} @@ -2962,7 +2961,7 @@ yydefault: } case 105: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:679 + // line internal/php7/php7.y:676 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[4].list} @@ -2985,7 +2984,7 @@ yydefault: } case 106: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:700 + // line internal/php7/php7.y:697 { name := &ast.NameName{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtGroupUse{ast.Node{}, nil, name, yyDollar[5].list} @@ -3009,19 +3008,19 @@ yydefault: } case 107: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:725 + // line internal/php7/php7.y:722 { yyVAL.token = nil } case 108: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:729 + // line internal/php7/php7.y:726 { yyVAL.token = yyDollar[1].token } case 109: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:736 + // line internal/php7/php7.y:733 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3032,7 +3031,7 @@ yydefault: } case 110: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:745 + // line internal/php7/php7.y:742 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3040,7 +3039,7 @@ yydefault: } case 111: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:754 + // line internal/php7/php7.y:751 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3051,7 +3050,7 @@ yydefault: } case 112: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:763 + // line internal/php7/php7.y:760 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3059,7 +3058,7 @@ yydefault: } case 113: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:772 + // line internal/php7/php7.y:769 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3070,7 +3069,7 @@ yydefault: } case 114: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:781 + // line internal/php7/php7.y:778 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3078,7 +3077,7 @@ yydefault: } case 115: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:790 + // line internal/php7/php7.y:787 { yyVAL.node = yyDollar[1].node @@ -3086,7 +3085,7 @@ yydefault: } case 116: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:796 + // line internal/php7/php7.y:793 { yyDollar[2].node.(*ast.StmtUse).UseType = yyDollar[1].node yyVAL.node = yyDollar[2].node @@ -3095,7 +3094,7 @@ yydefault: } case 117: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:806 + // line internal/php7/php7.y:803 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} yyVAL.node = &ast.StmtUse{ast.Node{}, nil, name, nil} @@ -3111,7 +3110,7 @@ yydefault: } case 118: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:820 + // line internal/php7/php7.y:817 { name := &ast.NameName{ast.Node{}, yyDollar[1].list} alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} @@ -3131,7 +3130,7 @@ yydefault: } case 119: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:841 + // line internal/php7/php7.y:838 { yyVAL.node = yyDollar[1].node @@ -3142,7 +3141,7 @@ yydefault: } case 120: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:850 + // line internal/php7/php7.y:847 { yyVAL.node = yyDollar[2].node @@ -3157,7 +3156,7 @@ yydefault: } case 121: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:866 + // line internal/php7/php7.y:863 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3168,7 +3167,7 @@ yydefault: } case 122: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:875 + // line internal/php7/php7.y:872 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3176,7 +3175,7 @@ yydefault: } case 123: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:884 + // line internal/php7/php7.y:881 { if inlineHtmlNode, ok := yyDollar[2].node.(*ast.StmtInlineHtml); ok && len(yyDollar[1].list) > 0 { prevNode := lastNode(yyDollar[1].list) @@ -3191,7 +3190,7 @@ yydefault: } case 124: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:897 + // line internal/php7/php7.y:894 { yyVAL.list = []ast.Vertex{} @@ -3199,7 +3198,7 @@ yydefault: } case 125: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:906 + // line internal/php7/php7.y:903 { // error yyVAL.node = nil @@ -3208,7 +3207,7 @@ yydefault: } case 126: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:913 + // line internal/php7/php7.y:910 { yyVAL.node = yyDollar[1].node @@ -3216,7 +3215,7 @@ yydefault: } case 127: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:919 + // line internal/php7/php7.y:916 { yyVAL.node = yyDollar[1].node @@ -3224,7 +3223,7 @@ yydefault: } case 128: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:925 + // line internal/php7/php7.y:922 { yyVAL.node = yyDollar[1].node @@ -3232,7 +3231,7 @@ yydefault: } case 129: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:931 + // line internal/php7/php7.y:928 { yyVAL.node = yyDollar[1].node @@ -3240,7 +3239,7 @@ yydefault: } case 130: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:937 + // line internal/php7/php7.y:934 { yyVAL.node = yyDollar[1].node @@ -3248,7 +3247,7 @@ yydefault: } case 131: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:943 + // line internal/php7/php7.y:940 { yyVAL.node = &ast.StmtHaltCompiler{ast.Node{}} @@ -3266,7 +3265,7 @@ yydefault: } case 132: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:961 + // line internal/php7/php7.y:958 { yyVAL.node = &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} @@ -3281,7 +3280,7 @@ yydefault: } case 133: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:974 + // line internal/php7/php7.y:971 { yyVAL.node = yyDollar[1].node @@ -3289,7 +3288,7 @@ yydefault: } case 134: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:980 + // line internal/php7/php7.y:977 { yyVAL.node = yyDollar[1].node @@ -3297,7 +3296,7 @@ yydefault: } case 135: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:986 + // line internal/php7/php7.y:983 { switch n := yyDollar[5].node.(type) { case *ast.StmtWhile: @@ -3320,7 +3319,7 @@ yydefault: } case 136: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:1007 + // line internal/php7/php7.y:1004 { yyVAL.node = &ast.StmtDo{ast.Node{}, yyDollar[2].node, yyDollar[5].node} @@ -3339,7 +3338,7 @@ yydefault: } case 137: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1024 + // line internal/php7/php7.y:1021 { switch n := yyDollar[9].node.(type) { case *ast.StmtFor: @@ -3368,7 +3367,7 @@ yydefault: } case 138: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1051 + // line internal/php7/php7.y:1048 { switch n := yyDollar[5].node.(type) { case *ast.StmtSwitch: @@ -3393,7 +3392,7 @@ yydefault: } case 139: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1074 + // line internal/php7/php7.y:1071 { yyVAL.node = &ast.StmtBreak{ast.Node{}, yyDollar[2].node} @@ -3409,7 +3408,7 @@ yydefault: } case 140: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1088 + // line internal/php7/php7.y:1085 { yyVAL.node = &ast.StmtContinue{ast.Node{}, yyDollar[2].node} @@ -3425,7 +3424,7 @@ yydefault: } case 141: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1102 + // line internal/php7/php7.y:1099 { yyVAL.node = &ast.StmtReturn{ast.Node{}, yyDollar[2].node} @@ -3441,7 +3440,7 @@ yydefault: } case 142: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1116 + // line internal/php7/php7.y:1113 { yyVAL.node = &ast.StmtGlobal{ast.Node{}, yyDollar[2].list} @@ -3457,7 +3456,7 @@ yydefault: } case 143: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1130 + // line internal/php7/php7.y:1127 { yyVAL.node = &ast.StmtStatic{ast.Node{}, yyDollar[2].list} @@ -3473,7 +3472,7 @@ yydefault: } case 144: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1144 + // line internal/php7/php7.y:1141 { yyVAL.node = &ast.StmtEcho{ast.Node{}, yyDollar[2].list} @@ -3490,7 +3489,7 @@ yydefault: } case 145: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1159 + // line internal/php7/php7.y:1156 { yyVAL.node = &ast.StmtInlineHtml{ast.Node{}, yyDollar[1].token.Value} @@ -3504,7 +3503,7 @@ yydefault: } case 146: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1171 + // line internal/php7/php7.y:1168 { yyVAL.node = &ast.StmtExpression{ast.Node{}, yyDollar[1].node} @@ -3520,7 +3519,7 @@ yydefault: } case 147: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1185 + // line internal/php7/php7.y:1182 { yyVAL.node = &ast.StmtUnset{ast.Node{}, yyDollar[3].list} @@ -3542,7 +3541,7 @@ yydefault: } case 148: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:1205 + // line internal/php7/php7.y:1202 { switch n := yyDollar[7].node.(type) { case *ast.StmtForeach: @@ -3568,7 +3567,7 @@ yydefault: } case 149: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1230 + // line internal/php7/php7.y:1227 { switch n := yyDollar[9].node.(type) { case *ast.StmtForeach: @@ -3597,7 +3596,7 @@ yydefault: } case 150: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1257 + // line internal/php7/php7.y:1254 { yyVAL.node = yyDollar[5].node yyVAL.node.(*ast.StmtDeclare).Consts = yyDollar[3].list @@ -3614,7 +3613,7 @@ yydefault: } case 151: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1272 + // line internal/php7/php7.y:1269 { yyVAL.node = &ast.StmtNop{ast.Node{}} @@ -3629,7 +3628,7 @@ yydefault: } case 152: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1285 + // line internal/php7/php7.y:1282 { if yyDollar[6].node == nil { yyVAL.node = &ast.StmtTry{ast.Node{}, yyDollar[3].list, yyDollar[5].list, yyDollar[6].node} @@ -3648,7 +3647,7 @@ yydefault: } case 153: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1302 + // line internal/php7/php7.y:1299 { yyVAL.node = &ast.StmtThrow{ast.Node{}, yyDollar[2].node} @@ -3664,7 +3663,7 @@ yydefault: } case 154: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1316 + // line internal/php7/php7.y:1313 { label := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtGoto{ast.Node{}, label} @@ -3683,7 +3682,7 @@ yydefault: } case 155: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1333 + // line internal/php7/php7.y:1330 { label := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtLabel{ast.Node{}, label} @@ -3700,7 +3699,7 @@ yydefault: } case 156: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1350 + // line internal/php7/php7.y:1347 { yyVAL.list = []ast.Vertex{} @@ -3708,7 +3707,7 @@ yydefault: } case 157: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1356 + // line internal/php7/php7.y:1353 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[5].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -3733,7 +3732,7 @@ yydefault: } case 158: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1381 + // line internal/php7/php7.y:1378 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3741,7 +3740,7 @@ yydefault: } case 159: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1387 + // line internal/php7/php7.y:1384 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3752,7 +3751,7 @@ yydefault: } case 160: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1399 + // line internal/php7/php7.y:1396 { yyVAL.node = nil @@ -3760,7 +3759,7 @@ yydefault: } case 161: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1405 + // line internal/php7/php7.y:1402 { yyVAL.node = &ast.StmtFinally{ast.Node{}, yyDollar[3].list} @@ -3776,7 +3775,7 @@ yydefault: } case 162: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1422 + // line internal/php7/php7.y:1419 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3784,7 +3783,7 @@ yydefault: } case 163: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1428 + // line internal/php7/php7.y:1425 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -3795,7 +3794,7 @@ yydefault: } case 164: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1440 + // line internal/php7/php7.y:1437 { yyVAL.node = yyDollar[1].node @@ -3803,7 +3802,7 @@ yydefault: } case 165: yyDollar = yyS[yypt-11 : yypt+1] - // line internal/php7/php7.y:1449 + // line internal/php7/php7.y:1446 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtFunction{ast.Node{}, yyDollar[2].token != nil, name, yyDollar[6].list, yyDollar[8].node, yyDollar[10].list} @@ -3839,31 +3838,31 @@ yydefault: } case 166: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1485 + // line internal/php7/php7.y:1482 { yyVAL.token = nil } case 167: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1489 + // line internal/php7/php7.y:1486 { yyVAL.token = yyDollar[1].token } case 168: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1496 + // line internal/php7/php7.y:1493 { yyVAL.token = nil } case 169: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1500 + // line internal/php7/php7.y:1497 { yyVAL.token = yyDollar[1].token } case 170: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:1507 + // line internal/php7/php7.y:1504 { name := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtClass{ast.Node{}, name, yyDollar[1].list, nil, yyDollar[4].ClassExtends, yyDollar[5].ClassImplements, yyDollar[8].list} @@ -3883,7 +3882,7 @@ yydefault: } case 171: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php7/php7.y:1525 + // line internal/php7/php7.y:1522 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtClass{ast.Node{}, name, nil, nil, yyDollar[3].ClassExtends, yyDollar[4].ClassImplements, yyDollar[7].list} @@ -3902,7 +3901,7 @@ yydefault: } case 172: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1545 + // line internal/php7/php7.y:1542 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -3910,7 +3909,7 @@ yydefault: } case 173: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1551 + // line internal/php7/php7.y:1548 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -3918,7 +3917,7 @@ yydefault: } case 174: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1560 + // line internal/php7/php7.y:1557 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -3932,7 +3931,7 @@ yydefault: } case 175: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1572 + // line internal/php7/php7.y:1569 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -3946,7 +3945,7 @@ yydefault: } case 176: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1587 + // line internal/php7/php7.y:1584 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtTrait{ast.Node{}, name, yyDollar[5].list} @@ -3965,7 +3964,7 @@ yydefault: } case 177: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:1607 + // line internal/php7/php7.y:1604 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.StmtInterface{ast.Node{}, name, yyDollar[3].InterfaceExtends, yyDollar[6].list} @@ -3984,7 +3983,7 @@ yydefault: } case 178: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1627 + // line internal/php7/php7.y:1624 { yyVAL.ClassExtends = nil @@ -3992,7 +3991,7 @@ yydefault: } case 179: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1633 + // line internal/php7/php7.y:1630 { yyVAL.ClassExtends = &ast.StmtClassExtends{ast.Node{}, yyDollar[2].node} @@ -4006,7 +4005,7 @@ yydefault: } case 180: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1648 + // line internal/php7/php7.y:1645 { yyVAL.InterfaceExtends = nil @@ -4014,7 +4013,7 @@ yydefault: } case 181: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1654 + // line internal/php7/php7.y:1651 { yyVAL.InterfaceExtends = &ast.StmtInterfaceExtends{ast.Node{}, yyDollar[2].list} @@ -4028,7 +4027,7 @@ yydefault: } case 182: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1669 + // line internal/php7/php7.y:1666 { yyVAL.ClassImplements = nil @@ -4036,7 +4035,7 @@ yydefault: } case 183: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1675 + // line internal/php7/php7.y:1672 { yyVAL.ClassImplements = &ast.StmtClassImplements{ast.Node{}, yyDollar[2].list} @@ -4050,7 +4049,7 @@ yydefault: } case 184: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1690 + // line internal/php7/php7.y:1687 { yyVAL.node = yyDollar[1].node @@ -4058,7 +4057,7 @@ yydefault: } case 185: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:1696 + // line internal/php7/php7.y:1693 { yyVAL.node = &ast.ExprReference{ast.Node{}, yyDollar[2].node} @@ -4072,7 +4071,7 @@ yydefault: } case 186: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1708 + // line internal/php7/php7.y:1705 { yyVAL.node = &ast.ExprList{ast.Node{}, yyDollar[3].list} @@ -4088,7 +4087,7 @@ yydefault: } case 187: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1722 + // line internal/php7/php7.y:1719 { yyVAL.node = &ast.ExprShortList{ast.Node{}, yyDollar[2].list} @@ -4103,7 +4102,7 @@ yydefault: } case 188: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1738 + // line internal/php7/php7.y:1735 { yyVAL.node = &ast.StmtFor{ast.Node{}, nil, nil, nil, yyDollar[1].node} @@ -4114,7 +4113,7 @@ yydefault: } case 189: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1747 + // line internal/php7/php7.y:1744 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltFor{ast.Node{}, nil, nil, nil, stmtList} @@ -4133,7 +4132,7 @@ yydefault: } case 190: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1767 + // line internal/php7/php7.y:1764 { yyVAL.node = &ast.StmtForeach{ast.Node{}, nil, nil, nil, yyDollar[1].node} @@ -4144,7 +4143,7 @@ yydefault: } case 191: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1776 + // line internal/php7/php7.y:1773 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltForeach{ast.Node{}, nil, nil, nil, stmtList} @@ -4163,7 +4162,7 @@ yydefault: } case 192: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1796 + // line internal/php7/php7.y:1793 { yyVAL.node = &ast.StmtDeclare{ast.Node{}, false, nil, yyDollar[1].node} @@ -4174,7 +4173,7 @@ yydefault: } case 193: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1805 + // line internal/php7/php7.y:1802 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtDeclare{ast.Node{}, true, nil, stmtList} @@ -4193,7 +4192,7 @@ yydefault: } case 194: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:1825 + // line internal/php7/php7.y:1822 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtSwitch{ast.Node{}, nil, caseList} @@ -4210,7 +4209,7 @@ yydefault: } case 195: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1840 + // line internal/php7/php7.y:1837 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.StmtSwitch{ast.Node{}, nil, caseList} @@ -4228,7 +4227,7 @@ yydefault: } case 196: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1856 + // line internal/php7/php7.y:1853 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltSwitch{ast.Node{}, nil, caseList} @@ -4247,7 +4246,7 @@ yydefault: } case 197: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1873 + // line internal/php7/php7.y:1870 { caseList := &ast.StmtCaseList{ast.Node{}, yyDollar[3].list} @@ -4268,7 +4267,7 @@ yydefault: } case 198: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:1895 + // line internal/php7/php7.y:1892 { yyVAL.list = []ast.Vertex{} @@ -4276,7 +4275,7 @@ yydefault: } case 199: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1901 + // line internal/php7/php7.y:1898 { _case := &ast.StmtCase{ast.Node{}, yyDollar[3].node, yyDollar[5].list} yyVAL.list = append(yyDollar[1].list, _case) @@ -4293,7 +4292,7 @@ yydefault: } case 200: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1916 + // line internal/php7/php7.y:1913 { _default := &ast.StmtDefault{ast.Node{}, yyDollar[4].list} yyVAL.list = append(yyDollar[1].list, _default) @@ -4310,19 +4309,19 @@ yydefault: } case 201: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1934 + // line internal/php7/php7.y:1931 { yyVAL.token = yyDollar[1].token } case 202: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1938 + // line internal/php7/php7.y:1935 { yyVAL.token = yyDollar[1].token } case 203: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:1945 + // line internal/php7/php7.y:1942 { yyVAL.node = &ast.StmtWhile{ast.Node{}, nil, yyDollar[1].node} @@ -4333,7 +4332,7 @@ yydefault: } case 204: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:1954 + // line internal/php7/php7.y:1951 { stmtList := &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.StmtAltWhile{ast.Node{}, nil, stmtList} @@ -4352,7 +4351,7 @@ yydefault: } case 205: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:1974 + // line internal/php7/php7.y:1971 { yyVAL.node = &ast.StmtIf{ast.Node{}, yyDollar[3].node, yyDollar[5].node, nil, nil} @@ -4368,7 +4367,7 @@ yydefault: } case 206: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:1988 + // line internal/php7/php7.y:1985 { _elseIf := &ast.StmtElseIf{ast.Node{}, yyDollar[4].node, yyDollar[6].node} yyDollar[1].node.(*ast.StmtIf).ElseIf = append(yyDollar[1].node.(*ast.StmtIf).ElseIf, _elseIf) @@ -4388,7 +4387,7 @@ yydefault: } case 207: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2009 + // line internal/php7/php7.y:2006 { yyVAL.node = yyDollar[1].node @@ -4396,7 +4395,7 @@ yydefault: } case 208: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2015 + // line internal/php7/php7.y:2012 { _else := &ast.StmtElse{ast.Node{}, yyDollar[3].node} yyDollar[1].node.(*ast.StmtIf).Else = _else @@ -4414,7 +4413,7 @@ yydefault: } case 209: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:2034 + // line internal/php7/php7.y:2031 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[6].list} yyVAL.node = &ast.StmtAltIf{ast.Node{}, yyDollar[3].node, stmts, nil, nil} @@ -4433,7 +4432,7 @@ yydefault: } case 210: yyDollar = yyS[yypt-7 : yypt+1] - // line internal/php7/php7.y:2051 + // line internal/php7/php7.y:2048 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[7].list} _elseIf := &ast.StmtAltElseIf{ast.Node{}, yyDollar[4].node, stmts} @@ -4455,7 +4454,7 @@ yydefault: } case 211: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2074 + // line internal/php7/php7.y:2071 { yyVAL.node = yyDollar[1].node @@ -4471,7 +4470,7 @@ yydefault: } case 212: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:2088 + // line internal/php7/php7.y:2085 { stmts := &ast.StmtStmtList{ast.Node{}, yyDollar[4].list} _else := &ast.StmtAltElse{ast.Node{}, stmts} @@ -4495,7 +4494,7 @@ yydefault: } case 213: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2113 + // line internal/php7/php7.y:2110 { yyVAL.list = yyDollar[1].list @@ -4503,7 +4502,7 @@ yydefault: } case 214: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2119 + // line internal/php7/php7.y:2116 { yyVAL.list = nil @@ -4511,7 +4510,7 @@ yydefault: } case 215: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2128 + // line internal/php7/php7.y:2125 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4519,7 +4518,7 @@ yydefault: } case 216: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2134 + // line internal/php7/php7.y:2131 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4530,7 +4529,7 @@ yydefault: } case 217: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2146 + // line internal/php7/php7.y:2143 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4581,7 +4580,7 @@ yydefault: } case 218: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:2192 + // line internal/php7/php7.y:2189 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[4].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4633,7 +4632,7 @@ yydefault: } case 219: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2242 + // line internal/php7/php7.y:2239 { yyVAL.node = nil @@ -4641,7 +4640,7 @@ yydefault: } case 220: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2248 + // line internal/php7/php7.y:2245 { yyVAL.node = yyDollar[1].node @@ -4649,7 +4648,7 @@ yydefault: } case 221: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2257 + // line internal/php7/php7.y:2254 { yyVAL.node = yyDollar[1].node @@ -4657,7 +4656,7 @@ yydefault: } case 222: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2263 + // line internal/php7/php7.y:2260 { yyVAL.node = &ast.Nullable{ast.Node{}, yyDollar[2].node} @@ -4671,7 +4670,7 @@ yydefault: } case 223: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2278 + // line internal/php7/php7.y:2275 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -4685,7 +4684,7 @@ yydefault: } case 224: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2290 + // line internal/php7/php7.y:2287 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -4699,7 +4698,7 @@ yydefault: } case 225: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2302 + // line internal/php7/php7.y:2299 { yyVAL.node = yyDollar[1].node @@ -4707,7 +4706,7 @@ yydefault: } case 226: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2311 + // line internal/php7/php7.y:2308 { yyVAL.node = nil @@ -4715,7 +4714,7 @@ yydefault: } case 227: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2317 + // line internal/php7/php7.y:2314 { yyVAL.node = yyDollar[2].node @@ -4726,7 +4725,7 @@ yydefault: } case 228: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2329 + // line internal/php7/php7.y:2326 { yyVAL.node = &ast.ArgumentList{ast.Node{}, nil} @@ -4741,7 +4740,7 @@ yydefault: } case 229: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2342 + // line internal/php7/php7.y:2339 { yyVAL.node = &ast.ArgumentList{ast.Node{}, yyDollar[2].list} @@ -4760,7 +4759,7 @@ yydefault: } case 230: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2362 + // line internal/php7/php7.y:2359 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4768,7 +4767,7 @@ yydefault: } case 231: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2368 + // line internal/php7/php7.y:2365 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4779,7 +4778,7 @@ yydefault: } case 232: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2380 + // line internal/php7/php7.y:2377 { yyVAL.node = &ast.Argument{ast.Node{}, false, false, yyDollar[1].node} @@ -4793,7 +4792,7 @@ yydefault: } case 233: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2392 + // line internal/php7/php7.y:2389 { yyVAL.node = &ast.Argument{ast.Node{}, true, false, yyDollar[2].node} @@ -4807,7 +4806,7 @@ yydefault: } case 234: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2407 + // line internal/php7/php7.y:2404 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4818,7 +4817,7 @@ yydefault: } case 235: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2416 + // line internal/php7/php7.y:2413 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4826,7 +4825,7 @@ yydefault: } case 236: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2425 + // line internal/php7/php7.y:2422 { yyVAL.node = yyDollar[1].node @@ -4834,7 +4833,7 @@ yydefault: } case 237: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2434 + // line internal/php7/php7.y:2431 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -4845,7 +4844,7 @@ yydefault: } case 238: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2443 + // line internal/php7/php7.y:2440 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -4853,7 +4852,7 @@ yydefault: } case 239: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2452 + // line internal/php7/php7.y:2449 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4872,7 +4871,7 @@ yydefault: } case 240: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2469 + // line internal/php7/php7.y:2466 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -4892,7 +4891,7 @@ yydefault: } case 241: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2490 + // line internal/php7/php7.y:2487 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -4900,7 +4899,7 @@ yydefault: } case 242: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2496 + // line internal/php7/php7.y:2493 { yyVAL.list = []ast.Vertex{} @@ -4908,7 +4907,7 @@ yydefault: } case 243: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2505 + // line internal/php7/php7.y:2502 { yyVAL.node = &ast.StmtPropertyList{ast.Node{}, yyDollar[1].list, yyDollar[2].node, yyDollar[3].list} @@ -4924,7 +4923,7 @@ yydefault: } case 244: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2519 + // line internal/php7/php7.y:2516 { yyVAL.node = &ast.StmtClassConstList{ast.Node{}, yyDollar[1].list, yyDollar[3].list} @@ -4945,7 +4944,7 @@ yydefault: } case 245: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2538 + // line internal/php7/php7.y:2535 { yyVAL.node = &ast.StmtTraitUse{ast.Node{}, yyDollar[2].list, yyDollar[3].node} @@ -4959,7 +4958,7 @@ yydefault: } case 246: yyDollar = yyS[yypt-10 : yypt+1] - // line internal/php7/php7.y:2550 + // line internal/php7/php7.y:2547 { name := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtClassMethod{ast.Node{}, yyDollar[3].token != nil, name, yyDollar[1].list, yyDollar[7].list, yyDollar[9].node, yyDollar[10].node} @@ -4996,7 +4995,7 @@ yydefault: } case 247: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2587 + // line internal/php7/php7.y:2584 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5004,7 +5003,7 @@ yydefault: } case 248: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2593 + // line internal/php7/php7.y:2590 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5015,7 +5014,7 @@ yydefault: } case 249: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2605 + // line internal/php7/php7.y:2602 { yyVAL.node = &ast.StmtNop{ast.Node{}} @@ -5029,7 +5028,7 @@ yydefault: } case 250: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2618 + // line internal/php7/php7.y:2615 { yyVAL.node = &ast.StmtTraitAdaptationList{ast.Node{}, nil} @@ -5043,7 +5042,7 @@ yydefault: } case 251: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2630 + // line internal/php7/php7.y:2627 { yyVAL.node = &ast.StmtTraitAdaptationList{ast.Node{}, yyDollar[2].list} @@ -5057,7 +5056,7 @@ yydefault: } case 252: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2645 + // line internal/php7/php7.y:2642 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5065,7 +5064,7 @@ yydefault: } case 253: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2651 + // line internal/php7/php7.y:2648 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -5073,7 +5072,7 @@ yydefault: } case 254: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2660 + // line internal/php7/php7.y:2657 { yyVAL.node = yyDollar[1].node @@ -5085,7 +5084,7 @@ yydefault: } case 255: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2670 + // line internal/php7/php7.y:2667 { yyVAL.node = yyDollar[1].node @@ -5097,7 +5096,7 @@ yydefault: } case 256: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2683 + // line internal/php7/php7.y:2680 { yyVAL.node = &ast.StmtTraitUsePrecedence{ast.Node{}, yyDollar[1].node, yyDollar[3].list} @@ -5112,7 +5111,7 @@ yydefault: } case 257: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2699 + // line internal/php7/php7.y:2696 { alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, nil, alias} @@ -5130,7 +5129,7 @@ yydefault: } case 258: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2715 + // line internal/php7/php7.y:2712 { alias := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, nil, alias} @@ -5148,7 +5147,7 @@ yydefault: } case 259: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2731 + // line internal/php7/php7.y:2728 { alias := &ast.Identifier{ast.Node{}, yyDollar[4].token.Value} yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, yyDollar[3].node, alias} @@ -5166,7 +5165,7 @@ yydefault: } case 260: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2747 + // line internal/php7/php7.y:2744 { yyVAL.node = &ast.StmtTraitUseAlias{ast.Node{}, yyDollar[1].node, yyDollar[3].node, nil} @@ -5181,7 +5180,7 @@ yydefault: } case 261: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2763 + // line internal/php7/php7.y:2760 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtTraitMethodRef{ast.Node{}, nil, name} @@ -5197,7 +5196,7 @@ yydefault: } case 262: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2777 + // line internal/php7/php7.y:2774 { yyVAL.node = yyDollar[1].node @@ -5205,7 +5204,7 @@ yydefault: } case 263: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2786 + // line internal/php7/php7.y:2783 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.StmtTraitMethodRef{ast.Node{}, yyDollar[1].node, target} @@ -5223,7 +5222,7 @@ yydefault: } case 264: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2805 + // line internal/php7/php7.y:2802 { yyVAL.node = &ast.StmtNop{ast.Node{}} @@ -5238,7 +5237,7 @@ yydefault: } case 265: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2818 + // line internal/php7/php7.y:2815 { yyVAL.node = &ast.StmtStmtList{ast.Node{}, yyDollar[2].list} @@ -5253,7 +5252,7 @@ yydefault: } case 266: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2834 + // line internal/php7/php7.y:2831 { yyVAL.list = yyDollar[1].list @@ -5261,7 +5260,7 @@ yydefault: } case 267: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2840 + // line internal/php7/php7.y:2837 { modifier := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{modifier} @@ -5276,7 +5275,7 @@ yydefault: } case 268: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:2856 + // line internal/php7/php7.y:2853 { yyVAL.list = nil @@ -5284,7 +5283,7 @@ yydefault: } case 269: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2862 + // line internal/php7/php7.y:2859 { yyVAL.list = yyDollar[1].list @@ -5292,7 +5291,7 @@ yydefault: } case 270: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2871 + // line internal/php7/php7.y:2868 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5300,7 +5299,7 @@ yydefault: } case 271: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2877 + // line internal/php7/php7.y:2874 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -5308,7 +5307,7 @@ yydefault: } case 272: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2886 + // line internal/php7/php7.y:2883 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -5322,7 +5321,7 @@ yydefault: } case 273: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2898 + // line internal/php7/php7.y:2895 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -5336,7 +5335,7 @@ yydefault: } case 274: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2910 + // line internal/php7/php7.y:2907 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -5350,7 +5349,7 @@ yydefault: } case 275: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2922 + // line internal/php7/php7.y:2919 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -5364,7 +5363,7 @@ yydefault: } case 276: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2934 + // line internal/php7/php7.y:2931 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -5378,7 +5377,7 @@ yydefault: } case 277: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2946 + // line internal/php7/php7.y:2943 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -5392,7 +5391,7 @@ yydefault: } case 278: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:2961 + // line internal/php7/php7.y:2958 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5403,7 +5402,7 @@ yydefault: } case 279: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:2970 + // line internal/php7/php7.y:2967 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5411,7 +5410,7 @@ yydefault: } case 280: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:2979 + // line internal/php7/php7.y:2976 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -5430,7 +5429,7 @@ yydefault: } case 281: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:2996 + // line internal/php7/php7.y:2993 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -5450,7 +5449,7 @@ yydefault: } case 282: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3017 + // line internal/php7/php7.y:3014 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5461,7 +5460,7 @@ yydefault: } case 283: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3026 + // line internal/php7/php7.y:3023 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5469,7 +5468,7 @@ yydefault: } case 284: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3035 + // line internal/php7/php7.y:3032 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtConstant{ast.Node{}, name, yyDollar[3].node} @@ -5486,7 +5485,7 @@ yydefault: } case 285: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3053 + // line internal/php7/php7.y:3050 { name := &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} yyVAL.node = &ast.StmtConstant{ast.Node{}, name, yyDollar[3].node} @@ -5503,7 +5502,7 @@ yydefault: } case 286: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3071 + // line internal/php7/php7.y:3068 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5514,7 +5513,7 @@ yydefault: } case 287: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3080 + // line internal/php7/php7.y:3077 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5522,7 +5521,7 @@ yydefault: } case 288: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3089 + // line internal/php7/php7.y:3086 { yyVAL.node = yyDollar[1].node @@ -5530,7 +5529,7 @@ yydefault: } case 289: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:3098 + // line internal/php7/php7.y:3095 { yyVAL.list = nil @@ -5538,7 +5537,7 @@ yydefault: } case 290: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3104 + // line internal/php7/php7.y:3101 { yyVAL.list = yyDollar[1].list @@ -5546,7 +5545,7 @@ yydefault: } case 291: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3113 + // line internal/php7/php7.y:3110 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -5557,7 +5556,7 @@ yydefault: } case 292: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3122 + // line internal/php7/php7.y:3119 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -5565,7 +5564,7 @@ yydefault: } case 293: yyDollar = yyS[yypt-8 : yypt+1] - // line internal/php7/php7.y:3131 + // line internal/php7/php7.y:3128 { if yyDollar[2].node != nil { yyVAL.node = &ast.StmtClass{ast.Node{}, nil, nil, yyDollar[2].node.(*ast.ArgumentList), yyDollar[3].ClassExtends, yyDollar[4].ClassImplements, yyDollar[7].list} @@ -5585,7 +5584,7 @@ yydefault: } case 294: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3152 + // line internal/php7/php7.y:3149 { if yyDollar[3].node != nil { yyVAL.node = &ast.ExprNew{ast.Node{}, yyDollar[2].node, yyDollar[3].node.(*ast.ArgumentList)} @@ -5602,7 +5601,7 @@ yydefault: } case 295: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3167 + // line internal/php7/php7.y:3164 { yyVAL.node = &ast.ExprNew{ast.Node{}, yyDollar[2].node, nil} @@ -5616,7 +5615,7 @@ yydefault: } case 296: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:3182 + // line internal/php7/php7.y:3179 { listNode := &ast.ExprList{ast.Node{}, yyDollar[3].list} yyVAL.node = &ast.ExprAssign{ast.Node{}, listNode, yyDollar[6].node} @@ -5635,7 +5634,7 @@ yydefault: } case 297: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:3199 + // line internal/php7/php7.y:3196 { shortList := &ast.ExprShortList{ast.Node{}, yyDollar[2].list} yyVAL.node = &ast.ExprAssign{ast.Node{}, shortList, yyDollar[5].node} @@ -5653,7 +5652,7 @@ yydefault: } case 298: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3215 + // line internal/php7/php7.y:3212 { yyVAL.node = &ast.ExprAssign{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5668,7 +5667,7 @@ yydefault: } case 299: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3228 + // line internal/php7/php7.y:3225 { yyVAL.node = &ast.ExprAssignReference{ast.Node{}, yyDollar[1].node, yyDollar[4].node} @@ -5684,7 +5683,7 @@ yydefault: } case 300: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3242 + // line internal/php7/php7.y:3239 { yyVAL.node = &ast.ExprClone{ast.Node{}, yyDollar[2].node} @@ -5698,7 +5697,7 @@ yydefault: } case 301: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3254 + // line internal/php7/php7.y:3251 { yyVAL.node = &ast.ExprAssignPlus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5713,7 +5712,7 @@ yydefault: } case 302: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3267 + // line internal/php7/php7.y:3264 { yyVAL.node = &ast.ExprAssignMinus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5728,7 +5727,7 @@ yydefault: } case 303: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3280 + // line internal/php7/php7.y:3277 { yyVAL.node = &ast.ExprAssignMul{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5743,7 +5742,7 @@ yydefault: } case 304: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3293 + // line internal/php7/php7.y:3290 { yyVAL.node = &ast.ExprAssignPow{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5758,7 +5757,7 @@ yydefault: } case 305: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3306 + // line internal/php7/php7.y:3303 { yyVAL.node = &ast.ExprAssignDiv{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5773,7 +5772,7 @@ yydefault: } case 306: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3319 + // line internal/php7/php7.y:3316 { yyVAL.node = &ast.ExprAssignConcat{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5788,7 +5787,7 @@ yydefault: } case 307: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3332 + // line internal/php7/php7.y:3329 { yyVAL.node = &ast.ExprAssignMod{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5803,7 +5802,7 @@ yydefault: } case 308: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3345 + // line internal/php7/php7.y:3342 { yyVAL.node = &ast.ExprAssignBitwiseAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5818,7 +5817,7 @@ yydefault: } case 309: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3358 + // line internal/php7/php7.y:3355 { yyVAL.node = &ast.ExprAssignBitwiseOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5833,7 +5832,7 @@ yydefault: } case 310: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3371 + // line internal/php7/php7.y:3368 { yyVAL.node = &ast.ExprAssignBitwiseXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5848,7 +5847,7 @@ yydefault: } case 311: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3384 + // line internal/php7/php7.y:3381 { yyVAL.node = &ast.ExprAssignShiftLeft{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5863,7 +5862,7 @@ yydefault: } case 312: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3397 + // line internal/php7/php7.y:3394 { yyVAL.node = &ast.ExprAssignShiftRight{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5878,7 +5877,7 @@ yydefault: } case 313: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3410 + // line internal/php7/php7.y:3407 { yyVAL.node = &ast.ExprAssignCoalesce{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5893,7 +5892,7 @@ yydefault: } case 314: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3423 + // line internal/php7/php7.y:3420 { yyVAL.node = &ast.ExprPostInc{ast.Node{}, yyDollar[1].node} @@ -5908,7 +5907,7 @@ yydefault: } case 315: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3436 + // line internal/php7/php7.y:3433 { yyVAL.node = &ast.ExprPreInc{ast.Node{}, yyDollar[2].node} @@ -5922,7 +5921,7 @@ yydefault: } case 316: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3448 + // line internal/php7/php7.y:3445 { yyVAL.node = &ast.ExprPostDec{ast.Node{}, yyDollar[1].node} @@ -5937,7 +5936,7 @@ yydefault: } case 317: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3461 + // line internal/php7/php7.y:3458 { yyVAL.node = &ast.ExprPreDec{ast.Node{}, yyDollar[2].node} @@ -5951,7 +5950,7 @@ yydefault: } case 318: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3473 + // line internal/php7/php7.y:3470 { yyVAL.node = &ast.ExprBinaryBooleanOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5966,7 +5965,7 @@ yydefault: } case 319: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3486 + // line internal/php7/php7.y:3483 { yyVAL.node = &ast.ExprBinaryBooleanAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5981,7 +5980,7 @@ yydefault: } case 320: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3499 + // line internal/php7/php7.y:3496 { yyVAL.node = &ast.ExprBinaryLogicalOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -5996,7 +5995,7 @@ yydefault: } case 321: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3512 + // line internal/php7/php7.y:3509 { yyVAL.node = &ast.ExprBinaryLogicalAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6011,7 +6010,7 @@ yydefault: } case 322: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3525 + // line internal/php7/php7.y:3522 { yyVAL.node = &ast.ExprBinaryLogicalXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6026,7 +6025,7 @@ yydefault: } case 323: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3538 + // line internal/php7/php7.y:3535 { yyVAL.node = &ast.ExprBinaryBitwiseOr{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6041,7 +6040,7 @@ yydefault: } case 324: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3551 + // line internal/php7/php7.y:3548 { yyVAL.node = &ast.ExprBinaryBitwiseAnd{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6056,7 +6055,7 @@ yydefault: } case 325: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3564 + // line internal/php7/php7.y:3561 { yyVAL.node = &ast.ExprBinaryBitwiseXor{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6071,7 +6070,7 @@ yydefault: } case 326: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3577 + // line internal/php7/php7.y:3574 { yyVAL.node = &ast.ExprBinaryConcat{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6086,7 +6085,7 @@ yydefault: } case 327: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3590 + // line internal/php7/php7.y:3587 { yyVAL.node = &ast.ExprBinaryPlus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6101,7 +6100,7 @@ yydefault: } case 328: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3603 + // line internal/php7/php7.y:3600 { yyVAL.node = &ast.ExprBinaryMinus{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6116,7 +6115,7 @@ yydefault: } case 329: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3616 + // line internal/php7/php7.y:3613 { yyVAL.node = &ast.ExprBinaryMul{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6131,7 +6130,7 @@ yydefault: } case 330: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3629 + // line internal/php7/php7.y:3626 { yyVAL.node = &ast.ExprBinaryPow{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6146,7 +6145,7 @@ yydefault: } case 331: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3642 + // line internal/php7/php7.y:3639 { yyVAL.node = &ast.ExprBinaryDiv{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6161,7 +6160,7 @@ yydefault: } case 332: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3655 + // line internal/php7/php7.y:3652 { yyVAL.node = &ast.ExprBinaryMod{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6176,7 +6175,7 @@ yydefault: } case 333: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3668 + // line internal/php7/php7.y:3665 { yyVAL.node = &ast.ExprBinaryShiftLeft{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6191,7 +6190,7 @@ yydefault: } case 334: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3681 + // line internal/php7/php7.y:3678 { yyVAL.node = &ast.ExprBinaryShiftRight{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6206,7 +6205,7 @@ yydefault: } case 335: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3694 + // line internal/php7/php7.y:3691 { yyVAL.node = &ast.ExprUnaryPlus{ast.Node{}, yyDollar[2].node} @@ -6220,7 +6219,7 @@ yydefault: } case 336: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3706 + // line internal/php7/php7.y:3703 { yyVAL.node = &ast.ExprUnaryMinus{ast.Node{}, yyDollar[2].node} @@ -6234,7 +6233,7 @@ yydefault: } case 337: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3718 + // line internal/php7/php7.y:3715 { yyVAL.node = &ast.ExprBooleanNot{ast.Node{}, yyDollar[2].node} @@ -6248,7 +6247,7 @@ yydefault: } case 338: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3730 + // line internal/php7/php7.y:3727 { yyVAL.node = &ast.ExprBitwiseNot{ast.Node{}, yyDollar[2].node} @@ -6262,7 +6261,7 @@ yydefault: } case 339: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3742 + // line internal/php7/php7.y:3739 { yyVAL.node = &ast.ExprBinaryIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6277,7 +6276,7 @@ yydefault: } case 340: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3755 + // line internal/php7/php7.y:3752 { yyVAL.node = &ast.ExprBinaryNotIdentical{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6292,7 +6291,7 @@ yydefault: } case 341: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3768 + // line internal/php7/php7.y:3765 { yyVAL.node = &ast.ExprBinaryEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6307,7 +6306,7 @@ yydefault: } case 342: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3781 + // line internal/php7/php7.y:3778 { yyVAL.node = &ast.ExprBinaryNotEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6323,7 +6322,7 @@ yydefault: } case 343: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3795 + // line internal/php7/php7.y:3792 { yyVAL.node = &ast.ExprBinarySmaller{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6338,7 +6337,7 @@ yydefault: } case 344: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3808 + // line internal/php7/php7.y:3805 { yyVAL.node = &ast.ExprBinarySmallerOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6353,7 +6352,7 @@ yydefault: } case 345: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3821 + // line internal/php7/php7.y:3818 { yyVAL.node = &ast.ExprBinaryGreater{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6368,7 +6367,7 @@ yydefault: } case 346: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3834 + // line internal/php7/php7.y:3831 { yyVAL.node = &ast.ExprBinaryGreaterOrEqual{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6383,7 +6382,7 @@ yydefault: } case 347: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3847 + // line internal/php7/php7.y:3844 { yyVAL.node = &ast.ExprBinarySpaceship{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6398,7 +6397,7 @@ yydefault: } case 348: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3860 + // line internal/php7/php7.y:3857 { yyVAL.node = &ast.ExprInstanceOf{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6413,7 +6412,7 @@ yydefault: } case 349: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3873 + // line internal/php7/php7.y:3870 { yyVAL.node = yyDollar[2].node @@ -6425,7 +6424,7 @@ yydefault: } case 350: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3883 + // line internal/php7/php7.y:3880 { yyVAL.node = yyDollar[1].node @@ -6433,7 +6432,7 @@ yydefault: } case 351: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:3889 + // line internal/php7/php7.y:3886 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[5].node} @@ -6449,7 +6448,7 @@ yydefault: } case 352: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:3903 + // line internal/php7/php7.y:3900 { yyVAL.node = &ast.ExprTernary{ast.Node{}, yyDollar[1].node, nil, yyDollar[4].node} @@ -6465,7 +6464,7 @@ yydefault: } case 353: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:3917 + // line internal/php7/php7.y:3914 { yyVAL.node = &ast.ExprBinaryCoalesce{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -6480,7 +6479,7 @@ yydefault: } case 354: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:3930 + // line internal/php7/php7.y:3927 { yyVAL.node = yyDollar[1].node @@ -6488,7 +6487,7 @@ yydefault: } case 355: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3936 + // line internal/php7/php7.y:3933 { yyVAL.node = &ast.ExprCastInt{ast.Node{}, yyDollar[2].node} @@ -6503,7 +6502,7 @@ yydefault: } case 356: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3949 + // line internal/php7/php7.y:3946 { yyVAL.node = &ast.ExprCastDouble{ast.Node{}, yyDollar[2].node} @@ -6518,7 +6517,7 @@ yydefault: } case 357: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3962 + // line internal/php7/php7.y:3959 { yyVAL.node = &ast.ExprCastString{ast.Node{}, yyDollar[2].node} @@ -6533,7 +6532,7 @@ yydefault: } case 358: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3975 + // line internal/php7/php7.y:3972 { yyVAL.node = &ast.ExprCastArray{ast.Node{}, yyDollar[2].node} @@ -6548,7 +6547,7 @@ yydefault: } case 359: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:3988 + // line internal/php7/php7.y:3985 { yyVAL.node = &ast.ExprCastObject{ast.Node{}, yyDollar[2].node} @@ -6563,7 +6562,7 @@ yydefault: } case 360: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4001 + // line internal/php7/php7.y:3998 { yyVAL.node = &ast.ExprCastBool{ast.Node{}, yyDollar[2].node} @@ -6578,7 +6577,7 @@ yydefault: } case 361: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4014 + // line internal/php7/php7.y:4011 { yyVAL.node = &ast.ExprCastUnset{ast.Node{}, yyDollar[2].node} @@ -6593,7 +6592,7 @@ yydefault: } case 362: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4027 + // line internal/php7/php7.y:4024 { var e *ast.ExprExit if yyDollar[2].node != nil { @@ -6622,7 +6621,7 @@ yydefault: } case 363: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4054 + // line internal/php7/php7.y:4051 { yyVAL.node = &ast.ExprErrorSuppress{ast.Node{}, yyDollar[2].node} @@ -6636,7 +6635,7 @@ yydefault: } case 364: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4066 + // line internal/php7/php7.y:4063 { yyVAL.node = yyDollar[1].node @@ -6644,7 +6643,7 @@ yydefault: } case 365: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4072 + // line internal/php7/php7.y:4069 { yyVAL.node = &ast.ExprShellExec{ast.Node{}, yyDollar[2].list} @@ -6658,7 +6657,7 @@ yydefault: } case 366: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4084 + // line internal/php7/php7.y:4081 { yyVAL.node = &ast.ExprPrint{ast.Node{}, yyDollar[2].node} @@ -6672,7 +6671,7 @@ yydefault: } case 367: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4096 + // line internal/php7/php7.y:4093 { yyVAL.node = &ast.ExprYield{ast.Node{}, nil, nil} @@ -6686,7 +6685,7 @@ yydefault: } case 368: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4108 + // line internal/php7/php7.y:4105 { yyVAL.node = &ast.ExprYield{ast.Node{}, nil, yyDollar[2].node} @@ -6700,7 +6699,7 @@ yydefault: } case 369: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4120 + // line internal/php7/php7.y:4117 { yyVAL.node = &ast.ExprYield{ast.Node{}, yyDollar[2].node, yyDollar[4].node} @@ -6715,7 +6714,7 @@ yydefault: } case 370: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4133 + // line internal/php7/php7.y:4130 { yyVAL.node = &ast.ExprYieldFrom{ast.Node{}, yyDollar[2].node} @@ -6729,7 +6728,7 @@ yydefault: } case 371: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4145 + // line internal/php7/php7.y:4142 { yyVAL.node = yyDollar[1].node @@ -6737,7 +6736,7 @@ yydefault: } case 372: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4151 + // line internal/php7/php7.y:4148 { yyVAL.node = yyDollar[2].node @@ -6760,7 +6759,7 @@ yydefault: } case 373: yyDollar = yyS[yypt-11 : yypt+1] - // line internal/php7/php7.y:4174 + // line internal/php7/php7.y:4171 { yyVAL.node = &ast.ExprClosure{ast.Node{}, yyDollar[2].token != nil, false, yyDollar[5].list, yyDollar[7].ClosureUse, yyDollar[8].node, yyDollar[10].list} @@ -6797,7 +6796,7 @@ yydefault: } case 374: yyDollar = yyS[yypt-9 : yypt+1] - // line internal/php7/php7.y:4206 + // line internal/php7/php7.y:4203 { yyVAL.node = &ast.ExprArrowFunction{ast.Node{}, yyDollar[2].token != nil, false, yyDollar[4].list, yyDollar[6].node, yyDollar[9].node} @@ -6825,32 +6824,23 @@ yydefault: delete(yyVAL.node.GetNode().Tokens, token.ReturnType) } - yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) - } - case 375: - yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4237 - { - yyVAL.str = yylex.(*Parser).Lexer.GetPhpDocComment() - yylex.(*Parser).Lexer.SetPhpDocComment("") - yylex.(*Parser).returnTokenToPool(yyDollar, &yyVAL) } case 376: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4247 + // line internal/php7/php7.y:4238 { yyVAL.token = nil } case 377: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4251 + // line internal/php7/php7.y:4242 { yyVAL.token = yyDollar[1].token } case 378: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4258 + // line internal/php7/php7.y:4249 { yyVAL.ClosureUse = nil @@ -6858,7 +6848,7 @@ yydefault: } case 379: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4264 + // line internal/php7/php7.y:4255 { yyVAL.ClosureUse = &ast.ExprClosureUse{ast.Node{}, yyDollar[3].list} @@ -6874,7 +6864,7 @@ yydefault: } case 380: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4281 + // line internal/php7/php7.y:4272 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -6885,7 +6875,7 @@ yydefault: } case 381: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4290 + // line internal/php7/php7.y:4281 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -6893,7 +6883,7 @@ yydefault: } case 382: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4299 + // line internal/php7/php7.y:4290 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, identifier} @@ -6910,7 +6900,7 @@ yydefault: } case 383: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4314 + // line internal/php7/php7.y:4305 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[2].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -6930,7 +6920,7 @@ yydefault: } case 384: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4335 + // line internal/php7/php7.y:4326 { yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, yyDollar[1].node, yyDollar[2].node.(*ast.ArgumentList)} @@ -6944,7 +6934,7 @@ yydefault: } case 385: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4347 + // line internal/php7/php7.y:4338 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} @@ -6959,7 +6949,7 @@ yydefault: } case 386: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4360 + // line internal/php7/php7.y:4351 { yyVAL.node = &ast.ExprStaticCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} @@ -6974,7 +6964,7 @@ yydefault: } case 387: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4373 + // line internal/php7/php7.y:4364 { yyVAL.node = &ast.ExprFunctionCall{ast.Node{}, yyDollar[1].node, yyDollar[2].node.(*ast.ArgumentList)} @@ -6988,7 +6978,7 @@ yydefault: } case 388: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4388 + // line internal/php7/php7.y:4379 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -7002,7 +6992,7 @@ yydefault: } case 389: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4400 + // line internal/php7/php7.y:4391 { yyVAL.node = yyDollar[1].node @@ -7010,7 +7000,7 @@ yydefault: } case 390: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4409 + // line internal/php7/php7.y:4400 { yyVAL.node = yyDollar[1].node @@ -7018,7 +7008,7 @@ yydefault: } case 391: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4415 + // line internal/php7/php7.y:4406 { yyVAL.node = yyDollar[1].node @@ -7026,7 +7016,7 @@ yydefault: } case 392: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4424 + // line internal/php7/php7.y:4415 { yyVAL.node = nil @@ -7034,7 +7024,7 @@ yydefault: } case 393: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4430 + // line internal/php7/php7.y:4421 { yyVAL.node = &ast.ExprExit{ast.Node{}, false, yyDollar[2].node} @@ -7049,7 +7039,7 @@ yydefault: } case 394: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4446 + // line internal/php7/php7.y:4437 { yyVAL.list = []ast.Vertex{} @@ -7057,7 +7047,7 @@ yydefault: } case 395: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4452 + // line internal/php7/php7.y:4443 { part := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{part} @@ -7069,7 +7059,7 @@ yydefault: } case 396: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4462 + // line internal/php7/php7.y:4453 { yyVAL.list = yyDollar[1].list @@ -7077,7 +7067,7 @@ yydefault: } case 397: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4471 + // line internal/php7/php7.y:4462 { yyVAL.node = nil @@ -7085,7 +7075,7 @@ yydefault: } case 398: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4477 + // line internal/php7/php7.y:4468 { yyVAL.node = yyDollar[1].node @@ -7093,7 +7083,7 @@ yydefault: } case 399: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4486 + // line internal/php7/php7.y:4477 { yyVAL.node = &ast.ExprArray{ast.Node{}, yyDollar[3].list} @@ -7109,7 +7099,7 @@ yydefault: } case 400: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4500 + // line internal/php7/php7.y:4491 { yyVAL.node = &ast.ExprShortArray{ast.Node{}, yyDollar[2].list} @@ -7124,7 +7114,7 @@ yydefault: } case 401: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4513 + // line internal/php7/php7.y:4504 { yyVAL.node = &ast.ScalarString{ast.Node{}, yyDollar[1].token.Value} @@ -7138,7 +7128,7 @@ yydefault: } case 402: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4528 + // line internal/php7/php7.y:4519 { yyVAL.node = &ast.ScalarLnumber{ast.Node{}, yyDollar[1].token.Value} @@ -7152,7 +7142,7 @@ yydefault: } case 403: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4540 + // line internal/php7/php7.y:4531 { yyVAL.node = &ast.ScalarDnumber{ast.Node{}, yyDollar[1].token.Value} @@ -7166,7 +7156,7 @@ yydefault: } case 404: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4552 + // line internal/php7/php7.y:4543 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7180,7 +7170,7 @@ yydefault: } case 405: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4564 + // line internal/php7/php7.y:4555 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7194,7 +7184,7 @@ yydefault: } case 406: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4576 + // line internal/php7/php7.y:4567 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7208,7 +7198,7 @@ yydefault: } case 407: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4588 + // line internal/php7/php7.y:4579 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7222,7 +7212,7 @@ yydefault: } case 408: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4600 + // line internal/php7/php7.y:4591 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7236,7 +7226,7 @@ yydefault: } case 409: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4612 + // line internal/php7/php7.y:4603 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7250,7 +7240,7 @@ yydefault: } case 410: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4624 + // line internal/php7/php7.y:4615 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7264,7 +7254,7 @@ yydefault: } case 411: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4636 + // line internal/php7/php7.y:4627 { yyVAL.node = &ast.ScalarMagicConstant{ast.Node{}, yyDollar[1].token.Value} @@ -7278,7 +7268,7 @@ yydefault: } case 412: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4648 + // line internal/php7/php7.y:4639 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[2].token.Value} yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, []ast.Vertex{encapsed}} @@ -7294,7 +7284,7 @@ yydefault: } case 413: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4662 + // line internal/php7/php7.y:4653 { yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, nil} @@ -7308,7 +7298,7 @@ yydefault: } case 414: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4674 + // line internal/php7/php7.y:4665 { yyVAL.node = &ast.ScalarEncapsed{ast.Node{}, yyDollar[2].list} @@ -7322,7 +7312,7 @@ yydefault: } case 415: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4686 + // line internal/php7/php7.y:4677 { yyVAL.node = &ast.ScalarHeredoc{ast.Node{}, yyDollar[1].token.Value, yyDollar[2].list} @@ -7336,7 +7326,7 @@ yydefault: } case 416: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4698 + // line internal/php7/php7.y:4689 { yyVAL.node = yyDollar[1].node @@ -7344,7 +7334,7 @@ yydefault: } case 417: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4704 + // line internal/php7/php7.y:4695 { yyVAL.node = yyDollar[1].node @@ -7352,7 +7342,7 @@ yydefault: } case 418: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4713 + // line internal/php7/php7.y:4704 { yyVAL.node = &ast.ExprConstFetch{ast.Node{}, yyDollar[1].node} @@ -7366,7 +7356,7 @@ yydefault: } case 419: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4725 + // line internal/php7/php7.y:4716 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} @@ -7384,7 +7374,7 @@ yydefault: } case 420: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4741 + // line internal/php7/php7.y:4732 { target := &ast.Identifier{ast.Node{}, yyDollar[3].token.Value} yyVAL.node = &ast.ExprClassConstFetch{ast.Node{}, yyDollar[1].node, target} @@ -7402,7 +7392,7 @@ yydefault: } case 421: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4760 + // line internal/php7/php7.y:4751 { yyVAL.node = yyDollar[1].node @@ -7410,7 +7400,7 @@ yydefault: } case 422: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4766 + // line internal/php7/php7.y:4757 { yyVAL.node = yyDollar[1].node @@ -7418,7 +7408,7 @@ yydefault: } case 423: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:4775 + // line internal/php7/php7.y:4766 { yyVAL.node = nil @@ -7426,7 +7416,7 @@ yydefault: } case 424: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4781 + // line internal/php7/php7.y:4772 { yyVAL.node = yyDollar[1].node @@ -7434,7 +7424,7 @@ yydefault: } case 425: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4790 + // line internal/php7/php7.y:4781 { yyVAL.node = yyDollar[1].node @@ -7442,7 +7432,7 @@ yydefault: } case 426: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4799 + // line internal/php7/php7.y:4790 { yyVAL.node = yyDollar[1].node @@ -7450,7 +7440,7 @@ yydefault: } case 427: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4805 + // line internal/php7/php7.y:4796 { yyVAL.node = yyDollar[2].node @@ -7462,7 +7452,7 @@ yydefault: } case 428: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4815 + // line internal/php7/php7.y:4806 { yyVAL.node = yyDollar[1].node @@ -7470,7 +7460,7 @@ yydefault: } case 429: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4824 + // line internal/php7/php7.y:4815 { yyVAL.node = yyDollar[1].node @@ -7478,7 +7468,7 @@ yydefault: } case 430: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4830 + // line internal/php7/php7.y:4821 { yyVAL.node = yyDollar[2].node @@ -7490,7 +7480,7 @@ yydefault: } case 431: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4840 + // line internal/php7/php7.y:4831 { yyVAL.node = yyDollar[1].node @@ -7498,7 +7488,7 @@ yydefault: } case 432: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4849 + // line internal/php7/php7.y:4840 { yyVAL.node = yyDollar[1].node @@ -7506,7 +7496,7 @@ yydefault: } case 433: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4855 + // line internal/php7/php7.y:4846 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7522,7 +7512,7 @@ yydefault: } case 434: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4869 + // line internal/php7/php7.y:4860 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7538,7 +7528,7 @@ yydefault: } case 435: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4883 + // line internal/php7/php7.y:4874 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7554,7 +7544,7 @@ yydefault: } case 436: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4897 + // line internal/php7/php7.y:4888 { yyVAL.node = &ast.ExprMethodCall{ast.Node{}, yyDollar[1].node, yyDollar[3].node, yyDollar[4].node.(*ast.ArgumentList)} @@ -7569,7 +7559,7 @@ yydefault: } case 437: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4910 + // line internal/php7/php7.y:4901 { yyVAL.node = yyDollar[1].node @@ -7577,7 +7567,7 @@ yydefault: } case 438: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4919 + // line internal/php7/php7.y:4910 { yyVAL.node = yyDollar[1].node @@ -7585,7 +7575,7 @@ yydefault: } case 439: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4925 + // line internal/php7/php7.y:4916 { yyVAL.node = yyDollar[1].node @@ -7593,7 +7583,7 @@ yydefault: } case 440: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4931 + // line internal/php7/php7.y:4922 { yyVAL.node = &ast.ExprPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7608,7 +7598,7 @@ yydefault: } case 441: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:4947 + // line internal/php7/php7.y:4938 { name := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} @@ -7625,7 +7615,7 @@ yydefault: } case 442: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:4962 + // line internal/php7/php7.y:4953 { yyVAL.node = &ast.ExprVariable{ast.Node{}, yyDollar[3].node} @@ -7642,7 +7632,7 @@ yydefault: } case 443: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:4977 + // line internal/php7/php7.y:4968 { yyVAL.node = &ast.ExprVariable{ast.Node{}, yyDollar[2].node} @@ -7657,7 +7647,7 @@ yydefault: } case 444: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:4993 + // line internal/php7/php7.y:4984 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7672,7 +7662,7 @@ yydefault: } case 445: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5006 + // line internal/php7/php7.y:4997 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7687,7 +7677,7 @@ yydefault: } case 446: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5022 + // line internal/php7/php7.y:5013 { yyVAL.node = yyDollar[1].node @@ -7695,7 +7685,7 @@ yydefault: } case 447: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5028 + // line internal/php7/php7.y:5019 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7711,7 +7701,7 @@ yydefault: } case 448: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5042 + // line internal/php7/php7.y:5033 { yyVAL.node = &ast.ExprArrayDimFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7727,7 +7717,7 @@ yydefault: } case 449: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5056 + // line internal/php7/php7.y:5047 { yyVAL.node = &ast.ExprPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7742,7 +7732,7 @@ yydefault: } case 450: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5069 + // line internal/php7/php7.y:5060 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7757,7 +7747,7 @@ yydefault: } case 451: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5082 + // line internal/php7/php7.y:5073 { yyVAL.node = &ast.ExprStaticPropertyFetch{ast.Node{}, yyDollar[1].node, yyDollar[3].node} @@ -7772,7 +7762,7 @@ yydefault: } case 452: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5098 + // line internal/php7/php7.y:5089 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -7786,7 +7776,7 @@ yydefault: } case 453: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5110 + // line internal/php7/php7.y:5101 { yyVAL.node = yyDollar[2].node @@ -7798,7 +7788,7 @@ yydefault: } case 454: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5120 + // line internal/php7/php7.y:5111 { yyVAL.node = yyDollar[1].node @@ -7806,7 +7796,7 @@ yydefault: } case 455: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5129 + // line internal/php7/php7.y:5120 { yyVAL.node = &ast.Identifier{ast.Node{}, yyDollar[1].token.Value} @@ -7820,7 +7810,7 @@ yydefault: } case 456: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5141 + // line internal/php7/php7.y:5132 { yyVAL.node = yyDollar[2].node @@ -7832,7 +7822,7 @@ yydefault: } case 457: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5151 + // line internal/php7/php7.y:5142 { yyVAL.node = yyDollar[1].node @@ -7840,7 +7830,7 @@ yydefault: } case 458: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5160 + // line internal/php7/php7.y:5151 { yyVAL.list = yyDollar[1].list @@ -7848,7 +7838,7 @@ yydefault: } case 459: yyDollar = yyS[yypt-0 : yypt+1] - // line internal/php7/php7.y:5169 + // line internal/php7/php7.y:5160 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, nil} @@ -7856,7 +7846,7 @@ yydefault: } case 460: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5175 + // line internal/php7/php7.y:5166 { yyVAL.node = yyDollar[1].node @@ -7864,7 +7854,7 @@ yydefault: } case 461: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5184 + // line internal/php7/php7.y:5175 { if len(yyDollar[1].list) == 0 { yyDollar[1].list = []ast.Vertex{&ast.ExprArrayItem{ast.Node{}, false, nil, nil}} @@ -7879,7 +7869,7 @@ yydefault: } case 462: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5197 + // line internal/php7/php7.y:5188 { if yyDollar[1].node.(*ast.ExprArrayItem).Key == nil && yyDollar[1].node.(*ast.ExprArrayItem).Val == nil { yyVAL.list = []ast.Vertex{} @@ -7891,7 +7881,7 @@ yydefault: } case 463: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5210 + // line internal/php7/php7.y:5201 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, yyDollar[3].node} @@ -7906,7 +7896,7 @@ yydefault: } case 464: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5223 + // line internal/php7/php7.y:5214 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, yyDollar[1].node} @@ -7920,7 +7910,7 @@ yydefault: } case 465: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5235 + // line internal/php7/php7.y:5226 { reference := &ast.ExprReference{ast.Node{}, yyDollar[4].node} yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, yyDollar[1].node, reference} @@ -7938,7 +7928,7 @@ yydefault: } case 466: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5251 + // line internal/php7/php7.y:5242 { reference := &ast.ExprReference{ast.Node{}, yyDollar[2].node} yyVAL.node = &ast.ExprArrayItem{ast.Node{}, false, nil, reference} @@ -7954,7 +7944,7 @@ yydefault: } case 467: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5265 + // line internal/php7/php7.y:5256 { yyVAL.node = &ast.ExprArrayItem{ast.Node{}, true, nil, yyDollar[2].node} @@ -7968,7 +7958,7 @@ yydefault: } case 468: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:5277 + // line internal/php7/php7.y:5268 { // TODO: Cannot use list() as standalone expression listNode := &ast.ExprList{ast.Node{}, yyDollar[5].list} @@ -7989,7 +7979,7 @@ yydefault: } case 469: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5296 + // line internal/php7/php7.y:5287 { // TODO: Cannot use list() as standalone expression listNode := &ast.ExprList{ast.Node{}, yyDollar[3].list} @@ -8008,7 +7998,7 @@ yydefault: } case 470: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5316 + // line internal/php7/php7.y:5307 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) @@ -8016,7 +8006,7 @@ yydefault: } case 471: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5322 + // line internal/php7/php7.y:5313 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[2].token.Value} yyVAL.list = append(yyDollar[1].list, encapsed) @@ -8031,7 +8021,7 @@ yydefault: } case 472: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5335 + // line internal/php7/php7.y:5326 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -8039,7 +8029,7 @@ yydefault: } case 473: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5341 + // line internal/php7/php7.y:5332 { encapsed := &ast.ScalarEncapsedStringPart{ast.Node{}, yyDollar[1].token.Value} yyVAL.list = []ast.Vertex{encapsed, yyDollar[2].node} @@ -8054,7 +8044,7 @@ yydefault: } case 474: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5357 + // line internal/php7/php7.y:5348 { name := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, name} @@ -8071,7 +8061,7 @@ yydefault: } case 475: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5372 + // line internal/php7/php7.y:5363 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -8091,7 +8081,7 @@ yydefault: } case 476: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5390 + // line internal/php7/php7.y:5381 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -8113,7 +8103,7 @@ yydefault: } case 477: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5410 + // line internal/php7/php7.y:5401 { variable := &ast.ExprVariable{ast.Node{}, yyDollar[2].node} @@ -8130,7 +8120,7 @@ yydefault: } case 478: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5425 + // line internal/php7/php7.y:5416 { name := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} variable := &ast.ExprVariable{ast.Node{}, name} @@ -8149,7 +8139,7 @@ yydefault: } case 479: yyDollar = yyS[yypt-6 : yypt+1] - // line internal/php7/php7.y:5442 + // line internal/php7/php7.y:5433 { identifier := &ast.Identifier{ast.Node{}, yyDollar[2].token.Value} variable := &ast.ExprVariable{ast.Node{}, identifier} @@ -8170,7 +8160,7 @@ yydefault: } case 480: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5461 + // line internal/php7/php7.y:5452 { yyVAL.node = yyDollar[2].node @@ -8182,7 +8172,7 @@ yydefault: } case 481: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5474 + // line internal/php7/php7.y:5465 { yyVAL.node = &ast.ScalarString{ast.Node{}, yyDollar[1].token.Value} @@ -8196,7 +8186,7 @@ yydefault: } case 482: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5486 + // line internal/php7/php7.y:5477 { // TODO: add option to handle 64 bit integer if _, err := strconv.Atoi(string(yyDollar[1].token.Value)); err == nil { @@ -8215,7 +8205,7 @@ yydefault: } case 483: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5503 + // line internal/php7/php7.y:5494 { var lnumber *ast.ScalarLnumber // TODO: add option to handle 64 bit integer @@ -8243,7 +8233,7 @@ yydefault: } case 484: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5529 + // line internal/php7/php7.y:5520 { identifier := &ast.Identifier{ast.Node{}, bytes.TrimLeftFunc(yyDollar[1].token.Value, isDollar)} yyVAL.node = &ast.ExprVariable{ast.Node{}, identifier} @@ -8260,7 +8250,7 @@ yydefault: } case 485: yyDollar = yyS[yypt-5 : yypt+1] - // line internal/php7/php7.y:5547 + // line internal/php7/php7.y:5538 { yyVAL.node = &ast.ExprIsset{ast.Node{}, yyDollar[3].list} @@ -8280,7 +8270,7 @@ yydefault: } case 486: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5565 + // line internal/php7/php7.y:5556 { yyVAL.node = &ast.ExprEmpty{ast.Node{}, yyDollar[3].node} @@ -8296,7 +8286,7 @@ yydefault: } case 487: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5579 + // line internal/php7/php7.y:5570 { yyVAL.node = &ast.ExprInclude{ast.Node{}, yyDollar[2].node} @@ -8310,7 +8300,7 @@ yydefault: } case 488: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5591 + // line internal/php7/php7.y:5582 { yyVAL.node = &ast.ExprIncludeOnce{ast.Node{}, yyDollar[2].node} @@ -8324,7 +8314,7 @@ yydefault: } case 489: yyDollar = yyS[yypt-4 : yypt+1] - // line internal/php7/php7.y:5603 + // line internal/php7/php7.y:5594 { yyVAL.node = &ast.ExprEval{ast.Node{}, yyDollar[3].node} @@ -8340,7 +8330,7 @@ yydefault: } case 490: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5617 + // line internal/php7/php7.y:5608 { yyVAL.node = &ast.ExprRequire{ast.Node{}, yyDollar[2].node} @@ -8354,7 +8344,7 @@ yydefault: } case 491: yyDollar = yyS[yypt-2 : yypt+1] - // line internal/php7/php7.y:5629 + // line internal/php7/php7.y:5620 { yyVAL.node = &ast.ExprRequireOnce{ast.Node{}, yyDollar[2].node} @@ -8368,7 +8358,7 @@ yydefault: } case 492: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5644 + // line internal/php7/php7.y:5635 { yyVAL.list = []ast.Vertex{yyDollar[1].node} @@ -8376,7 +8366,7 @@ yydefault: } case 493: yyDollar = yyS[yypt-3 : yypt+1] - // line internal/php7/php7.y:5650 + // line internal/php7/php7.y:5641 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) @@ -8387,7 +8377,7 @@ yydefault: } case 494: yyDollar = yyS[yypt-1 : yypt+1] - // line internal/php7/php7.y:5662 + // line internal/php7/php7.y:5653 { yyVAL.node = yyDollar[1].node diff --git a/internal/php7/php7.y b/internal/php7/php7.y index 7515ba9..a929753 100644 --- a/internal/php7/php7.y +++ b/internal/php7/php7.y @@ -16,7 +16,6 @@ import ( node ast.Vertex token *scanner.Token list []ast.Vertex - str string ClassExtends *ast.StmtClassExtends ClassImplements *ast.StmtClassImplements @@ -285,8 +284,6 @@ import ( %type 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 b1cf6d3..185e7a9 100644 --- a/internal/scanner/scanner.go +++ b/internal/scanner/scanner.go @@ -3357,7 +3357,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr14: - // line internal/scanner/scanner.rl:361 + // line internal/scanner/scanner.rl:360 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3370,7 +3370,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr18: - // line internal/scanner/scanner.rl:384 + // line internal/scanner/scanner.rl:383 (lex.p) = (lex.te) - 1 { c := lex.data[lex.p] @@ -3378,7 +3378,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr22: - // line internal/scanner/scanner.rl:346 + // line internal/scanner/scanner.rl:345 (lex.p) = (lex.te) - 1 { // rune, _ := utf8.DecodeRune(lex.data[lex.ts:lex.te]); @@ -3519,7 +3519,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) @@ -3586,7 +3585,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto _again tr127: - // line internal/scanner/scanner.rl:357 + // line internal/scanner/scanner.rl:356 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -3625,7 +3624,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr180: - // line internal/scanner/scanner.rl:384 + // line internal/scanner/scanner.rl:383 lex.te = (lex.p) + 1 { c := lex.data[lex.p] @@ -3633,7 +3632,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr191: - // line internal/scanner/scanner.rl:346 + // line internal/scanner/scanner.rl:345 lex.te = (lex.p) + 1 { // rune, _ := utf8.DecodeRune(lex.data[lex.ts:lex.te]); @@ -3662,7 +3661,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st121 tr228: lex.cs = 121 - // line internal/scanner/scanner.rl:381 + // line internal/scanner/scanner.rl:380 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3675,7 +3674,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto _again tr229: - // line internal/scanner/scanner.rl:354 + // line internal/scanner/scanner.rl:353 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -3685,13 +3684,12 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr231: - // line internal/scanner/scanner.rl:355 + // line internal/scanner/scanner.rl:354 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) tok = TokenID(int('}')) lex.ret(1) - lex.PhpDocComment = "" goto _out } goto st121 @@ -3714,7 +3712,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr238: - // line internal/scanner/scanner.rl:384 + // line internal/scanner/scanner.rl:383 lex.te = (lex.p) (lex.p)-- { @@ -3723,7 +3721,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr239: - // line internal/scanner/scanner.rl:346 + // line internal/scanner/scanner.rl:345 lex.te = (lex.p) (lex.p)-- { @@ -3767,7 +3765,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st121 tr243: lex.cs = 121 - // line internal/scanner/scanner.rl:382 + // line internal/scanner/scanner.rl:381 lex.te = (lex.p) (lex.p)-- { @@ -3801,7 +3799,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr250: - // line internal/scanner/scanner.rl:356 + // line internal/scanner/scanner.rl:355 lex.te = (lex.p) (lex.p)-- { @@ -3947,7 +3945,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st121 tr262: lex.cs = 121 - // line internal/scanner/scanner.rl:359 + // line internal/scanner/scanner.rl:358 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -4174,7 +4172,7 @@ func (lex *Lexer) Lex(lval Lval) int { lex.cs = 121 // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:367 + // line internal/scanner/scanner.rl:366 lex.te = (lex.p) (lex.p)-- { @@ -4362,7 +4360,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st121 tr303: - // line internal/scanner/scanner.rl:357 + // line internal/scanner/scanner.rl:356 lex.te = (lex.p) (lex.p)-- { @@ -4523,7 +4521,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:3387 + // line internal/scanner/scanner.go:3386 switch lex.data[(lex.p)] { case 10: goto tr10 @@ -4716,7 +4714,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof122 } st_case_122: - // line internal/scanner/scanner.go:3580 + // line internal/scanner/scanner.go:3579 switch lex.data[(lex.p)] { case 10: goto tr10 @@ -4746,7 +4744,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof123 } st_case_123: - // line internal/scanner/scanner.go:3610 + // line internal/scanner/scanner.go:3609 switch lex.data[(lex.p)] { case 10: goto tr236 @@ -4768,7 +4766,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof6 } st_case_6: - // line internal/scanner/scanner.go:3632 + // line internal/scanner/scanner.go:3631 if lex.data[(lex.p)] == 10 { goto tr10 } @@ -4804,7 +4802,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:382 + // line internal/scanner/scanner.rl:381 lex.act = 140 goto st127 st127: @@ -4812,7 +4810,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof127 } st_case_127: - // line internal/scanner/scanner.go:3676 + // line internal/scanner/scanner.go:3675 switch lex.data[(lex.p)] { case 10: goto tr13 @@ -4845,7 +4843,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof7 } st_case_7: - // line internal/scanner/scanner.go:3709 + // line internal/scanner/scanner.go:3708 switch lex.data[(lex.p)] { case 10: goto tr13 @@ -4930,7 +4928,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof128 } st_case_128: - // line internal/scanner/scanner.go:3794 + // line internal/scanner/scanner.go:3793 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -4985,7 +4983,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof129 } st_case_129: - // line internal/scanner/scanner.go:3849 + // line internal/scanner/scanner.go:3848 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -5109,7 +5107,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof134 } st_case_134: - // line internal/scanner/scanner.go:3973 + // line internal/scanner/scanner.go:3972 switch lex.data[(lex.p)] { case 10: goto tr20 @@ -5138,7 +5136,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof11 } st_case_11: - // line internal/scanner/scanner.go:4002 + // line internal/scanner/scanner.go:4001 switch lex.data[(lex.p)] { case 10: goto tr20 @@ -5172,7 +5170,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof135 } st_case_135: - // line internal/scanner/scanner.go:4036 + // line internal/scanner/scanner.go:4035 switch lex.data[(lex.p)] { case 9: goto st13 @@ -6020,7 +6018,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof140 } st_case_140: - // line internal/scanner/scanner.go:4884 + // line internal/scanner/scanner.go:4883 switch lex.data[(lex.p)] { case 46: goto st67 @@ -6052,7 +6050,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof141 } st_case_141: - // line internal/scanner/scanner.go:4916 + // line internal/scanner/scanner.go:4915 switch lex.data[(lex.p)] { case 69: goto st68 @@ -6101,7 +6099,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof142 } st_case_142: - // line internal/scanner/scanner.go:4965 + // line internal/scanner/scanner.go:4964 if lex.data[(lex.p)] == 95 { goto st69 } @@ -6128,7 +6126,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof143 } st_case_143: - // line internal/scanner/scanner.go:4992 + // line internal/scanner/scanner.go:4991 switch lex.data[(lex.p)] { case 42: goto st71 @@ -6147,7 +6145,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof71 } st_case_71: - // line internal/scanner/scanner.go:5011 + // line internal/scanner/scanner.go:5010 switch lex.data[(lex.p)] { case 10: goto st72 @@ -6164,7 +6162,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof72 } st_case_72: - // line internal/scanner/scanner.go:5028 + // line internal/scanner/scanner.go:5027 switch lex.data[(lex.p)] { case 10: goto tr93 @@ -6181,7 +6179,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof73 } st_case_73: - // line internal/scanner/scanner.go:5045 + // line internal/scanner/scanner.go:5044 switch lex.data[(lex.p)] { case 10: goto st72 @@ -6203,7 +6201,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof144 } st_case_144: - // line internal/scanner/scanner.go:5067 + // line internal/scanner/scanner.go:5066 switch lex.data[(lex.p)] { case 46: goto tr270 @@ -6234,7 +6232,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof145 } st_case_145: - // line internal/scanner/scanner.go:5098 + // line internal/scanner/scanner.go:5097 switch lex.data[(lex.p)] { case 69: goto st68 @@ -6257,7 +6255,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof146 } st_case_146: - // line internal/scanner/scanner.go:5121 + // line internal/scanner/scanner.go:5120 switch lex.data[(lex.p)] { case 46: goto tr270 @@ -6302,7 +6300,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof147 } st_case_147: - // line internal/scanner/scanner.go:5166 + // line internal/scanner/scanner.go:5165 if lex.data[(lex.p)] == 95 { goto st75 } @@ -6340,7 +6338,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof148 } st_case_148: - // line internal/scanner/scanner.go:5204 + // line internal/scanner/scanner.go:5203 if lex.data[(lex.p)] == 95 { goto st76 } @@ -6376,7 +6374,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof150 } st_case_150: - // line internal/scanner/scanner.go:5240 + // line internal/scanner/scanner.go:5239 switch lex.data[(lex.p)] { case 10: goto st78 @@ -6400,7 +6398,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof77 } st_case_77: - // line internal/scanner/scanner.go:5264 + // line internal/scanner/scanner.go:5263 switch lex.data[(lex.p)] { case 10: goto st78 @@ -6424,7 +6422,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof78 } st_case_78: - // line internal/scanner/scanner.go:5288 + // line internal/scanner/scanner.go:5287 switch lex.data[(lex.p)] { case 10: goto tr105 @@ -6448,7 +6446,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof79 } st_case_79: - // line internal/scanner/scanner.go:5312 + // line internal/scanner/scanner.go:5311 if lex.data[(lex.p)] == 10 { goto st78 } @@ -6462,7 +6460,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof80 } st_case_80: - // line internal/scanner/scanner.go:5326 + // line internal/scanner/scanner.go:5325 if lex.data[(lex.p)] == 62 { goto tr108 } @@ -6477,7 +6475,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof151 } st_case_151: - // line internal/scanner/scanner.go:5341 + // line internal/scanner/scanner.go:5340 switch lex.data[(lex.p)] { case 10: goto st152 @@ -6526,7 +6524,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof154 } st_case_154: - // line internal/scanner/scanner.go:5390 + // line internal/scanner/scanner.go:5389 switch lex.data[(lex.p)] { case 60: goto st82 @@ -6594,7 +6592,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof84 } st_case_84: - // line internal/scanner/scanner.go:5458 + // line internal/scanner/scanner.go:5457 switch lex.data[(lex.p)] { case 34: goto tr116 @@ -6628,7 +6626,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof85 } st_case_85: - // line internal/scanner/scanner.go:5492 + // line internal/scanner/scanner.go:5491 switch lex.data[(lex.p)] { case 10: goto st155 @@ -6645,7 +6643,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof155 } st_case_155: - // line internal/scanner/scanner.go:5509 + // line internal/scanner/scanner.go:5508 goto tr285 tr123: // line internal/scanner/scanner.rl:46 @@ -6656,7 +6654,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof86 } st_case_86: - // line internal/scanner/scanner.go:5520 + // line internal/scanner/scanner.go:5519 if lex.data[(lex.p)] == 10 { goto st155 } @@ -6691,7 +6689,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof88 } st_case_88: - // line internal/scanner/scanner.go:5555 + // line internal/scanner/scanner.go:5554 switch lex.data[(lex.p)] { case 39: goto tr116 @@ -6725,7 +6723,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof89 } st_case_89: - // line internal/scanner/scanner.go:5589 + // line internal/scanner/scanner.go:5588 switch lex.data[(lex.p)] { case 10: goto tr122 @@ -6825,7 +6823,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof162 } st_case_162: - // line internal/scanner/scanner.go:5689 + // line internal/scanner/scanner.go:5688 switch lex.data[(lex.p)] { case 10: goto st163 @@ -6904,7 +6902,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:357 + // line internal/scanner/scanner.rl:356 lex.act = 135 goto st166 tr307: @@ -7395,7 +7393,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof166 } st_case_166: - // line internal/scanner/scanner.go:6259 + // line internal/scanner/scanner.go:6258 if lex.data[(lex.p)] == 96 { goto tr11 } @@ -7731,7 +7729,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:357 + // line internal/scanner/scanner.rl:356 lex.act = 135 goto st177 st177: @@ -7739,7 +7737,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof177 } st_case_177: - // line internal/scanner/scanner.go:6603 + // line internal/scanner/scanner.go:6602 switch lex.data[(lex.p)] { case 34: goto st7 @@ -14733,7 +14731,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof397 } st_case_397: - // line internal/scanner/scanner.go:13597 + // line internal/scanner/scanner.go:13596 switch lex.data[(lex.p)] { case 10: goto st94 @@ -14784,7 +14782,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof93 } st_case_93: - // line internal/scanner/scanner.go:13648 + // line internal/scanner/scanner.go:13647 switch lex.data[(lex.p)] { case 10: goto st94 @@ -14810,7 +14808,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof94 } st_case_94: - // line internal/scanner/scanner.go:13674 + // line internal/scanner/scanner.go:13673 switch lex.data[(lex.p)] { case 10: goto tr135 @@ -14836,7 +14834,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof95 } st_case_95: - // line internal/scanner/scanner.go:13700 + // line internal/scanner/scanner.go:13699 if lex.data[(lex.p)] == 10 { goto st94 } @@ -14850,7 +14848,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof96 } st_case_96: - // line internal/scanner/scanner.go:13714 + // line internal/scanner/scanner.go:13713 switch lex.data[(lex.p)] { case 82: goto st97 @@ -16954,14 +16952,14 @@ func (lex *Lexer) Lex(lval Lval) int { } goto tr239 tr141: - // line internal/scanner/scanner.rl:391 + // line internal/scanner/scanner.rl:390 (lex.p) = (lex.te) - 1 { lex.addToken(T_WHITESPACE, lex.ts, lex.te) } goto st468 tr663: - // line internal/scanner/scanner.rl:394 + // line internal/scanner/scanner.rl:393 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -16971,7 +16969,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st468 tr668: - // line internal/scanner/scanner.rl:391 + // line internal/scanner/scanner.rl:390 lex.te = (lex.p) (lex.p)-- { @@ -16981,7 +16979,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr670: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:391 + // line internal/scanner/scanner.rl:390 lex.te = (lex.p) (lex.p)-- { @@ -16989,7 +16987,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st468 tr674: - // line internal/scanner/scanner.rl:394 + // line internal/scanner/scanner.rl:393 lex.te = (lex.p) (lex.p)-- { @@ -17000,7 +16998,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st468 tr675: - // line internal/scanner/scanner.rl:392 + // line internal/scanner/scanner.rl:391 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17014,7 +17012,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st468 tr676: lex.cs = 468 - // line internal/scanner/scanner.rl:393 + // line internal/scanner/scanner.rl:392 lex.te = (lex.p) (lex.p)-- { @@ -17038,7 +17036,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:15870 + // line internal/scanner/scanner.go:15869 switch lex.data[(lex.p)] { case 10: goto tr142 @@ -17091,7 +17089,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof469 } st_case_469: - // line internal/scanner/scanner.go:15923 + // line internal/scanner/scanner.go:15922 switch lex.data[(lex.p)] { case 10: goto tr142 @@ -17121,7 +17119,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof470 } st_case_470: - // line internal/scanner/scanner.go:15953 + // line internal/scanner/scanner.go:15952 switch lex.data[(lex.p)] { case 10: goto tr672 @@ -17143,7 +17141,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof99 } st_case_99: - // line internal/scanner/scanner.go:15975 + // line internal/scanner/scanner.go:15974 if lex.data[(lex.p)] == 10 { goto tr142 } @@ -17221,7 +17219,7 @@ func (lex *Lexer) Lex(lval Lval) int { lex.cs = 474 // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:398 + // line internal/scanner/scanner.rl:397 lex.te = (lex.p) (lex.p)-- { @@ -17248,7 +17246,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:16069 + // line internal/scanner/scanner.go:16068 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17302,7 +17300,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:398 + // line internal/scanner/scanner.rl:397 lex.act = 146 goto st475 tr681: @@ -17311,7 +17309,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:398 + // line internal/scanner/scanner.rl:397 lex.act = 146 goto st475 st475: @@ -17319,7 +17317,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof475 } st_case_475: - // line internal/scanner/scanner.go:16140 + // line internal/scanner/scanner.go:16139 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17374,7 +17372,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof476 } st_case_476: - // line internal/scanner/scanner.go:16195 + // line internal/scanner/scanner.go:16194 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17421,7 +17419,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto tr680 tr143: - // line internal/scanner/scanner.rl:407 + // line internal/scanner/scanner.rl:406 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -17432,7 +17430,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st477 tr689: - // line internal/scanner/scanner.rl:409 + // line internal/scanner/scanner.rl:408 lex.te = (lex.p) (lex.p)-- { @@ -17448,7 +17446,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st477 tr690: - // line internal/scanner/scanner.rl:408 + // line internal/scanner/scanner.rl:407 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17500,7 +17498,7 @@ func (lex *Lexer) Lex(lval Lval) int { lex.cs = 477 // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:410 + // line internal/scanner/scanner.rl:409 lex.te = (lex.p) (lex.p)-- { @@ -17518,7 +17516,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr696: lex.cs = 477 - // line internal/scanner/scanner.rl:410 + // line internal/scanner/scanner.rl:409 lex.te = (lex.p) (lex.p)-- { @@ -17545,7 +17543,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:16324 + // line internal/scanner/scanner.go:16323 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17622,7 +17620,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:410 + // line internal/scanner/scanner.rl:409 lex.act = 150 goto st479 tr693: @@ -17631,21 +17629,21 @@ func (lex *Lexer) Lex(lval Lval) int { // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:410 + // line internal/scanner/scanner.rl:409 lex.act = 150 goto st479 tr695: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:408 + // line internal/scanner/scanner.rl:407 lex.act = 148 goto st479 tr697: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:407 + // line internal/scanner/scanner.rl:406 lex.act = 147 goto st479 st479: @@ -17653,7 +17651,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof479 } st_case_479: - // line internal/scanner/scanner.go:16432 + // line internal/scanner/scanner.go:16431 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17708,7 +17706,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof480 } st_case_480: - // line internal/scanner/scanner.go:16487 + // line internal/scanner/scanner.go:16486 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -17865,7 +17863,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto tr696 tr145: - // line internal/scanner/scanner.rl:422 + // line internal/scanner/scanner.rl:421 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -17877,7 +17875,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st483 tr699: lex.cs = 483 - // line internal/scanner/scanner.rl:425 + // line internal/scanner/scanner.rl:424 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17890,7 +17888,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto _again tr706: - // line internal/scanner/scanner.rl:424 + // line internal/scanner/scanner.rl:423 lex.te = (lex.p) (lex.p)-- { @@ -17906,7 +17904,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st483 tr707: - // line internal/scanner/scanner.rl:423 + // line internal/scanner/scanner.rl:422 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -17964,7 +17962,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr709: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:426 + // line internal/scanner/scanner.rl:425 lex.te = (lex.p) (lex.p)-- { @@ -17978,7 +17976,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st483 tr713: - // line internal/scanner/scanner.rl:426 + // line internal/scanner/scanner.rl:425 lex.te = (lex.p) (lex.p)-- { @@ -18002,7 +18000,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:16721 + // line internal/scanner/scanner.go:16720 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18083,14 +18081,14 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:426 + // line internal/scanner/scanner.rl:425 lex.act = 155 goto st485 tr704: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:425 + // line internal/scanner/scanner.rl:424 lex.act = 154 goto st485 tr710: @@ -18099,21 +18097,21 @@ func (lex *Lexer) Lex(lval Lval) int { // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:426 + // line internal/scanner/scanner.rl:425 lex.act = 155 goto st485 tr712: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:423 + // line internal/scanner/scanner.rl:422 lex.act = 152 goto st485 tr714: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:422 + // line internal/scanner/scanner.rl:421 lex.act = 151 goto st485 st485: @@ -18121,7 +18119,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof485 } st_case_485: - // line internal/scanner/scanner.go:16840 + // line internal/scanner/scanner.go:16839 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18176,7 +18174,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof486 } st_case_486: - // line internal/scanner/scanner.go:16895 + // line internal/scanner/scanner.go:16894 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18333,7 +18331,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto tr713 tr146: - // line internal/scanner/scanner.rl:434 + // line internal/scanner/scanner.rl:433 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -18345,7 +18343,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st489 tr715: lex.cs = 489 - // line internal/scanner/scanner.rl:437 + // line internal/scanner/scanner.rl:436 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -18358,7 +18356,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto _again tr723: - // line internal/scanner/scanner.rl:436 + // line internal/scanner/scanner.rl:435 lex.te = (lex.p) (lex.p)-- { @@ -18374,7 +18372,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st489 tr724: - // line internal/scanner/scanner.rl:435 + // line internal/scanner/scanner.rl:434 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -18432,7 +18430,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr726: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:438 + // line internal/scanner/scanner.rl:437 lex.te = (lex.p) (lex.p)-- { @@ -18446,7 +18444,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st489 tr730: - // line internal/scanner/scanner.rl:438 + // line internal/scanner/scanner.rl:437 lex.te = (lex.p) (lex.p)-- { @@ -18470,7 +18468,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17129 + // line internal/scanner/scanner.go:17128 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18551,14 +18549,14 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:438 + // line internal/scanner/scanner.rl:437 lex.act = 160 goto st491 tr720: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:437 + // line internal/scanner/scanner.rl:436 lex.act = 159 goto st491 tr727: @@ -18567,21 +18565,21 @@ func (lex *Lexer) Lex(lval Lval) int { // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:438 + // line internal/scanner/scanner.rl:437 lex.act = 160 goto st491 tr729: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:435 + // line internal/scanner/scanner.rl:434 lex.act = 157 goto st491 tr731: // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:434 + // line internal/scanner/scanner.rl:433 lex.act = 156 goto st491 st491: @@ -18589,7 +18587,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof491 } st_case_491: - // line internal/scanner/scanner.go:17248 + // line internal/scanner/scanner.go:17247 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18644,7 +18642,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof492 } st_case_492: - // line internal/scanner/scanner.go:17303 + // line internal/scanner/scanner.go:17302 _widec = int16(lex.data[(lex.p)]) switch { case lex.data[(lex.p)] < 11: @@ -18802,7 +18800,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto tr730 tr733: lex.cs = 495 - // line internal/scanner/scanner.rl:446 + // line internal/scanner/scanner.rl:445 lex.te = (lex.p) (lex.p)-- { @@ -18826,7 +18824,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17482 + // line internal/scanner/scanner.go:17481 if lex.data[(lex.p)] == 96 { goto st0 } @@ -18870,7 +18868,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st496 tr147: - // line internal/scanner/scanner.rl:465 + // line internal/scanner/scanner.rl:464 (lex.p) = (lex.te) - 1 { lex.ungetCnt(1) @@ -18882,7 +18880,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st497 tr148: - // line internal/scanner/scanner.rl:462 + // line internal/scanner/scanner.rl:461 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -18896,7 +18894,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st497 tr734: - // line internal/scanner/scanner.rl:465 + // line internal/scanner/scanner.rl:464 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -18908,7 +18906,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st497 tr738: - // line internal/scanner/scanner.rl:464 + // line internal/scanner/scanner.rl:463 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -18918,7 +18916,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st497 tr739: - // line internal/scanner/scanner.rl:465 + // line internal/scanner/scanner.rl:464 lex.te = (lex.p) (lex.p)-- { @@ -18931,7 +18929,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st497 tr741: - // line internal/scanner/scanner.rl:461 + // line internal/scanner/scanner.rl:460 lex.te = (lex.p) (lex.p)-- { @@ -18945,7 +18943,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st497 tr743: - // line internal/scanner/scanner.rl:463 + // line internal/scanner/scanner.rl:462 lex.te = (lex.p) (lex.p)-- { @@ -18969,7 +18967,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17574 + // line internal/scanner/scanner.go:17573 switch lex.data[(lex.p)] { case 36: goto st498 @@ -19050,7 +19048,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof500 } st_case_500: - // line internal/scanner/scanner.go:17655 + // line internal/scanner/scanner.go:17654 if lex.data[(lex.p)] == 62 { goto st103 } @@ -19103,7 +19101,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st501 tr149: - // line internal/scanner/scanner.rl:469 + // line internal/scanner/scanner.rl:468 (lex.p) = (lex.te) - 1 { lex.setTokenPosition(token) @@ -19116,7 +19114,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr744: - // line internal/scanner/scanner.rl:475 + // line internal/scanner/scanner.rl:474 lex.te = (lex.p) + 1 { c := lex.data[lex.p] @@ -19124,7 +19122,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr745: - // line internal/scanner/scanner.rl:472 + // line internal/scanner/scanner.rl:471 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19134,7 +19132,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr748: - // line internal/scanner/scanner.rl:473 + // line internal/scanner/scanner.rl:472 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19147,7 +19145,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr752: - // line internal/scanner/scanner.rl:474 + // line internal/scanner/scanner.rl:473 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19159,7 +19157,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr753: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:472 + // line internal/scanner/scanner.rl:471 lex.te = (lex.p) (lex.p)-- { @@ -19170,7 +19168,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr754: - // line internal/scanner/scanner.rl:475 + // line internal/scanner/scanner.rl:474 lex.te = (lex.p) (lex.p)-- { @@ -19179,7 +19177,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr755: - // line internal/scanner/scanner.rl:473 + // line internal/scanner/scanner.rl:472 lex.te = (lex.p) (lex.p)-- { @@ -19193,7 +19191,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr757: - // line internal/scanner/scanner.rl:470 + // line internal/scanner/scanner.rl:469 lex.te = (lex.p) (lex.p)-- { @@ -19207,7 +19205,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr758: - // line internal/scanner/scanner.rl:469 + // line internal/scanner/scanner.rl:468 lex.te = (lex.p) (lex.p)-- { @@ -19221,7 +19219,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st502 tr762: - // line internal/scanner/scanner.rl:471 + // line internal/scanner/scanner.rl:470 lex.te = (lex.p) (lex.p)-- { @@ -19245,7 +19243,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:17787 + // line internal/scanner/scanner.go:17786 switch lex.data[(lex.p)] { case 10: goto st503 @@ -19382,7 +19380,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof507 } st_case_507: - // line internal/scanner/scanner.go:17924 + // line internal/scanner/scanner.go:17923 switch lex.data[(lex.p)] { case 95: goto st104 @@ -19405,7 +19403,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof508 } st_case_508: - // line internal/scanner/scanner.go:17947 + // line internal/scanner/scanner.go:17946 if lex.data[(lex.p)] == 95 { goto st104 } @@ -19441,7 +19439,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof509 } st_case_509: - // line internal/scanner/scanner.go:17983 + // line internal/scanner/scanner.go:17982 if lex.data[(lex.p)] == 95 { goto st105 } @@ -19477,7 +19475,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof510 } st_case_510: - // line internal/scanner/scanner.go:18019 + // line internal/scanner/scanner.go:18018 if lex.data[(lex.p)] == 95 { goto st106 } @@ -19522,7 +19520,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st511 tr153: lex.cs = 512 - // line internal/scanner/scanner.rl:483 + // line internal/scanner/scanner.rl:482 (lex.p) = (lex.te) - 1 { lex.ungetCnt(1) @@ -19531,7 +19529,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr155: lex.cs = 512 - // line internal/scanner/scanner.rl:482 + // line internal/scanner/scanner.rl:481 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19546,7 +19544,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr763: lex.cs = 512 - // line internal/scanner/scanner.rl:483 + // line internal/scanner/scanner.rl:482 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19555,7 +19553,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr765: lex.cs = 512 - // line internal/scanner/scanner.rl:483 + // line internal/scanner/scanner.rl:482 lex.te = (lex.p) (lex.p)-- { @@ -19574,7 +19572,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18098 + // line internal/scanner/scanner.go:18097 if lex.data[(lex.p)] == 96 { goto tr763 } @@ -19601,7 +19599,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof513 } st_case_513: - // line internal/scanner/scanner.go:18125 + // line internal/scanner/scanner.go:18124 switch lex.data[(lex.p)] { case 91: goto tr155 @@ -19660,7 +19658,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto st107 tr156: - // line internal/scanner/scanner.rl:487 + // line internal/scanner/scanner.rl:486 (lex.p) = (lex.te) - 1 { lex.addToken(T_WHITESPACE, lex.ts, lex.te) @@ -19668,7 +19666,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st514 tr766: lex.cs = 514 - // line internal/scanner/scanner.rl:489 + // line internal/scanner/scanner.rl:488 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19677,7 +19675,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr769: lex.cs = 514 - // line internal/scanner/scanner.rl:488 + // line internal/scanner/scanner.rl:487 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19690,7 +19688,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto _again tr770: - // line internal/scanner/scanner.rl:487 + // line internal/scanner/scanner.rl:486 lex.te = (lex.p) (lex.p)-- { @@ -19700,7 +19698,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr772: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:487 + // line internal/scanner/scanner.rl:486 lex.te = (lex.p) (lex.p)-- { @@ -19709,7 +19707,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st514 tr776: lex.cs = 514 - // line internal/scanner/scanner.rl:489 + // line internal/scanner/scanner.rl:488 lex.te = (lex.p) (lex.p)-- { @@ -19728,7 +19726,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18232 + // line internal/scanner/scanner.go:18231 switch lex.data[(lex.p)] { case 10: goto tr157 @@ -19760,7 +19758,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof515 } st_case_515: - // line internal/scanner/scanner.go:18264 + // line internal/scanner/scanner.go:18263 switch lex.data[(lex.p)] { case 10: goto tr157 @@ -19790,7 +19788,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof516 } st_case_516: - // line internal/scanner/scanner.go:18294 + // line internal/scanner/scanner.go:18293 switch lex.data[(lex.p)] { case 10: goto tr774 @@ -19812,7 +19810,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof108 } st_case_108: - // line internal/scanner/scanner.go:18316 + // line internal/scanner/scanner.go:18315 if lex.data[(lex.p)] == 10 { goto tr157 } @@ -19827,7 +19825,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto tr776 tr158: - // line internal/scanner/scanner.rl:493 + // line internal/scanner/scanner.rl:492 (lex.p) = (lex.te) - 1 { lex.addToken(T_WHITESPACE, lex.ts, lex.te) @@ -19835,7 +19833,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st518 tr777: lex.cs = 518 - // line internal/scanner/scanner.rl:495 + // line internal/scanner/scanner.rl:494 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -19844,7 +19842,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr780: lex.cs = 518 - // line internal/scanner/scanner.rl:494 + // line internal/scanner/scanner.rl:493 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -19857,7 +19855,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto _again tr781: - // line internal/scanner/scanner.rl:493 + // line internal/scanner/scanner.rl:492 lex.te = (lex.p) (lex.p)-- { @@ -19867,7 +19865,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr783: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:493 + // line internal/scanner/scanner.rl:492 lex.te = (lex.p) (lex.p)-- { @@ -19876,7 +19874,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st518 tr787: lex.cs = 518 - // line internal/scanner/scanner.rl:495 + // line internal/scanner/scanner.rl:494 lex.te = (lex.p) (lex.p)-- { @@ -19895,7 +19893,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18379 + // line internal/scanner/scanner.go:18378 switch lex.data[(lex.p)] { case 10: goto tr159 @@ -19927,7 +19925,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof519 } st_case_519: - // line internal/scanner/scanner.go:18411 + // line internal/scanner/scanner.go:18410 switch lex.data[(lex.p)] { case 10: goto tr159 @@ -19957,7 +19955,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof520 } st_case_520: - // line internal/scanner/scanner.go:18441 + // line internal/scanner/scanner.go:18440 switch lex.data[(lex.p)] { case 10: goto tr785 @@ -19979,7 +19977,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof109 } st_case_109: - // line internal/scanner/scanner.go:18463 + // line internal/scanner/scanner.go:18462 if lex.data[(lex.p)] == 10 { goto tr159 } @@ -19994,7 +19992,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto tr787 tr160: - // line internal/scanner/scanner.rl:499 + // line internal/scanner/scanner.rl:498 (lex.p) = (lex.te) - 1 { lex.addToken(T_WHITESPACE, lex.ts, lex.te) @@ -20002,7 +20000,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st522 tr788: lex.cs = 522 - // line internal/scanner/scanner.rl:501 + // line internal/scanner/scanner.rl:500 lex.te = (lex.p) + 1 { lex.ungetCnt(1) @@ -20011,7 +20009,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _again tr791: lex.cs = 522 - // line internal/scanner/scanner.rl:500 + // line internal/scanner/scanner.rl:499 lex.te = (lex.p) + 1 { lex.setTokenPosition(token) @@ -20024,7 +20022,7 @@ func (lex *Lexer) Lex(lval Lval) int { } goto _again tr792: - // line internal/scanner/scanner.rl:499 + // line internal/scanner/scanner.rl:498 lex.te = (lex.p) (lex.p)-- { @@ -20034,7 +20032,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr794: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:499 + // line internal/scanner/scanner.rl:498 lex.te = (lex.p) (lex.p)-- { @@ -20043,7 +20041,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto st522 tr798: lex.cs = 522 - // line internal/scanner/scanner.rl:501 + // line internal/scanner/scanner.rl:500 lex.te = (lex.p) (lex.p)-- { @@ -20062,7 +20060,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18526 + // line internal/scanner/scanner.go:18525 switch lex.data[(lex.p)] { case 10: goto tr161 @@ -20094,7 +20092,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof523 } st_case_523: - // line internal/scanner/scanner.go:18558 + // line internal/scanner/scanner.go:18557 switch lex.data[(lex.p)] { case 10: goto tr161 @@ -20124,7 +20122,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof524 } st_case_524: - // line internal/scanner/scanner.go:18588 + // line internal/scanner/scanner.go:18587 switch lex.data[(lex.p)] { case 10: goto tr796 @@ -20146,7 +20144,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof110 } st_case_110: - // line internal/scanner/scanner.go:18610 + // line internal/scanner/scanner.go:18609 if lex.data[(lex.p)] == 10 { goto tr161 } @@ -20180,7 +20178,7 @@ func (lex *Lexer) Lex(lval Lval) int { tr802: // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:505 + // line internal/scanner/scanner.rl:504 lex.te = (lex.p) (lex.p)-- { @@ -20201,7 +20199,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.ts = (lex.p) - // line internal/scanner/scanner.go:18657 + // line internal/scanner/scanner.go:18656 if lex.data[(lex.p)] == 10 { goto st528 } @@ -20210,7 +20208,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line NONE:1 lex.te = (lex.p) + 1 - // line internal/scanner/scanner.rl:505 + // line internal/scanner/scanner.rl:504 lex.act = 186 goto st527 tr803: @@ -20219,7 +20217,7 @@ func (lex *Lexer) Lex(lval Lval) int { // line internal/scanner/scanner.rl:64 lex.NewLines.Append(lex.p) - // line internal/scanner/scanner.rl:505 + // line internal/scanner/scanner.rl:504 lex.act = 186 goto st527 st527: @@ -20227,7 +20225,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof527 } st_case_527: - // line internal/scanner/scanner.go:18683 + // line internal/scanner/scanner.go:18682 if lex.data[(lex.p)] == 10 { goto st528 } @@ -20241,7 +20239,7 @@ func (lex *Lexer) Lex(lval Lval) int { goto _test_eof528 } st_case_528: - // line internal/scanner/scanner.go:18697 + // line internal/scanner/scanner.go:18696 if lex.data[(lex.p)] == 10 { goto tr804 } @@ -22863,7 +22861,7 @@ func (lex *Lexer) Lex(lval Lval) int { } } - // line internal/scanner/scanner.rl:509 + // line internal/scanner/scanner.rl:508 token.Hidden = lex.HiddenTokens token.Value = lex.data[lex.ts:lex.te] 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; };