--- parser3/src/include/pa_opcode.h 2009/06/04 12:28:58 1.40 +++ parser3/src/include/pa_opcode.h 2010/04/28 17:56:22 1.45 @@ -11,22 +11,22 @@ namespace OP { -static const char * const IDENT_OPCODE_H="$Date: 2009/06/04 12:28:58 $"; +static const char * const IDENT_OPCODE_H="$Date: 2010/04/28 17:56:22 $"; -#define OPTIMIZE_BYTECODE_GET_CLASS #define OPTIMIZE_BYTECODE_GET_ELEMENT // $a ^a #define OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT // $a.b ^a.b #define OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT // $a.$b ^a.$b -//#define OPTIMIZE_BYTECODE_STRING_POOL +#define OPTIMIZE_BYTECODE_STRING_POOL #define OPTIMIZE_BYTECODE_CUT_REM_OPERATOR // cut rem with all params #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT #define OPTIMIZE_BYTECODE_CONSTRUCT // $a(expr), $a[value] - // $.a(expr), $.a[value] +#endif // $.a(expr), $.a[value] // $self.a(expr), $self.a[value] -#endif + #define OPTIMIZE_BYTECODE_GET_SELF_ELEMENT // $self.a ^self.a + /// Compiled operation code enum OPCODE { //@{ @@ -38,11 +38,7 @@ enum OPCODE { //@{ /// @name actions OP_WITH_ROOT, OP_WITH_SELF, OP_WITH_READ, OP_WITH_WRITE, -#ifdef OPTIMIZE_BYTECODE_GET_CLASS OP_VALUE__GET_CLASS, -#else - OP_GET_CLASS, -#endif OP_CONSTRUCT_VALUE, OP_CONSTRUCT_EXPR, OP_CURLY_CODE__CONSTRUCT, OP_WRITE_VALUE, OP_WRITE_EXPR_RESULT, OP_STRING__WRITE, #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT @@ -55,6 +51,7 @@ enum OPCODE { #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT OP_VALUE__GET_ELEMENT, OP_VALUE__GET_ELEMENT__WRITE, + OP_WITH_ROOT__VALUE__GET_ELEMENT, #endif #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT OP_GET_OBJECT_ELEMENT, // $a.b & ^a.b @@ -69,7 +66,10 @@ enum OPCODE { OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE, #endif OP_OBJECT_POOL, OP_STRING_POOL, - OP_PREPARE_TO_CONSTRUCT_OBJECT, OP_PREPARE_TO_EXPRESSION, + OP_PREPARE_TO_CONSTRUCT_OBJECT, + OP_CONSTRUCT_OBJECT, + OP_CONSTRUCT_OBJECT__WRITE, + OP_PREPARE_TO_EXPRESSION, OP_CALL, OP_CALL__WRITE, #ifdef OPTIMIZE_BYTECODE_CONSTRUCT