--- parser3/src/include/pa_opcode.h	2009/05/23 05:22:44	1.35
+++ parser3/src/include/pa_opcode.h	2009/06/07 13:16:04	1.41
@@ -11,7 +11,7 @@
 
 namespace OP {
 
-static const char * const IDENT_OPCODE_H="$Date: 2009/05/23 05:22:44 $";
+static const char * const IDENT_OPCODE_H="$Date: 2009/06/07 13:16:04 $";
 
 #define OPTIMIZE_BYTECODE_GET_CLASS
 #define OPTIMIZE_BYTECODE_GET_ELEMENT				// $a ^a
@@ -19,9 +19,13 @@ static const char * const IDENT_OPCODE_H
 #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
-#define OPTIMIZE_BYTECODE_CONSTRUCT					// $a(1), $.a(1), $a[b], $.a[b]
-													// $a($b), $.a($b), $a[$b], $.a[$b]
-													// $a(^b[]), $.a(^b[]), $a[^b[]], $.a[^b[]]
+
+#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 {
@@ -47,6 +51,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
@@ -55,36 +65,21 @@ 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_CALL, OP_CALL__WRITE,
 
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
-	OP_ROOT_CONSTRUCT_EXPR,							// $a(1)
-	OP_ROOT_ELEMENT_CONSTRUCT_EXPR,					// $a($b)
-	OP_ROOT_CALL_CONSTRUCT_EXPR,					// $a(^b[])
-
-
-	OP_ROOT_CONSTRUCT_VALUE,						// $a[b]
-	OP_ROOT_ELEMENT_CONSTRUCT_VALUE,				// $a[$b]
-	OP_ROOT_CALL_CONSTRUCT_VALUE,					// $a[^b[]]
-
-
-	OP_WRITE_CONSTRUCT_EXPR,						// $.a(1)
-	OP_WRITE_ELEMENT_CONSTRUCT_EXPR,				// $.a($b)
-	OP_WRITE_CALL_CONSTRUCT_EXPR,					// $.a(^b[])
-
-
-	OP_WRITE_CONSTRUCT_VALUE,						// $.a[b]
-	OP_WRITE_ELEMENT_CONSTRUCT_VALUE,				// $.a[$b]
-	OP_WRITE_CALL_CONSTRUCT_VALUE,					// $.a[^b[]]
+	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
 	//@}