diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-04-02 14:34:44 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-04-02 14:34:44 +0400 |
| commit | d8099d0468426dbee59f540048376653535270ce (patch) | |
| tree | 133021a1fda6a2453efcd9a279e9b0a55c006396 /Zend/zend_language_scanner.l | |
| parent | 3b25faa4aa844bce12b1cbb3a3938573965df485 (diff) | |
| download | php-git-d8099d0468426dbee59f540048376653535270ce.tar.gz | |
Changed data layout to allow more efficient operations
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 877eb78b66..b34ce73ff2 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -615,7 +615,7 @@ zend_op_array *compile_filename(int type, zval *filename TSRMLS_DC) zend_op_array *retval; char *opened_path = NULL; - if (filename->type != IS_STRING) { + if (Z_TYPE_P(filename) != IS_STRING) { tmp = *filename; zval_copy_ctor(&tmp); convert_to_string(&tmp); @@ -1505,7 +1505,7 @@ NEWLINE ("\r"|"\n"|"\r\n") } else { Z_LVAL_P(zendlval) = strtol(bin, NULL, 2); } - zendlval->type = IS_LONG; + Z_TYPE_P(zendlval) = IS_LONG; return T_LNUMBER; } else { ZVAL_DOUBLE(zendlval, zend_bin_strtod(bin, NULL)); @@ -1525,12 +1525,12 @@ NEWLINE ("\r"|"\n"|"\r\n") } else { Z_DVAL_P(zendlval) = zend_strtod(yytext, NULL); } - zendlval->type = IS_DOUBLE; + Z_TYPE_P(zendlval) = IS_DOUBLE; return T_DNUMBER; } } - zendlval->type = IS_LONG; + Z_TYPE_P(zendlval) = IS_LONG; return T_LNUMBER; } @@ -1550,7 +1550,7 @@ NEWLINE ("\r"|"\n"|"\r\n") } else { Z_LVAL_P(zendlval) = strtol(hex, NULL, 16); } - zendlval->type = IS_LONG; + Z_TYPE_P(zendlval) = IS_LONG; return T_LNUMBER; } else { ZVAL_DOUBLE(zendlval, zend_hex_strtod(hex, NULL)); @@ -1815,7 +1815,7 @@ inline_html: if (readsize < yyleng) { yyless(readsize); } - zendlval->type = IS_STRING; + Z_TYPE_P(zendlval) = IS_STRING; } else { ZVAL_STRINGL(zendlval, yytext, yyleng); } |