--- parser3/src/main/compile_tools.h	2009/06/07 13:15:54	1.96
+++ parser3/src/main/compile_tools.h	2012/03/16 09:24:12	1.103
@@ -1,14 +1,14 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 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/06/07 13:15:54 $";
+#define IDENT_COMPILE_TOOLS_H "$Id: compile_tools.h,v 1.103 2012/03/16 09:24:12 moko Exp $"
 
 #include "pa_opcode.h"
 #include "pa_types.h"
@@ -18,6 +18,11 @@ static const char * const IDENT_COMPILE_
 /// used to track source column number
 #define TAB_SIZE 8
 
+#define METHOD_CALL_TYPE_STATIC "static"
+#define METHOD_CALL_TYPE_DYNAMIC "dynamic"
+const String method_call_type_static(METHOD_CALL_TYPE_STATIC);
+const String method_call_type_dynamic(METHOD_CALL_TYPE_DYNAMIC);
+
 enum lexical_state {
 	LS_USER, LS_NAME_SQUARE_PART,
 	LS_USER_COMMENT,
@@ -131,11 +136,11 @@ public:
 	}
 
 	VStateless_class* get_existed_class(VStateless_class* aclass){
-		if(aclass){
-			if(Value* class_value=request.classes().get(aclass->name())){
+		// 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.classes().get(aclass->name()))
 				return class_value->get_class();
-			}
-		}
 		return 0;
 	}
 
@@ -151,11 +156,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() {
@@ -207,6 +216,10 @@ inline void P(ArrayOperation& result, Ar
 }
 
 /// append cOde Array
+inline void OA(ArrayOperation& result, ArrayOperation* code_array) {
+	result+=Operation(code_array); // append 'code_array'
+}
+
 inline void OA(ArrayOperation& result, OP::OPCODE code, ArrayOperation* code_array) {
 	result+=Operation(code); // append OP_CODE
 	result+=Operation(code_array); // append 'code_array'
@@ -232,6 +245,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))
@@ -280,7 +294,7 @@ inline bool maybe_make_get_object_elemen
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_VAR_ELEMENT
 // OP_VALUE+origin+value+OP_GET_ELEMENT+OP_WITH_READ+OP_VALUE+origin+value+OP_GET_ELEMENT+OP_GET_ELEMENT => OP_GET_OBJECT_VAR_ELEMENT+origin+value+origin+value
 inline bool maybe_make_get_object_var_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){
-	if(divine_count<10)
+	if(divine_count!=10)
 		return false;
 
 	assert(diving_code[0].code==OP::OP_VALUE);
@@ -294,8 +308,6 @@ inline bool maybe_make_get_object_var_el
 		O(opcodes, OP::OP_GET_OBJECT_VAR_ELEMENT);
 		P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy first origin+value
 		P(opcodes, diving_code, 6, 2); // second origin+value
-		if(divine_count>10)
-			P(opcodes, diving_code, 10/*offset*/); // tail
 		return true;
 	}
 	return false;
@@ -379,6 +391,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);