--- parser3/src/main/compile_tools.h	2009/08/14 23:36:55	1.99
+++ parser3/src/main/compile_tools.h	2016/05/24 15:42:43	1.111
@@ -1,14 +1,14 @@
 /** @file
 	Parser: compiler support helper functions 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)
 */
 
 #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS
 
-static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2009/08/14 23:36:55 $";
+#define IDENT_COMPILE_TOOLS_H "$Id: compile_tools.h,v 1.111 2016/05/24 15:42:43 moko Exp $"
 
 #include "pa_opcode.h"
 #include "pa_types.h"
@@ -119,20 +119,26 @@ public:
 		*cclasses+=aclass;
 	}
 
-	void class_add(){
+	/// true if exception should be rised
+	bool class_add(){
 		if(cclass_new){
 			cclass=cclass_new;
-			// append to request's classes
-			request.classes().put(cclass->name(), cclass);
 			*cclasses+=cclass;
 			cclass_new=0;
 			append=false;
+			// append to request's classes
+			if(!request.allow_class_replace)
+				return request.classes().put_dont_replace(cclass->type(), cclass) != 0;
+			request.classes().put(cclass->type(), cclass);
 		}
+		return false;
 	}
 
 	VStateless_class* get_existed_class(VStateless_class* aclass){
+		// checking existence of the class during processing @OPTIONS\npartial
+		// method should't use get_class because the last one will call operator @autouse[] if the class wasn't loaded
 		if(aclass)
-			if(Value* class_value=request.get_class(aclass->name()))
+			if(Value* class_value=request.classes().get(aclass->type()))
 				return class_value->get_class();
 		return 0;
 	}
@@ -149,11 +155,15 @@ public:
 	}
 
 	void set_all_vars_local(){
-		if(cclass_new){
-			cclass_new->set_all_vars_local();
-		} else {
-			cclass->set_all_vars_local();
-		}
+		(cclass_new ? cclass_new : cclass)->set_all_vars_local();
+	}
+
+	void set_methods_call_type(Method::Call_type call_type){
+		(cclass_new ? cclass_new : cclass)->set_methods_call_type(call_type);
+	}
+
+	Method::Call_type get_methods_call_type(){
+		return (cclass_new ? cclass_new : cclass)->get_methods_call_type();
 	}
 
 	void pos_next_line() {
@@ -234,6 +244,7 @@ inline ArrayOperation* VL(Value* value,
 
 /// Literal Array to(2) Value @return Value from literal Array OP+origin+Value
 Value* LA2V(ArrayOperation& literal_string_array, int offset=0, OP::OPCODE code=OP::OP_VALUE);
+
 /// Literal Array to(2) String  @return String value from literal Array OP+origin+String array
 inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0, OP::OPCODE code=OP::OP_VALUE) {
 	if(Value* value=LA2V(literal_string_array, offset, code))
@@ -249,11 +260,25 @@ void maybe_change_string_literal_to_doub
 
 void change_string_literal_value(ArrayOperation& literal_string_array, const String& new_value);
 
-void changetail_or_append(ArrayOperation& opcodes, 
-						  OP::OPCODE find, bool with_argument, OP::OPCODE replace, OP::OPCODE notfound);
+inline bool change(ArrayOperation& opcodes, int pos, OP::OPCODE find, OP::OPCODE replace) {
+	if(pos>=0) {
+		Operation& op=opcodes.get_ref(pos);
+		if(op.code==find) {
+			op.code=replace;
+			return true;
+		}
+	}
+	return false;
+}
+
+inline void change_or_append(ArrayOperation& opcodes, int pos, OP::OPCODE find, OP::OPCODE replace, OP::OPCODE notfound) {
+	if(change(opcodes, pos, find, replace))
+		return;
 
-bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace);
+	opcodes+=Operation(notfound);
+}
 
+bool change_first(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace);
 
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
 // OP_VALUE+origin+value+OP_GET_ELEMENT+OP_VALUE+origin+value+OP_GET_ELEMENT => OP_GET_OBJECT_ELEMENT+origin+value+origin+value
@@ -305,6 +330,11 @@ inline bool maybe_make_get_object_var_el
 
 bool maybe_make_self(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count);
 
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL
+bool maybe_append_simple_diving_code(ArrayOperation& code, ArrayOperation& diving_code);
+
+bool is_special_element(ArrayOperation& opcodes);
+#endif
 
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
 inline bool maybe_optimize_construct(ArrayOperation& opcodes, ArrayOperation& var_ops, ArrayOperation& expr_ops){
@@ -331,6 +361,7 @@ inline bool maybe_optimize_construct(Arr
 					with=0x30;
 					break;
 				}
+			default: break;
 		}
 
 		if(with && var_ops[1].code==OP::OP_VALUE && var_ops.count()==4){
@@ -379,6 +410,7 @@ inline bool maybe_optimize_construct(Arr
 }
 #endif
 
+Method::Call_type GetMethodCallType(Parse_control& pc, ArrayOperation& literal_string_array);
 
 void push_LS(Parse_control& pc, lexical_state new_state);
 void pop_LS(Parse_control& pc);