--- parser3/src/include/pa_opcode.h	2009/05/19 08:41:06	1.32
+++ parser3/src/include/pa_opcode.h	2009/06/04 12:28:58	1.40
@@ -1,7 +1,7 @@
 /** @file
 	Parser: compiled code related decls.
 
-	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
@@ -11,15 +11,21 @@
 
 namespace OP {
 
-static const char * const IDENT_OPCODE_H="$Date: 2009/05/19 08:41:06 $";
+static const char * const IDENT_OPCODE_H="$Date: 2009/06/04 12:28:58 $";
 
 #define OPTIMIZE_BYTECODE_GET_CLASS
-#define OPTIMIZE_BYTECODE_GET_ELEMENT
-#define OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD
-#define OPTIMIZE_BYTECODE_GET_ELEMENT_METHOD
+#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_USE_TWO_OPERANDS_INSTRUCTIONS
-#define OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
+#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]
+													// $self.a(expr), $self.a[value]
+#endif
+#define OPTIMIZE_BYTECODE_GET_SELF_ELEMENT			// $self.a ^self.a
 
 ///	Compiled operation code
 enum OPCODE {
@@ -45,20 +51,35 @@ enum OPCODE {
 	OP_GET_ELEMENT_OR_OPERATOR,
 #endif
 	OP_GET_ELEMENT,
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT_FIELD
-	OP_GET_ELEMENT_FIELD,
-	OP_GET_ELEMENT_FIELD__WRITE,
-#endif
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	OP_VALUE__GET_ELEMENT,
-#endif
 	OP_GET_ELEMENT__WRITE,
 #ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	OP_VALUE__GET_ELEMENT,
 	OP_VALUE__GET_ELEMENT__WRITE,
 #endif
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	OP_GET_OBJECT_ELEMENT,				// $a.b & ^a.b
+	OP_GET_OBJECT_ELEMENT__WRITE,		// $a.b & ^a.b
+#endif
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+	OP_GET_OBJECT_VAR_ELEMENT,			// $a.$b & ^a.$b
+	OP_GET_OBJECT_VAR_ELEMENT__WRITE,	// $a.$b & ^a.$b
+#endif
+#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_CALL, OP_CALL__WRITE,
+
+#ifdef OPTIMIZE_BYTECODE_CONSTRUCT
+	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
 	//@}
 
 	//@{