--- parser3/src/include/pa_opcode.h	2009/06/02 10:08:47	1.38
+++ parser3/src/include/pa_opcode.h	2012/03/16 09:24:09	1.46
@@ -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,18 +11,21 @@
 
 namespace OP {
 
-static const char * const IDENT_OPCODE_H="$Date: 2009/06/02 10:08:47 $";
+#define IDENT_PA_OPCODE_H "$Id: pa_opcode.h,v 1.46 2012/03/16 09:24:09 moko Exp $"
 
-#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(expr), $a[value], $.a[value]
-#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 {
@@ -35,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
@@ -48,6 +47,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
@@ -56,15 +61,15 @@ 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
@@ -72,6 +77,8 @@ enum OPCODE {
 	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
 	//@}