com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: Zend/zend_language_parser .y Zend/zend_language_scanner.c
Zend/zend_languag e_scanner.l Zend/zend_opcode.c Zend/zend_operator s.c Zend/zend_operators.h Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/gmp/gmp.c
ext/standard/m ath.c

Commit: 7e8616620dff8aeda6f8e0e7a8774048f5dbbb0f Author: Anatol Belski <ab@php.net> Thu, 6 Feb 2014 20:20:12 +0100 Parents: a72d90cb6d7529a89082137d44c886738a4713af 44dcdd146d36c91dddc9b89b4679074fdbf2e183 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e8616620dff8aeda6f8e0e7a8774048f5dbbb0f Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 * origin/master: Added information in NEWS and UPGRADING add T_POW (**) operator add NEWS block for 5.6.0alpha3 updated libs_version.txt updated libs_version.txt update libs_version.txt Conflicts: Zend/zend_ini_scanner.c ext/standard/math.c Changed paths: MM Zend/zend_language_parser.y MM Zend/zend_language_scanner.c MM Zend/zend_language_scanner.l MM Zend/zend_opcode.c MM Zend/zend_operators.c MM Zend/zend_operators.h MM Zend/zend_vm_def.h MM Zend/zend_vm_execute.h MM ext/gmp/gmp.c MM ext/standard/math.c Diff: diff --cc Zend/zend_language_scanner.c index cb96cc2,05f9e4e..58c7585 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@@ -1623,9 -1623,9 +1623,9 @@@ yy61 ++YYCURSOR; YYDEBUG(62, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); - #line 2117 "Zend/zend_language_scanner.l" + #line 2125 "Zend/zend_language_scanner.l" { - Z_LVAL_P(zendlval) = (long) '{'; + Z_IVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; @@@ -1854,9 -1854,9 +1854,9 @@@ yy83 ++YYCURSOR; YYDEBUG(84, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); - #line 2117 "Zend/zend_language_scanner.l" + #line 2125 "Zend/zend_language_scanner.l" { - Z_LVAL_P(zendlval) = (long) '{'; + Z_IVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; @@@ -2116,9 -2116,9 +2116,9 @@@ yy107 ++YYCURSOR; YYDEBUG(108, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); - #line 2117 "Zend/zend_language_scanner.l" + #line 2125 "Zend/zend_language_scanner.l" { - Z_LVAL_P(zendlval) = (long) '{'; + Z_IVAL_P(zendlval) = (long) '{'; yy_push_state(ST_IN_SCRIPTING TSRMLS_CC); yyless(1); return T_CURLY_OPEN; @@@ -2939,13 -2940,13 +2940,13 @@@ yy172 yy173: YYDEBUG(173, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); - #line 1513 "Zend/zend_language_scanner.l" + #line 1521 "Zend/zend_language_scanner.l" { - if (yyleng < MAX_LENGTH_OF_LONG - 1) { /* Won't overflow */ - Z_LVAL_P(zendlval) = strtol(yytext, NULL, 0); + if (yyleng < MAX_LENGTH_OF_ZEND_INT - 1) { /* Won't overflow */ + Z_IVAL_P(zendlval) = ZEND_STRTOL(yytext, NULL, 0); } else { errno = 0; - Z_LVAL_P(zendlval) = strtol(yytext, NULL, 0); + Z_IVAL_P(zendlval) = ZEND_STRTOL(yytext, NULL, 0); if (errno == ERANGE) { /* Overflow */ if (yytext[0] == '0') { /* octal overflow */ Z_DVAL_P(zendlval) = zend_oct_strtod(yytext, NULL); @@@ -2957,10 -2958,10 +2958,10 @@@ } } - zendlval->type = IS_LONG; + zendlval->type = IS_INT; return T_LNUMBER; } - #line 2964 "Zend/zend_language_scanner.c" + #line 2965 "Zend/zend_language_scanner.c" yy174: YYDEBUG(174, *YYCURSOR); yyaccept = 2; @@@ -4218,42 -4240,42 +4240,42 @@@ yy328 if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy186; } - YYDEBUG(327, *YYCURSOR); + YYDEBUG(331, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); - #line 1628 "Zend/zend_language_scanner.l" + #line 1636 "Zend/zend_language_scanner.l" { - ZVAL_LONG(zendlval, CG(zend_lineno)); + ZVAL_INT(zendlval, CG(zend_lineno)); return T_LINE; } - #line 4229 "Zend/zend_language_scanner.c" - yy328: - YYDEBUG(328, *YYCURSOR); + #line 4251 "Zend/zend_language_scanner.c" + yy332: + YYDEBUG(332, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'T') goto yy329; + if (yych == 'T') goto yy333; if (yych != 't') goto yy187; - yy329: - YYDEBUG(329, *YYCURSOR); + yy333: + YYDEBUG(333, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'H') goto yy330; + if (yych == 'H') goto yy334; if (yych != 'h') goto yy187; - yy330: - YYDEBUG(330, *YYCURSOR); + yy334: + YYDEBUG(334, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'O') goto yy331; + if (yych == 'O') goto yy335; if (yych != 'o') goto yy187; - yy331: - YYDEBUG(331, *YYCURSOR); + yy335: + YYDEBUG(335, *YYCURSOR); yych = *++YYCURSOR; - if (yych == 'D') goto yy332; + if (yych == 'D') goto yy336; if (yych != 'd') goto yy187; - yy332: - YYDEBUG(332, *YYCURSOR); + yy336: + YYDEBUG(336, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy187; - YYDEBUG(333, *YYCURSOR); + YYDEBUG(337, *YYCURSOR); yych = *++YYCURSOR; if (yych != '_') goto yy187; - YYDEBUG(334, *YYCURSOR); + YYDEBUG(338, *YYCURSOR); ++YYCURSOR; if (yybm[0+(yych = *YYCURSOR)] & 4) { goto yy186; @@@ -7619,19 -7641,19 +7641,19 @@@ yy838 } } else { if (yych <= 'b') { - if (yych <= 'X') goto yy857; - if (yych >= 'b') goto yy855; + if (yych <= 'X') goto yy861; + if (yych >= 'b') goto yy859; } else { - if (yych == 'x') goto yy857; + if (yych == 'x') goto yy861; } } - yy835: - YYDEBUG(835, *YYCURSOR); + yy839: + YYDEBUG(839, *YYCURSOR); yyleng = YYCURSOR - SCNG(yy_text); - #line 1558 "Zend/zend_language_scanner.l" + #line 1566 "Zend/zend_language_scanner.l" { /* Offset could be treated as a long */ - if (yyleng < MAX_LENGTH_OF_LONG - 1 || (yyleng == MAX_LENGTH_OF_LONG - 1 && strcmp(yytext, long_min_digits) < 0)) { - ZVAL_LONG(zendlval, strtol(yytext, NULL, 10)); + if (yyleng < MAX_LENGTH_OF_ZEND_INT - 1 || (yyleng == MAX_LENGTH_OF_ZEND_INT - 1 && strcmp(yytext, int_min_digits) < 0)) { + ZVAL_INT(zendlval, ZEND_STRTOL(yytext, NULL, 10)); } else { ZVAL_STRINGL(zendlval, yytext, yyleng, 1); } @@@ -7823,14 -7845,13 +7845,14 @@@ yy867 ++YYCURSOR; YYFILL(1); yych = *YYCURSOR; - YYDEBUG(864, *YYCURSOR); + YYDEBUG(868, *YYCURSOR); if (yybm[0+yych] & 128) { - goto yy863; + goto yy867; } - goto yy860; + goto yy864; } } - #line 2369 "Zend/zend_language_scanner.l" + #line 2377 "Zend/zend_language_scanner.l" } +