--- parser3/src/include/pa_opcode.h	2002/01/31 15:04:38	1.11
+++ parser3/src/include/pa_opcode.h	2009/05/19 08:41:06	1.32
@@ -1,21 +1,25 @@
 /** @file
 	Parser: compiled code related decls.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://paf.design.ru)
-
-	$Id: pa_opcode.h,v 1.11 2002/01/31 15:04:38 paf Exp $
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-#ifndef CODE_H
-#define CODE_H
+#ifndef OPCODE_H
+#define OPCODE_H
+
+namespace OP {
 
-#include "pa_string.h"
-#include "pa_array.h"
+static const char * const IDENT_OPCODE_H="$Date: 2009/05/19 08:41:06 $";
 
-class Value;
-class Array;
+#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_STRING_POOL
+#define OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS
+#define OPTIMIZE_BYTECODE_CUT_REM_OPERATOR
 
 ///	Compiled operation code
 enum OPCODE {
@@ -28,16 +32,33 @@ 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,	OP_GET_ELEMENT__WRITE,
-	OP_CREATE_EWPOOL,	OP_REDUCE_EWPOOL,
-  	OP_CREATE_SWPOOL,	OP_REDUCE_SWPOOL,
-	OP_GET_METHOD_FRAME,
-	OP_STORE_PARAM,
-	OP_PREPARE_TO_CONSTRUCT_OBJECT, OP_CALL,
-	OP_PREPARE_TO_CONSTRUCT_EXPR,
+	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,
+#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__WRITE,
+#endif
+	OP_OBJECT_POOL,	OP_STRING_POOL,
+	OP_PREPARE_TO_CONSTRUCT_OBJECT, OP_PREPARE_TO_EXPRESSION, 
+	OP_CALL, OP_CALL__WRITE,
 	//@}
 
 	//@{
@@ -48,6 +69,7 @@ enum OPCODE {
 	//@{
 	/// @name expression ops: binary
 	OP_SUB, OP_ADD, OP_MUL, OP_DIV, OP_MOD, OP_INTDIV,
+	OP_BIN_SL, OP_BIN_SR,
 	OP_BIN_AND, OP_BIN_OR, OP_BIN_XOR,
 	OP_LOG_AND, OP_LOG_OR, OP_LOG_XOR,
 	OP_NUM_LT, OP_NUM_GT, OP_NUM_LE, OP_NUM_GE, OP_NUM_EQ, OP_NUM_NE,
@@ -55,25 +77,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