--- parser3/src/include/pa_opcode.h	2002/09/20 09:26:31	1.22
+++ parser3/src/include/pa_opcode.h	2009/06/04 12:28:58	1.40
@@ -1,21 +1,31 @@
 /** @file
 	Parser: compiled code related decls.
 
-	Copyright (c) 2001, 2002 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)
 */
 
-#ifndef CODE_H
-#define CODE_H
+#ifndef OPCODE_H
+#define OPCODE_H
 
-static const char* IDENT_OPCODE_H="$Date: 2002/09/20 09:26:31 $";
+namespace OP {
 
-#include "pa_string.h"
-#include "pa_array.h"
+static const char * const IDENT_OPCODE_H="$Date: 2009/06/04 12:28:58 $";
 
-class Value;
-class Array;
+#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(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 {
@@ -28,15 +38,48 @@ 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,
-	OP_GET_ELEMENT_OR_OPERATOR, OP_GET_ELEMENT_OR_JUNCTION_EXPAND, 
-	OP_GET_ELEMENT,	OP_GET_ELEMENT__WRITE,
+	OP_WRITE_VALUE,	OP_WRITE_EXPR_RESULT,	OP_STRING__WRITE,
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
+	OP_VALUE__GET_ELEMENT_OR_OPERATOR,
+#else
+	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,
+#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_STORE_PARAM,
 	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
 	//@}
 
 	//@{
@@ -55,25 +98,6 @@ enum OPCODE {
 	OP_IS
 	//@}
 };
-
-/** 
-	Parser source code got compiled into intermediate form of Operation-s, 
-	which is executed afterwards.
-
-	It is compiled into Array of Operation-s.
-	Each Operation can be either OPCODE or data pointer, 
-	following the literal-instruction.
-		- OP_VALUE followed by Value*
-		- OP_CURLY_CODE__STORE_PARAM followed by Array*
-		- OP_EXPR_CODE__STORE_PARAM followed by Array*
-		- OP_NESTED_CODE followed by Array*
-*/
-union Operation {
-	void *cast; ///< casting helper 
-
-	OPCODE code; ///< operation code
-	Value *value; ///< not an operation, but rather value stored after argumented op
-	Array *array; ///< not an operation, but rather code array stored after argumented op
 };
 
 #endif