--- parser3/src/include/pa_opcode.h	2009/05/24 07:32:09	1.37
+++ parser3/src/include/pa_opcode.h	2013/05/16 02:51:26	1.47
@@ -1,7 +1,7 @@
 /** @file
 	Parser: compiled code related decls.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
@@ -11,22 +11,23 @@
 
 namespace OP {
 
-static const char * const IDENT_OPCODE_H="$Date: 2009/05/24 07:32:09 $";
+#define IDENT_PA_OPCODE_H "$Id: pa_opcode.h,v 1.47 2013/05/16 02:51:26 misha Exp $"
+
+#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_OBJECT_POOL                // $var[$a.b], $var[$a.$b]
+#define OPTIMIZE_BYTECODE_CUT_REM_OPERATOR           // cut rem with all params
 
-#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_CUT_REM_OPERATOR			// cut rem with all params
 
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-#define OPTIMIZE_BYTECODE_CONSTRUCT					// $a(1), $.a(1), $a[b], $.a[b]
-													// $a($b), $.a($b), $a[$b], $.a[$b]
-													// $a($b.c), $.a($b.c), $a[$b.c], $.a[$b.c] 
-													// $a($b.$c), $.a($b.$c), $a[$b.$c], $.a[$b.$c]
-//#define OPTIMIZE_BYTECODE_CALL_CONSTRUCT            // $a(^b[]), $.a(^b[]), $a[^b[]], $.a[^b[]]
-#endif
+#define OPTIMIZE_BYTECODE_CONSTRUCT                  // $a(expr),  $a[value]
+#endif                                               // $.a(expr), $.a[value]
+                                                     // $self.a(expr), $self.a[value]
+
+#define OPTIMIZE_BYTECODE_GET_SELF_ELEMENT           // $self.a ^self.a
+
 
 ///	Compiled operation code
 enum OPCODE {
@@ -39,11 +40,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
@@ -52,6 +49,12 @@ enum OPCODE {
 	OP_GET_ELEMENT_OR_OPERATOR,
 #endif
 	OP_GET_ELEMENT,
+	OP_GET_ELEMENT__WRITE,
+#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
 	OP_GET_OBJECT_ELEMENT__WRITE,		// $a.b & ^a.b
@@ -60,54 +63,24 @@ enum OPCODE {
 	OP_GET_OBJECT_VAR_ELEMENT,			// $a.$b & ^a.$b
 	OP_GET_OBJECT_VAR_ELEMENT__WRITE,	// $a.$b & ^a.$b
 #endif
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	OP_VALUE__GET_ELEMENT,
-#endif
-	OP_GET_ELEMENT__WRITE,
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	OP_VALUE__GET_ELEMENT__WRITE,
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+	OP_WITH_SELF__VALUE__GET_ELEMENT,
+	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
-	OP_ROOT_CONSTRUCT_EXPR,							// $a(1)
-	OP_ROOT_ELEMENT_CONSTRUCT_EXPR,					// $a($b)
-	OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_EXPR,			// $a($b.c)
-	OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR,	// $a($b.$c)
-
-
-	OP_ROOT_CONSTRUCT_VALUE,						// $a[b]
-	OP_ROOT_ELEMENT_CONSTRUCT_VALUE,				// $a[$b]
-	OP_ROOT_OBJECT_ELEMENT_CONSTRUCT_VALUE,			// $a[$b.c]
-	OP_ROOT_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE,	// $a[$b.$c]
-
-
-	OP_WRITE_CONSTRUCT_EXPR,						// $.a(1)
-	OP_WRITE_ELEMENT_CONSTRUCT_EXPR,				// $.a($b)
-	OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_EXPR,			// $.a($b.c)
-	OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_EXPR,	// $.a($b.$c)
-
-
-	OP_WRITE_CONSTRUCT_VALUE,						// $.a[b]
-	OP_WRITE_ELEMENT_CONSTRUCT_VALUE,				// $.a[$b]
-	OP_WRITE_OBJECT_ELEMENT_CONSTRUCT_VALUE,		// $.a[$b.c]
-	OP_WRITE_OBJECT_VAR_ELEMENT_CONSTRUCT_VALUE,	// $.a[$b.$c]
-#endif
-
-#ifdef OPTIMIZE_BYTECODE_CALL_CONSTRUCT
-	OP_ROOT_CALL_CONSTRUCT_EXPR,					// $a(^b[])
-	//OP_ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR,		// $a(^b.c[])
-
-	OP_ROOT_CALL_CONSTRUCT_VALUE,					// $a[^b[]]
-	//OP_ROOT_CALL_OBJECT_ELEMENT_CONSTRUCT_VALUE,	// $a[^b.c[]]
-
-	OP_WRITE_CALL_CONSTRUCT_EXPR,					// $.a(^b[])
-	//OP_WRITE_CALL_OBJECT_ELEMENT_CONSTRUCT_EXPR,	// $.a(^b.c[])
-
-	OP_WRITE_CALL_CONSTRUCT_VALUE,					// $.a[^b[]]
-	//OP_WRITE_CALL_OBJECT_ELEMENT_CONSTRUCT_VALUE,	// $.a[^b.c[]]
+	OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR,
+	OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE,
+	OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR,
+	OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE,
+	OP_WITH_SELF__VALUE__CONSTRUCT_EXPR,
+	OP_WITH_SELF__VALUE__CONSTRUCT_VALUE,
 #endif
 	//@}