--- parser3/src/include/pa_opcode.h	2009/05/20 13:29:46	1.34
+++ parser3/src/include/pa_opcode.h	2016/10/11 21:30:16	1.54
@@ -1,7 +1,7 @@
 /** @file
 	Parser: compiled code related decls.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
@@ -11,15 +11,24 @@
 
 namespace OP {
 
-static const char * const IDENT_OPCODE_H="$Date: 2009/05/20 13:29:46 $";
+#define IDENT_PA_OPCODE_H "$Id: pa_opcode.h,v 1.54 2016/10/11 21:30:16 moko Exp $"
 
-#define OPTIMIZE_BYTECODE_GET_CLASS
-#define OPTIMIZE_BYTECODE_GET_ELEMENT
-#define OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
-#define OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
-//#define OPTIMIZE_BYTECODE_STRING_POOL
-#define OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
-#define OPTIMIZE_BYTECODE_CONSTRUCT
+#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
+
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+#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
+#define OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL       // .CLASS, .CLASS_NAME
+
+#define FEATURE_GET_ELEMENT4CALL                     // ^o.m[] calls get_element4call("m"), not get_element("m")
 
 ///	Compiled operation code
 enum OPCODE {
@@ -32,11 +41,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_VALUE__GET_CLASS, OP_VALUE__GET_BASE_CLASS,
 	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
@@ -45,30 +50,54 @@ 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,			// $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,		// $a.$b & ^a.$b
 	OP_GET_OBJECT_VAR_ELEMENT__WRITE,	// $a.$b & ^a.$b
 #endif
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	OP_VALUE__GET_ELEMENT,
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+	OP_WITH_SELF__VALUE__GET_ELEMENT,
+	OP_WITH_SELF__VALUE__GET_ELEMENT__WRITE,
 #endif
-	OP_GET_ELEMENT__WRITE,
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-	OP_VALUE__GET_ELEMENT__WRITE,
+
+#ifdef FEATURE_GET_ELEMENT4CALL
+	OP_GET_ELEMENT4CALL,
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
+	OP_GET_OBJECT_ELEMENT4CALL,
+#endif
+#ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
+	OP_GET_OBJECT_VAR_ELEMENT4CALL,
 #endif
+#endif // FEATURE_GET_ELEMENT4CALL
+
 	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_CALL, OP_CALL__WRITE,
+
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
-	OP_ROOT_CONSTRUCT_EXPR, OP_ROOT_CONSTRUCT_VALUE,
-	OP_WRITE_CONSTRUCT_EXPR, OP_WRITE_CONSTRUCT_VALUE,
+	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
 	//@}
-
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL
+	OP_GET_ELEMENT__SPECIAL,
+	OP_GET_ELEMENT__SPECIAL__WRITE,
+#endif
 	//@{
 	/// @name expression ops: unary
 	OP_NEG, OP_INV, OP_NOT, OP_DEF, OP_IN, OP_FEXISTS, OP_DEXISTS,
@@ -85,6 +114,6 @@ enum OPCODE {
 	OP_IS
 	//@}
 };
-};
+}
 
 #endif