From 7da7c81320f017803b878d5656cdf03cffe76ee7 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Wed, 30 Jul 2008 01:24:00 +0000 Subject: [PATCH] - Fixed BC break: The magic constants must be case-insensitive. --- Zend/zend_language_scanner.c | 361 +++++++++++++++++++++-------------- Zend/zend_language_scanner.l | 14 +- 2 files changed, 220 insertions(+), 155 deletions(-) diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 1211488925..baccf98c08 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Mon Jul 28 15:05:16 2008 */ +/* Generated by re2c 0.13.5 on Tue Jul 29 22:10:43 2008 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -5391,25 +5391,25 @@ yy388: yy390: YYDEBUG(390, *YYCURSOR); yych = *++YYCURSOR; - if (yych <= 'H') { - if (yych <= 'D') { - if (yych <= 'B') goto yy280; - if (yych <= 'C') goto yy392; - goto yy396; - } else { - if (yych == 'F') goto yy393; - if (yych <= 'G') goto yy280; - } - } else { - if (yych <= 'M') { - if (yych <= 'K') goto yy280; - if (yych <= 'L') goto yy395; - goto yy394; - } else { - if (yych <= 'N') goto yy397; - if (yych != 'h') goto yy280; - } + YYDEBUG(-1, yych); + switch (yych) { + case 'C': + case 'c': goto yy392; + case 'D': + case 'd': goto yy396; + case 'F': + case 'f': goto yy393; + case 'H': + case 'h': goto yy391; + case 'L': + case 'l': goto yy395; + case 'M': + case 'm': goto yy394; + case 'N': + case 'n': goto yy397; + default: goto yy280; } +yy391: YYDEBUG(391, *YYCURSOR); yych = *++YYCURSOR; if (yych == 'A') goto yy451; @@ -5419,53 +5419,83 @@ yy392: YYDEBUG(392, *YYCURSOR); yych = *++YYCURSOR; if (yych == 'L') goto yy444; + if (yych == 'l') goto yy444; goto yy280; yy393: YYDEBUG(393, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'I') goto yy428; - if (yych == 'U') goto yy429; - goto yy280; + if (yych <= 'U') { + if (yych == 'I') goto yy428; + if (yych <= 'T') goto yy280; + goto yy429; + } else { + if (yych <= 'i') { + if (yych <= 'h') goto yy280; + goto yy428; + } else { + if (yych == 'u') goto yy429; + goto yy280; + } + } yy394: YYDEBUG(394, *YYCURSOR); yych = *++YYCURSOR; if (yych == 'E') goto yy420; + if (yych == 'e') goto yy420; goto yy280; yy395: YYDEBUG(395, *YYCURSOR); yych = *++YYCURSOR; if (yych == 'I') goto yy414; + if (yych == 'i') goto yy414; goto yy280; yy396: YYDEBUG(396, *YYCURSOR); yych = *++YYCURSOR; if (yych == 'I') goto yy409; + if (yych == 'i') goto yy409; goto yy280; yy397: YYDEBUG(397, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'A') goto yy280; + if (yych == 'A') goto yy398; + if (yych != 'a') goto yy280; +yy398: YYDEBUG(398, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'M') goto yy280; + if (yych == 'M') goto yy399; + if (yych != 'm') goto yy280; +yy399: YYDEBUG(399, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'E') goto yy280; + if (yych == 'E') goto yy400; + if (yych != 'e') goto yy280; +yy400: YYDEBUG(400, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'S') goto yy280; + if (yych == 'S') goto yy401; + if (yych != 's') goto yy280; +yy401: YYDEBUG(401, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'P') goto yy280; + if (yych == 'P') goto yy402; + if (yych != 'p') goto yy280; +yy402: YYDEBUG(402, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'A') goto yy280; + if (yych == 'A') goto yy403; + if (yych != 'a') goto yy280; +yy403: YYDEBUG(403, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'C') goto yy280; + if (yych == 'C') goto yy404; + if (yych != 'c') goto yy280; +yy404: YYDEBUG(404, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'E') goto yy280; + if (yych == 'E') goto yy405; + if (yych != 'e') goto yy280; +yy405: YYDEBUG(405, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy280; @@ -5489,11 +5519,13 @@ yy397: } return T_NS_C; } -#line 5493 "Zend/zend_language_scanner.c" +#line 5523 "Zend/zend_language_scanner.c" yy409: YYDEBUG(409, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'R') goto yy280; + if (yych == 'R') goto yy410; + if (yych != 'r') goto yy280; +yy410: YYDEBUG(410, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy280; @@ -5534,14 +5566,18 @@ yy409: zendlval->type = IS_STRING; return T_DIR; } -#line 5538 "Zend/zend_language_scanner.c" +#line 5570 "Zend/zend_language_scanner.c" yy414: YYDEBUG(414, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'N') goto yy280; + if (yych == 'N') goto yy415; + if (yych != 'n') goto yy280; +yy415: YYDEBUG(415, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'E') goto yy280; + if (yych == 'E') goto yy416; + if (yych != 'e') goto yy280; +yy416: YYDEBUG(416, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy280; @@ -5561,20 +5597,28 @@ yy414: Z_TYPE_P(zendlval) = IS_LONG; return T_LINE; } -#line 5565 "Zend/zend_language_scanner.c" +#line 5601 "Zend/zend_language_scanner.c" yy420: YYDEBUG(420, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'T') goto yy280; + if (yych == 'T') goto yy421; + if (yych != 't') goto yy280; +yy421: YYDEBUG(421, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'H') goto yy280; + if (yych == 'H') goto yy422; + if (yych != 'h') goto yy280; +yy422: YYDEBUG(422, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'O') goto yy280; + if (yych == 'O') goto yy423; + if (yych != 'o') goto yy280; +yy423: YYDEBUG(423, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'D') goto yy280; + if (yych == 'D') goto yy424; + if (yych != 'd') goto yy280; +yy424: YYDEBUG(424, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy280; @@ -5637,31 +5681,44 @@ yy420: } return T_METHOD_C; } -#line 5641 "Zend/zend_language_scanner.c" +#line 5685 "Zend/zend_language_scanner.c" yy428: YYDEBUG(428, *YYCURSOR); yych = *++YYCURSOR; if (yych == 'L') goto yy439; + if (yych == 'l') goto yy439; goto yy280; yy429: YYDEBUG(429, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'N') goto yy280; + if (yych == 'N') goto yy430; + if (yych != 'n') goto yy280; +yy430: YYDEBUG(430, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'C') goto yy280; + if (yych == 'C') goto yy431; + if (yych != 'c') goto yy280; +yy431: YYDEBUG(431, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'T') goto yy280; + if (yych == 'T') goto yy432; + if (yych != 't') goto yy280; +yy432: YYDEBUG(432, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'I') goto yy280; + if (yych == 'I') goto yy433; + if (yych != 'i') goto yy280; +yy433: YYDEBUG(433, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'O') goto yy280; + if (yych == 'O') goto yy434; + if (yych != 'o') goto yy280; +yy434: YYDEBUG(434, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'N') goto yy280; + if (yych == 'N') goto yy435; + if (yych != 'n') goto yy280; +yy435: YYDEBUG(435, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy280; @@ -5690,11 +5747,13 @@ yy429: } return T_FUNC_C; } -#line 5694 "Zend/zend_language_scanner.c" +#line 5751 "Zend/zend_language_scanner.c" yy439: YYDEBUG(439, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'E') goto yy280; + if (yych == 'E') goto yy440; + if (yych != 'e') goto yy280; +yy440: YYDEBUG(440, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy280; @@ -5718,17 +5777,23 @@ yy439: ZVAL_RT_STRING(zendlval, filename, 1); return T_FILE; } -#line 5722 "Zend/zend_language_scanner.c" +#line 5781 "Zend/zend_language_scanner.c" yy444: YYDEBUG(444, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'A') goto yy280; + if (yych == 'A') goto yy445; + if (yych != 'a') goto yy280; +yy445: YYDEBUG(445, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'S') goto yy280; + if (yych == 'S') goto yy446; + if (yych != 's') goto yy280; +yy446: YYDEBUG(446, *YYCURSOR); yych = *++YYCURSOR; - if (yych != 'S') goto yy280; + if (yych == 'S') goto yy447; + if (yych != 's') goto yy280; +yy447: YYDEBUG(447, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy280; @@ -5757,7 +5822,7 @@ yy444: } return T_CLASS_C; } -#line 5761 "Zend/zend_language_scanner.c" +#line 5826 "Zend/zend_language_scanner.c" yy451: YYDEBUG(451, *YYCURSOR); yych = *++YYCURSOR; @@ -5823,7 +5888,7 @@ yy462: { return T_HALT_COMPILER; } -#line 5827 "Zend/zend_language_scanner.c" +#line 5892 "Zend/zend_language_scanner.c" yy464: YYDEBUG(464, *YYCURSOR); yych = *++YYCURSOR; @@ -5847,7 +5912,7 @@ yy466: { return T_USE; } -#line 5851 "Zend/zend_language_scanner.c" +#line 5916 "Zend/zend_language_scanner.c" yy468: YYDEBUG(468, *YYCURSOR); yych = *++YYCURSOR; @@ -5870,7 +5935,7 @@ yy470: { return T_UNSET; } -#line 5874 "Zend/zend_language_scanner.c" +#line 5939 "Zend/zend_language_scanner.c" yy472: YYDEBUG(472, *YYCURSOR); ++YYCURSOR; @@ -6046,7 +6111,7 @@ yy487: { return T_INT_CAST; } -#line 6050 "Zend/zend_language_scanner.c" +#line 6115 "Zend/zend_language_scanner.c" yy490: YYDEBUG(490, *YYCURSOR); yych = *++YYCURSOR; @@ -6094,7 +6159,7 @@ yy495: { return T_DOUBLE_CAST; } -#line 6098 "Zend/zend_language_scanner.c" +#line 6163 "Zend/zend_language_scanner.c" yy499: YYDEBUG(499, *YYCURSOR); yych = *++YYCURSOR; @@ -6168,7 +6233,7 @@ yy509: { return T_STRING_CAST; } -#line 6172 "Zend/zend_language_scanner.c" +#line 6237 "Zend/zend_language_scanner.c" yy513: YYDEBUG(513, *YYCURSOR); yych = *++YYCURSOR; @@ -6205,7 +6270,7 @@ yy516: { return T_ARRAY_CAST; } -#line 6209 "Zend/zend_language_scanner.c" +#line 6274 "Zend/zend_language_scanner.c" yy520: YYDEBUG(520, *YYCURSOR); yych = *++YYCURSOR; @@ -6247,7 +6312,7 @@ yy524: { return T_OBJECT_CAST; } -#line 6251 "Zend/zend_language_scanner.c" +#line 6316 "Zend/zend_language_scanner.c" yy528: YYDEBUG(528, *YYCURSOR); yych = *++YYCURSOR; @@ -6292,7 +6357,7 @@ yy533: { return T_BOOL_CAST; } -#line 6296 "Zend/zend_language_scanner.c" +#line 6361 "Zend/zend_language_scanner.c" yy536: YYDEBUG(536, *YYCURSOR); yych = *++YYCURSOR; @@ -6340,7 +6405,7 @@ yy541: { return T_BINARY_CAST; } -#line 6344 "Zend/zend_language_scanner.c" +#line 6409 "Zend/zend_language_scanner.c" yy545: YYDEBUG(545, *YYCURSOR); yych = *++YYCURSOR; @@ -6401,7 +6466,7 @@ yy551: { return T_UNICODE_CAST; } -#line 6405 "Zend/zend_language_scanner.c" +#line 6470 "Zend/zend_language_scanner.c" yy555: YYDEBUG(555, *YYCURSOR); yych = *++YYCURSOR; @@ -6428,7 +6493,7 @@ yy556: { return T_UNSET_CAST; } -#line 6432 "Zend/zend_language_scanner.c" +#line 6497 "Zend/zend_language_scanner.c" yy560: YYDEBUG(560, *YYCURSOR); yych = *++YYCURSOR; @@ -6446,7 +6511,7 @@ yy561: { return T_VAR; } -#line 6450 "Zend/zend_language_scanner.c" +#line 6515 "Zend/zend_language_scanner.c" yy563: YYDEBUG(563, *YYCURSOR); yych = *++YYCURSOR; @@ -6470,7 +6535,7 @@ yy565: { return T_NEW; } -#line 6474 "Zend/zend_language_scanner.c" +#line 6539 "Zend/zend_language_scanner.c" yy567: YYDEBUG(567, *YYCURSOR); yych = *++YYCURSOR; @@ -6513,7 +6578,7 @@ yy573: { return T_NAMESPACE; } -#line 6517 "Zend/zend_language_scanner.c" +#line 6582 "Zend/zend_language_scanner.c" yy575: YYDEBUG(575, *YYCURSOR); ++YYCURSOR; @@ -6523,7 +6588,7 @@ yy575: { return T_PAAMAYIM_NEKUDOTAYIM; } -#line 6527 "Zend/zend_language_scanner.c" +#line 6592 "Zend/zend_language_scanner.c" yy577: YYDEBUG(577, *YYCURSOR); ++YYCURSOR; @@ -6549,7 +6614,7 @@ yy579: { return T_MINUS_EQUAL; } -#line 6553 "Zend/zend_language_scanner.c" +#line 6618 "Zend/zend_language_scanner.c" yy581: YYDEBUG(581, *YYCURSOR); ++YYCURSOR; @@ -6559,7 +6624,7 @@ yy581: { return T_DEC; } -#line 6563 "Zend/zend_language_scanner.c" +#line 6628 "Zend/zend_language_scanner.c" yy583: YYDEBUG(583, *YYCURSOR); ++YYCURSOR; @@ -6570,7 +6635,7 @@ yy583: yy_push_state(ST_LOOKING_FOR_PROPERTY TSRMLS_CC); return T_OBJECT_OPERATOR; } -#line 6574 "Zend/zend_language_scanner.c" +#line 6639 "Zend/zend_language_scanner.c" yy585: YYDEBUG(585, *YYCURSOR); yych = *++YYCURSOR; @@ -6619,7 +6684,7 @@ yy590: { return T_PUBLIC; } -#line 6623 "Zend/zend_language_scanner.c" +#line 6688 "Zend/zend_language_scanner.c" yy592: YYDEBUG(592, *YYCURSOR); yych = *++YYCURSOR; @@ -6678,7 +6743,7 @@ yy599: { return T_PROTECTED; } -#line 6682 "Zend/zend_language_scanner.c" +#line 6747 "Zend/zend_language_scanner.c" yy601: YYDEBUG(601, *YYCURSOR); yych = *++YYCURSOR; @@ -6712,7 +6777,7 @@ yy605: { return T_PRIVATE; } -#line 6716 "Zend/zend_language_scanner.c" +#line 6781 "Zend/zend_language_scanner.c" yy607: YYDEBUG(607, *YYCURSOR); ++YYCURSOR; @@ -6725,7 +6790,7 @@ yy607: { return T_PRINT; } -#line 6729 "Zend/zend_language_scanner.c" +#line 6794 "Zend/zend_language_scanner.c" yy609: YYDEBUG(609, *YYCURSOR); yych = *++YYCURSOR; @@ -6754,7 +6819,7 @@ yy612: { return T_GOTO; } -#line 6758 "Zend/zend_language_scanner.c" +#line 6823 "Zend/zend_language_scanner.c" yy614: YYDEBUG(614, *YYCURSOR); yych = *++YYCURSOR; @@ -6782,7 +6847,7 @@ yy617: { return T_GLOBAL; } -#line 6786 "Zend/zend_language_scanner.c" +#line 6851 "Zend/zend_language_scanner.c" yy619: YYDEBUG(619, *YYCURSOR); yych = *++YYCURSOR; @@ -6801,7 +6866,7 @@ yy621: BEGIN(ST_DOUBLE_QUOTES); return T_BINARY_DOUBLE; } -#line 6805 "Zend/zend_language_scanner.c" +#line 6870 "Zend/zend_language_scanner.c" yy622: YYDEBUG(622, *YYCURSOR); ++YYCURSOR; @@ -6838,7 +6903,7 @@ yy627: { return T_BREAK; } -#line 6842 "Zend/zend_language_scanner.c" +#line 6907 "Zend/zend_language_scanner.c" yy629: YYDEBUG(629, *YYCURSOR); ++YYCURSOR; @@ -6855,7 +6920,7 @@ yy630: zend_scan_binary_single_string(zendlval, yytext+2, yyleng-3 TSRMLS_CC); return T_CONSTANT_ENCAPSED_STRING; } -#line 6859 "Zend/zend_language_scanner.c" +#line 6924 "Zend/zend_language_scanner.c" yy632: YYDEBUG(632, *YYCURSOR); ++YYCURSOR; @@ -6934,7 +6999,7 @@ yy639: zend_scan_binary_escape_string(zendlval, yytext+2, yyleng-3, '"' TSRMLS_CC); return T_CONSTANT_ENCAPSED_STRING; } -#line 6938 "Zend/zend_language_scanner.c" +#line 7003 "Zend/zend_language_scanner.c" yy641: YYDEBUG(641, *YYCURSOR); ++YYCURSOR; @@ -6984,7 +7049,7 @@ yy648: { return T_SWITCH; } -#line 6988 "Zend/zend_language_scanner.c" +#line 7053 "Zend/zend_language_scanner.c" yy650: YYDEBUG(650, *YYCURSOR); yych = *++YYCURSOR; @@ -7012,7 +7077,7 @@ yy653: { return T_STATIC; } -#line 7016 "Zend/zend_language_scanner.c" +#line 7081 "Zend/zend_language_scanner.c" yy655: YYDEBUG(655, *YYCURSOR); yych = *++YYCURSOR; @@ -7043,7 +7108,7 @@ yy658: { return T_AS; } -#line 7047 "Zend/zend_language_scanner.c" +#line 7112 "Zend/zend_language_scanner.c" yy660: YYDEBUG(660, *YYCURSOR); yych = *++YYCURSOR; @@ -7066,7 +7131,7 @@ yy662: { return T_ARRAY; } -#line 7070 "Zend/zend_language_scanner.c" +#line 7135 "Zend/zend_language_scanner.c" yy664: YYDEBUG(664, *YYCURSOR); ++YYCURSOR; @@ -7079,7 +7144,7 @@ yy664: { return T_LOGICAL_AND; } -#line 7083 "Zend/zend_language_scanner.c" +#line 7148 "Zend/zend_language_scanner.c" yy666: YYDEBUG(666, *YYCURSOR); yych = *++YYCURSOR; @@ -7117,7 +7182,7 @@ yy671: { return T_ABSTRACT; } -#line 7121 "Zend/zend_language_scanner.c" +#line 7186 "Zend/zend_language_scanner.c" yy673: YYDEBUG(673, *YYCURSOR); yych = *++YYCURSOR; @@ -7145,7 +7210,7 @@ yy676: { return T_WHILE; } -#line 7149 "Zend/zend_language_scanner.c" +#line 7214 "Zend/zend_language_scanner.c" yy678: YYDEBUG(678, *YYCURSOR); ++YYCURSOR; @@ -7158,7 +7223,7 @@ yy678: { return T_IF; } -#line 7162 "Zend/zend_language_scanner.c" +#line 7227 "Zend/zend_language_scanner.c" yy680: YYDEBUG(680, *YYCURSOR); yych = *++YYCURSOR; @@ -7214,7 +7279,7 @@ yy685: { return T_ISSET; } -#line 7218 "Zend/zend_language_scanner.c" +#line 7283 "Zend/zend_language_scanner.c" yy687: YYDEBUG(687, *YYCURSOR); yych = *++YYCURSOR; @@ -7272,7 +7337,7 @@ yy694: { return T_INCLUDE; } -#line 7276 "Zend/zend_language_scanner.c" +#line 7341 "Zend/zend_language_scanner.c" yy695: YYDEBUG(695, *YYCURSOR); yych = *++YYCURSOR; @@ -7305,7 +7370,7 @@ yy699: { return T_INCLUDE_ONCE; } -#line 7309 "Zend/zend_language_scanner.c" +#line 7374 "Zend/zend_language_scanner.c" yy701: YYDEBUG(701, *YYCURSOR); yych = *++YYCURSOR; @@ -7343,7 +7408,7 @@ yy706: { return T_INTERFACE; } -#line 7347 "Zend/zend_language_scanner.c" +#line 7412 "Zend/zend_language_scanner.c" yy708: YYDEBUG(708, *YYCURSOR); yych = *++YYCURSOR; @@ -7386,7 +7451,7 @@ yy714: { return T_INSTANCEOF; } -#line 7390 "Zend/zend_language_scanner.c" +#line 7455 "Zend/zend_language_scanner.c" yy716: YYDEBUG(716, *YYCURSOR); yych = *++YYCURSOR; @@ -7434,7 +7499,7 @@ yy723: { return T_IMPLEMENTS; } -#line 7438 "Zend/zend_language_scanner.c" +#line 7503 "Zend/zend_language_scanner.c" yy725: YYDEBUG(725, *YYCURSOR); yych = *++YYCURSOR; @@ -7458,7 +7523,7 @@ yy727: { return T_TRY; } -#line 7462 "Zend/zend_language_scanner.c" +#line 7527 "Zend/zend_language_scanner.c" yy729: YYDEBUG(729, *YYCURSOR); yych = *++YYCURSOR; @@ -7481,7 +7546,7 @@ yy731: { return T_THROW; } -#line 7485 "Zend/zend_language_scanner.c" +#line 7550 "Zend/zend_language_scanner.c" yy733: YYDEBUG(733, *YYCURSOR); yych = *++YYCURSOR; @@ -7546,7 +7611,7 @@ yy740: { return T_REQUIRE; } -#line 7550 "Zend/zend_language_scanner.c" +#line 7615 "Zend/zend_language_scanner.c" yy741: YYDEBUG(741, *YYCURSOR); yych = *++YYCURSOR; @@ -7579,7 +7644,7 @@ yy745: { return T_REQUIRE_ONCE; } -#line 7583 "Zend/zend_language_scanner.c" +#line 7648 "Zend/zend_language_scanner.c" yy747: YYDEBUG(747, *YYCURSOR); yych = *++YYCURSOR; @@ -7602,7 +7667,7 @@ yy749: { return T_RETURN; } -#line 7606 "Zend/zend_language_scanner.c" +#line 7671 "Zend/zend_language_scanner.c" yy751: YYDEBUG(751, *YYCURSOR); yych = *++YYCURSOR; @@ -7687,7 +7752,7 @@ yy760: { return T_CONTINUE; } -#line 7691 "Zend/zend_language_scanner.c" +#line 7756 "Zend/zend_language_scanner.c" yy762: YYDEBUG(762, *YYCURSOR); ++YYCURSOR; @@ -7700,7 +7765,7 @@ yy762: { return T_CONST; } -#line 7704 "Zend/zend_language_scanner.c" +#line 7769 "Zend/zend_language_scanner.c" yy764: YYDEBUG(764, *YYCURSOR); yych = *++YYCURSOR; @@ -7729,7 +7794,7 @@ yy767: { return T_CLONE; } -#line 7733 "Zend/zend_language_scanner.c" +#line 7798 "Zend/zend_language_scanner.c" yy769: YYDEBUG(769, *YYCURSOR); yych = *++YYCURSOR; @@ -7747,7 +7812,7 @@ yy770: { return T_CLASS; } -#line 7751 "Zend/zend_language_scanner.c" +#line 7816 "Zend/zend_language_scanner.c" yy772: YYDEBUG(772, *YYCURSOR); yych = *++YYCURSOR; @@ -7771,7 +7836,7 @@ yy774: { return T_CASE; } -#line 7775 "Zend/zend_language_scanner.c" +#line 7840 "Zend/zend_language_scanner.c" yy776: YYDEBUG(776, *YYCURSOR); yych = *++YYCURSOR; @@ -7789,7 +7854,7 @@ yy777: { return T_CATCH; } -#line 7793 "Zend/zend_language_scanner.c" +#line 7858 "Zend/zend_language_scanner.c" yy779: YYDEBUG(779, *YYCURSOR); yych = *++YYCURSOR; @@ -7844,7 +7909,7 @@ yy787: { return T_FUNCTION; } -#line 7848 "Zend/zend_language_scanner.c" +#line 7913 "Zend/zend_language_scanner.c" yy789: YYDEBUG(789, *YYCURSOR); ++YYCURSOR; @@ -7872,7 +7937,7 @@ yy790: { return T_FOR; } -#line 7876 "Zend/zend_language_scanner.c" +#line 7941 "Zend/zend_language_scanner.c" yy791: YYDEBUG(791, *YYCURSOR); yych = *++YYCURSOR; @@ -7900,7 +7965,7 @@ yy794: { return T_FOREACH; } -#line 7904 "Zend/zend_language_scanner.c" +#line 7969 "Zend/zend_language_scanner.c" yy796: YYDEBUG(796, *YYCURSOR); yych = *++YYCURSOR; @@ -7923,7 +7988,7 @@ yy798: { return T_FINAL; } -#line 7927 "Zend/zend_language_scanner.c" +#line 7992 "Zend/zend_language_scanner.c" yy800: YYDEBUG(800, *YYCURSOR); yych = *++YYCURSOR; @@ -7958,7 +8023,7 @@ yy802: { return T_DO; } -#line 7962 "Zend/zend_language_scanner.c" +#line 8027 "Zend/zend_language_scanner.c" yy804: YYDEBUG(804, *YYCURSOR); ++YYCURSOR; @@ -7971,7 +8036,7 @@ yy804: { return T_EXIT; } -#line 7975 "Zend/zend_language_scanner.c" +#line 8040 "Zend/zend_language_scanner.c" yy806: YYDEBUG(806, *YYCURSOR); yych = *++YYCURSOR; @@ -8010,7 +8075,7 @@ yy811: { return T_DEFAULT; } -#line 8014 "Zend/zend_language_scanner.c" +#line 8079 "Zend/zend_language_scanner.c" yy813: YYDEBUG(813, *YYCURSOR); yych = *++YYCURSOR; @@ -8038,7 +8103,7 @@ yy816: { return T_DECLARE; } -#line 8042 "Zend/zend_language_scanner.c" +#line 8107 "Zend/zend_language_scanner.c" yy818: YYDEBUG(818, *YYCURSOR); yych = *++YYCURSOR; @@ -8122,7 +8187,7 @@ yy829: { return T_EXTENDS; } -#line 8126 "Zend/zend_language_scanner.c" +#line 8191 "Zend/zend_language_scanner.c" yy831: YYDEBUG(831, *YYCURSOR); ++YYCURSOR; @@ -8135,7 +8200,7 @@ yy831: { return T_EXIT; } -#line 8139 "Zend/zend_language_scanner.c" +#line 8204 "Zend/zend_language_scanner.c" yy833: YYDEBUG(833, *YYCURSOR); yych = *++YYCURSOR; @@ -8153,7 +8218,7 @@ yy834: { return T_EVAL; } -#line 8157 "Zend/zend_language_scanner.c" +#line 8222 "Zend/zend_language_scanner.c" yy836: YYDEBUG(836, *YYCURSOR); yych = *++YYCURSOR; @@ -8227,7 +8292,7 @@ yy845: { return T_ENDWHILE; } -#line 8231 "Zend/zend_language_scanner.c" +#line 8296 "Zend/zend_language_scanner.c" yy847: YYDEBUG(847, *YYCURSOR); yych = *++YYCURSOR; @@ -8260,7 +8325,7 @@ yy851: { return T_ENDSWITCH; } -#line 8264 "Zend/zend_language_scanner.c" +#line 8329 "Zend/zend_language_scanner.c" yy853: YYDEBUG(853, *YYCURSOR); ++YYCURSOR; @@ -8273,7 +8338,7 @@ yy853: { return T_ENDIF; } -#line 8277 "Zend/zend_language_scanner.c" +#line 8342 "Zend/zend_language_scanner.c" yy855: YYDEBUG(855, *YYCURSOR); yych = *++YYCURSOR; @@ -8306,7 +8371,7 @@ yy857: { return T_ENDFOR; } -#line 8310 "Zend/zend_language_scanner.c" +#line 8375 "Zend/zend_language_scanner.c" yy858: YYDEBUG(858, *YYCURSOR); yych = *++YYCURSOR; @@ -8334,7 +8399,7 @@ yy861: { return T_ENDFOREACH; } -#line 8338 "Zend/zend_language_scanner.c" +#line 8403 "Zend/zend_language_scanner.c" yy863: YYDEBUG(863, *YYCURSOR); yych = *++YYCURSOR; @@ -8372,7 +8437,7 @@ yy868: { return T_ENDDECLARE; } -#line 8376 "Zend/zend_language_scanner.c" +#line 8441 "Zend/zend_language_scanner.c" yy870: YYDEBUG(870, *YYCURSOR); yych = *++YYCURSOR; @@ -8395,7 +8460,7 @@ yy872: { return T_EMPTY; } -#line 8399 "Zend/zend_language_scanner.c" +#line 8464 "Zend/zend_language_scanner.c" yy874: YYDEBUG(874, *YYCURSOR); yych = *++YYCURSOR; @@ -8428,7 +8493,7 @@ yy876: { return T_ELSE; } -#line 8432 "Zend/zend_language_scanner.c" +#line 8497 "Zend/zend_language_scanner.c" yy877: YYDEBUG(877, *YYCURSOR); yych = *++YYCURSOR; @@ -8446,7 +8511,7 @@ yy878: { return T_ELSEIF; } -#line 8450 "Zend/zend_language_scanner.c" +#line 8515 "Zend/zend_language_scanner.c" yy880: YYDEBUG(880, *YYCURSOR); yych = *++YYCURSOR; @@ -8464,7 +8529,7 @@ yy881: { return T_ECHO; } -#line 8468 "Zend/zend_language_scanner.c" +#line 8533 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_LOOKING_FOR_PROPERTY: @@ -8545,7 +8610,7 @@ yy886: HANDLE_NEWLINES(yytext, yyleng); return T_WHITESPACE; } -#line 8549 "Zend/zend_language_scanner.c" +#line 8614 "Zend/zend_language_scanner.c" yy887: YYDEBUG(887, *YYCURSOR); ++YYCURSOR; @@ -8559,7 +8624,7 @@ yy888: yy_pop_state(TSRMLS_C); goto restart; } -#line 8563 "Zend/zend_language_scanner.c" +#line 8628 "Zend/zend_language_scanner.c" yy889: YYDEBUG(889, *YYCURSOR); ++YYCURSOR; @@ -8579,7 +8644,7 @@ yy890: } return T_STRING; } -#line 8583 "Zend/zend_language_scanner.c" +#line 8648 "Zend/zend_language_scanner.c" yy891: YYDEBUG(891, *YYCURSOR); yych = *++YYCURSOR; @@ -8604,7 +8669,7 @@ yy894: { return T_OBJECT_OPERATOR; } -#line 8608 "Zend/zend_language_scanner.c" +#line 8673 "Zend/zend_language_scanner.c" yy896: YYDEBUG(896, *YYCURSOR); ++YYCURSOR; @@ -8686,7 +8751,7 @@ yy901: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); return T_STRING_VARNAME; } -#line 8690 "Zend/zend_language_scanner.c" +#line 8755 "Zend/zend_language_scanner.c" yy902: YYDEBUG(902, *YYCURSOR); ++YYCURSOR; @@ -8699,7 +8764,7 @@ yy902: yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); goto restart; } -#line 8703 "Zend/zend_language_scanner.c" +#line 8768 "Zend/zend_language_scanner.c" yy904: YYDEBUG(904, *YYCURSOR); ++YYCURSOR; @@ -8889,7 +8954,7 @@ yy917: yymore(); } } -#line 8893 "Zend/zend_language_scanner.c" +#line 8958 "Zend/zend_language_scanner.c" yy919: YYDEBUG(919, *YYCURSOR); ++YYCURSOR; @@ -9000,7 +9065,7 @@ yy926: { yymore(); } -#line 9004 "Zend/zend_language_scanner.c" +#line 9069 "Zend/zend_language_scanner.c" yy927: YYDEBUG(927, *YYCURSOR); yych = *++YYCURSOR; @@ -9041,7 +9106,7 @@ yy931: return T_COMMENT; } } -#line 9045 "Zend/zend_language_scanner.c" +#line 9110 "Zend/zend_language_scanner.c" yy932: YYDEBUG(932, *YYCURSOR); yych = *++YYCURSOR; @@ -9063,7 +9128,7 @@ yy933: CG(zend_lineno)++; return T_COMMENT; } -#line 9067 "Zend/zend_language_scanner.c" +#line 9132 "Zend/zend_language_scanner.c" yy936: YYDEBUG(936, *YYCURSOR); yych = *++YYCURSOR; @@ -9086,7 +9151,7 @@ yy937: yymore(); } } -#line 9090 "Zend/zend_language_scanner.c" +#line 9155 "Zend/zend_language_scanner.c" } /* *********************************** */ yyc_ST_VAR_OFFSET: @@ -9199,7 +9264,7 @@ yy942: } return T_NUM_STRING; } -#line 9203 "Zend/zend_language_scanner.c" +#line 9268 "Zend/zend_language_scanner.c" yy943: YYDEBUG(943, *YYCURSOR); yych = *++YYCURSOR; @@ -9224,7 +9289,7 @@ yy945: /* Only '[' can be valid, but returning other tokens will allow a more explicit parse error */ return yytext[0]; } -#line 9228 "Zend/zend_language_scanner.c" +#line 9293 "Zend/zend_language_scanner.c" yy946: YYDEBUG(946, *YYCURSOR); ++YYCURSOR; @@ -9235,7 +9300,7 @@ yy946: yy_pop_state(TSRMLS_C); return ']'; } -#line 9239 "Zend/zend_language_scanner.c" +#line 9304 "Zend/zend_language_scanner.c" yy948: YYDEBUG(948, *YYCURSOR); yych = *++YYCURSOR; @@ -9253,7 +9318,7 @@ yy949: ZVAL_EMPTY_TEXT(zendlval); /* Empty since it won't be used */ return T_ENCAPSED_AND_WHITESPACE; } -#line 9257 "Zend/zend_language_scanner.c" +#line 9322 "Zend/zend_language_scanner.c" yy951: YYDEBUG(951, *YYCURSOR); ++YYCURSOR; @@ -9269,7 +9334,7 @@ yy952: } return T_STRING; } -#line 9273 "Zend/zend_language_scanner.c" +#line 9338 "Zend/zend_language_scanner.c" yy953: YYDEBUG(953, *YYCURSOR); ++YYCURSOR; @@ -9280,7 +9345,7 @@ yy953: zend_error(E_COMPILE_WARNING,"Unexpected character in input: '%c' (ASCII=%d) state=%d", yytext[0], yytext[0], YYSTATE); goto restart; } -#line 9284 "Zend/zend_language_scanner.c" +#line 9349 "Zend/zend_language_scanner.c" yy955: YYDEBUG(955, *YYCURSOR); ++YYCURSOR; @@ -9326,7 +9391,7 @@ yy959: } return T_VARIABLE; } -#line 9330 "Zend/zend_language_scanner.c" +#line 9395 "Zend/zend_language_scanner.c" yy960: YYDEBUG(960, *YYCURSOR); ++YYCURSOR; @@ -9365,7 +9430,7 @@ yy966: } return T_NUM_STRING; } -#line 9369 "Zend/zend_language_scanner.c" +#line 9434 "Zend/zend_language_scanner.c" yy967: YYDEBUG(967, *YYCURSOR); ++YYCURSOR; diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 051fda6bc7..2ad3357aff 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1958,7 +1958,7 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA- return T_DNUMBER; } -'__CLASS__' { +"__CLASS__" { zstr class_name = NULL_ZSTR; if (CG(active_class_entry)) { @@ -1973,7 +1973,7 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA- return T_CLASS_C; } -'__FUNCTION__' { +"__FUNCTION__" { zstr func_name = NULL_ZSTR; if (CG(active_op_array)) { @@ -1988,7 +1988,7 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA- return T_FUNC_C; } -'__METHOD__' { +"__METHOD__" { zstr class_name = CG(active_class_entry) ? CG(active_class_entry)->name : NULL_ZSTR; zstr func_name = CG(active_op_array)? CG(active_op_array)->function_name : NULL_ZSTR; size_t len = 0; @@ -2037,13 +2037,13 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA- return T_METHOD_C; } -'__LINE__' { +"__LINE__" { Z_LVAL_P(zendlval) = CG(zend_lineno); Z_TYPE_P(zendlval) = IS_LONG; return T_LINE; } -'__FILE__' { +"__FILE__" { char *filename = zend_get_compiled_filename(TSRMLS_C); if (!filename) { @@ -2053,7 +2053,7 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA- return T_FILE; } -'__DIR__' { +"__DIR__" { char *filename = zend_get_compiled_filename(TSRMLS_C); const size_t filename_len = strlen(filename); char *dirname; @@ -2080,7 +2080,7 @@ NOWDOC_CHARS ([^\n\r]|{NEWLINE}+([^a-zA-Z_\x7f-\xff\n\r]|({LABEL}([^a-zA- return T_DIR; } -'__NAMESPACE__' { +"__NAMESPACE__" { if (CG(current_namespace)) { *zendlval = *CG(current_namespace); zval_copy_ctor(zendlval); -- 2.50.1