com php-src: We don't pay per newline...: Zend/zend_compile .c

From: Date: Mon, 28 Jul 2014 13:26:30 +0000
Subject: com php-src: We don't pay per newline...: Zend/zend_compile .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-80903@lists.php.net to get a copy of this message
Commit: 2306655214eaea7b15cf1f3327257fbf74d425db Author: Nikita Popov <nikic@php.net> Mon, 28 Jul 2014 15:26:30 +0200 Parents: 38c4125c2e1fcf55529441c64e90e6625fa6deaa Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2306655214eaea7b15cf1f3327257fbf74d425db Log: We don't pay per newline... Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 0419d03..f54c2fe 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -529,31 +529,13 @@ static int zend_add_const_name_literal(zend_op_array *op_array, zval *zv, int un op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ } while (0) -#define LITERAL_STRINGL(op, str, len) do { \ - zval _c; \ - ZVAL_STRINGL(&_c, str, len); \ - op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ - } while (0) - -#define LITERAL_LONG(op, val) do { \ - zval _c; \ - ZVAL_LONG(&_c, val); \ - op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ - } while (0) - -#define LITERAL_LONG_EX(op_array, op, val) do { \ - zval _c; \ - ZVAL_LONG(&_c, val); \ - op.constant = zend_add_literal(op_array, &_c TSRMLS_CC); \ - } while (0) - -#define LITERAL_NULL(op) do { \ - zval _c; \ - ZVAL_NULL(&_c); \ - op.constant = zend_add_literal(CG(active_op_array), &_c TSRMLS_CC); \ - } while (0) - -#define MAKE_NOP(opline) { opline->opcode = ZEND_NOP; memset(&opline->result,0,sizeof(opline->result)); memset(&opline->op1,0,sizeof(opline->op1)); memset(&opline->op2,0,sizeof(opline->op2)); opline->result_type=opline->op1_type=opline->op2_type=IS_UNUSED; } +#define MAKE_NOP(opline) do { \ + opline->opcode = ZEND_NOP; \ + memset(&opline->result, 0, sizeof(opline->result)); \ + memset(&opline->op1, 0, sizeof(opline->op1)); \ + memset(&opline->op2, 0, sizeof(opline->op2)); \ + opline->result_type = opline->op1_type = opline->op2_type = IS_UNUSED; \ +} while (0) void zend_stop_lexing(TSRMLS_D) { LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit);

« previous php.cvs (#80903) next »