--- parser3/src/main/compile_tools.h	2009/05/23 05:55:04	1.90
+++ parser3/src/main/compile_tools.h	2015/04/08 18:08:53	1.107
@@ -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/05/23 05:55:04 $";
+#define IDENT_COMPILE_TOOLS_H "$Id: compile_tools.h,v 1.107 2015/04/08 18:08:53 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,
@@ -119,23 +124,27 @@ 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->name(), cclass) != 0;
+			request.classes().put(cclass->name(), cclass);
 		}
+		return false;
 	}
 
 	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 +160,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 +220,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 +249,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))
@@ -247,189 +265,157 @@ 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);
-
-bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace, bool strict=false);
+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;
+}
 
-bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE last, OP::OPCODE replace);
+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_make_get_object_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count);
+	opcodes+=Operation(notfound);
+};
 
-bool maybe_make_get_object_var_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count);
+bool change_first(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace);
 
-// OP_VALUE+origin+value+OP_GET_ELEMENT+OP_VALUE+origin+value+OP_GET_ELEMENT => OP_GET_OBJECT_ELEMENT+origin+value+[OP_VALUE]+origin+value+OP_GET_ELEMENT
-inline bool maybe_make_get_object_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){
 #ifdef OPTIMIZE_BYTECODE_GET_OBJECT_ELEMENT
-	if(divine_count!=8)
+// OP_VALUE+origin+value+OP_GET_ELEMENT+OP_VALUE+origin+value+OP_GET_ELEMENT => OP_GET_OBJECT_ELEMENT+origin+value+origin+value
+inline bool maybe_make_get_object_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){
+	if(divine_count<8)
 		return false;
 
 	assert(diving_code[0].code==OP::OP_VALUE);
 	if(
-		diving_code[4].code==OP::OP_VALUE
-		&& diving_code[divine_count-1].code==OP::OP_GET_ELEMENT
+		diving_code[3].code==OP::OP_GET_ELEMENT
+		&& diving_code[4].code==OP::OP_VALUE
+		&& diving_code[7].code==OP::OP_GET_ELEMENT
 	){
 		O(opcodes, OP::OP_GET_OBJECT_ELEMENT);
-		P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
-		P(opcodes, diving_code, 5, 3); // copy specified tail
+		P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy first origin+value
+		P(opcodes, diving_code, 5, 2); // second origin+value
+		if(divine_count>8)
+			P(opcodes, diving_code, 8/*offset*/); // tail
 		return true;
 	}
-#endif
 	return false;
 }
+#endif
+
 
-// 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+[OP_VALUE]+origin+value+OP_GET_ELEMENT
-inline bool maybe_make_get_object_var_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){
 #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)
 		return false;
 
 	assert(diving_code[0].code==OP::OP_VALUE);
 	if(
-		diving_code[4].code==OP::OP_WITH_READ
+		diving_code[3].code==OP::OP_GET_ELEMENT
+		&& diving_code[4].code==OP::OP_WITH_READ
 		&& diving_code[5].code==OP::OP_VALUE
-		&& diving_code[divine_count-1].code==OP::OP_GET_ELEMENT
+		&& diving_code[8].code==OP::OP_GET_ELEMENT
+		&& diving_code[9].code==OP::OP_GET_ELEMENT
 	){
 		O(opcodes, OP::OP_GET_OBJECT_VAR_ELEMENT);
-		P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
-		P(opcodes, diving_code, 6, 3); // copy specified tail
+		P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy first origin+value
+		P(opcodes, diving_code, 6, 2); // second origin+value
 		return true;
 	}
-#endif
 	return false;
 }
+#endif
+
+
+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
 
-inline bool maybe_make_root_or_write_construct(ArrayOperation& opcodes, ArrayOperation& var_ops, ArrayOperation& expr_ops){
 #ifdef OPTIMIZE_BYTECODE_CONSTRUCT
-	if(
-		var_ops.count()==4
-		&& (var_ops[0].code==OP::OP_WITH_ROOT || var_ops[0].code==OP::OP_WITH_WRITE)
-	){
-		// OP_WITH_ROOT|OP_WITH_WRITE
-		// OP_VALUE
-		// origin
-		// value
-		size_t count=expr_ops.count();
-		size_t limit=2;
-
-		ArrayOperation* source=0;
-		size_t offset=0;
-		bool with_root=(var_ops[0].code==OP::OP_WITH_ROOT);
-
-		if(
-			expr_ops[0].code==OP::OP_PREPARE_TO_EXPRESSION
-			&& expr_ops[count-1].code==OP::OP_CONSTRUCT_EXPR
-		){
-			if(count==5){
-				if(expr_ops[1].code==OP::OP_VALUE){
-					//	$a(1) $.a(2)
-					//	OP_PREPARE_TO_EXPRESSION
-					//	OP_VALUE
-					//	origin
-					//	value
-					//	OP_CONSTRUCT_EXPR
-					O(opcodes, (with_root) ? OP::OP_ROOT_CONSTRUCT_EXPR : OP::OP_WRITE_CONSTRUCT_EXPR);
-					source=&expr_ops;
-					offset=2;
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-				} else if(expr_ops[1].code==OP::OP_VALUE__GET_ELEMENT){
-					//	$a($b) or $.a($b)
-					//	OP_PREPARE_TO_EXPRESSION
-					//	OP_VALUE__GET_ELEMENT
-					//	origin
-					//	value
-					//	OP_CONSTRUCT_EXPR
-					O(opcodes, (with_root) ? OP::OP_ROOT_ELEMENT_CONSTRUCT_EXPR : OP::OP_WRITE_ELEMENT_CONSTRUCT_EXPR);
-					source=&expr_ops;
-					offset=2;
-#endif // OPTIMIZE_BYTECODE_GET_ELEMENT
+inline bool maybe_optimize_construct(ArrayOperation& opcodes, ArrayOperation& var_ops, ArrayOperation& expr_ops){
+	size_t expr_count=expr_ops.count();
+	OP::OPCODE construct_op=expr_ops[expr_count-1].code;
+	size_t construct=(construct_op==OP::OP_CONSTRUCT_VALUE)?0x01:(construct_op==OP::OP_CONSTRUCT_EXPR)?0x02:0x00;
+	if(construct){
+		P(opcodes, expr_ops, 0/*offset*/, expr_count-1/*limit*/); // copy constructor body without CONSTRUCT_(VALUE|EXPR)
+
+		size_t with=0x00;
+		switch(var_ops[0].code){
+			case OP::OP_WITH_ROOT:
+				{
+					with=0x10;
+					break;
 				}
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-			} else if(count==7){
-				if(
-					expr_ops[1].code==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR
-					&& expr_ops[4].code==OP::OP_CALL
-				){
-					//	$a(^b[]) $.a(^b[])
-					//	OP_PREPARE_TO_EXPRESSION
-					//	VALUE__GET_ELEMENT_OR_OPERATOR
-					//	origin
-					//	value
-					//	OP_CALL
-					//		<empty params>
-					//	OP_CONSTRUCT_EXPR
-					O(opcodes, (with_root) ? OP::OP_ROOT_CALL_CONSTRUCT_EXPR : OP::OP_WRITE_CALL_CONSTRUCT_EXPR);
-					source=&expr_ops;
-					offset=2;
-					limit=4;
+			case OP::OP_WITH_WRITE:
+				{
+					with=0x20;
+					break;
 				}
-#endif // OPTIMIZE_BYTECODE_GET_ELEMENT
-			}
-		} else if(expr_ops[count-1].code==OP::OP_CONSTRUCT_VALUE){
-			if(
-				count==4
-				&& expr_ops[0].code==OP::OP_VALUE
-			){
-				//	$a[b] $.a[b]
-				//	OP_VALUE
-				//	origin
-				//	value
-				//	OP_CONSTRUCT_VALUE
-				O(opcodes, (with_root) ? OP::OP_ROOT_CONSTRUCT_VALUE : OP::OP_WRITE_CONSTRUCT_VALUE);
-				source=&expr_ops;
-				offset=1;
-			} else if(
-				count==3
-				&& expr_ops[0].code==OP::OP_OBJECT_POOL
-			){
-#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT
-				ArrayOperation& pool_ops=*expr_ops[1].ops;
-
-				if(
-					pool_ops.count()==3
-					&& pool_ops[0].code==OP::OP_VALUE__GET_ELEMENT__WRITE
-				){
-					//	$a[$b] $.a[$b]
-					//	OP_OBJECT_POOL
-					//		OP_VALUE__GET_ELEMENT__WRITE
-					//		origin
-					//		value
-					//	OP_CONSTRUCT_VALUE
-					O(opcodes, (with_root) ? OP::OP_ROOT_ELEMENT_CONSTRUCT_VALUE : OP::OP_WRITE_ELEMENT_CONSTRUCT_VALUE);
-					source=&pool_ops;
-					offset=1;
-				} else if(
-					pool_ops.count()==5
-					&& pool_ops[0].code==OP::OP_VALUE__GET_ELEMENT_OR_OPERATOR
-					&& pool_ops[3].code==OP::OP_CALL__WRITE
-				){
-					//	$a[^b[]] $.a[^b[]]
-					//	OP_OBJECT_POOL
-					//		OP_VALUE__GET_ELEMENT_OR_OPERATOR
-					//		origin
-					//		value
-					//		OP_CALL__WRITE
-					//			<empty params>
-					//	OP_CONSTRUCT_VALUE
-					O(opcodes, (with_root) ? OP::OP_ROOT_CALL_CONSTRUCT_VALUE : OP::OP_WRITE_CALL_CONSTRUCT_VALUE);
-					source=&pool_ops;
-					offset=1;
-					limit=4;
+			case OP::OP_WITH_SELF:
+				{
+					with=0x30;
+					break;
 				}
-#endif // OPTIMIZE_BYTECODE_GET_ELEMENT
-			}
+			default: break;
 		}
 
-		if(source){
-			P(opcodes, var_ops, 2/*offset*/, 2/*limit*/); // copy 1st origin+value
-			P(opcodes, *source, offset, limit);
-			return true;
+		if(with && var_ops[1].code==OP::OP_VALUE && var_ops.count()==4){
+			OP::OPCODE code=OP::OP_VALUE; // calm down compiler. will be reassigned for sure.
+			switch( with | construct ) {
+				case 0x11:
+					{
+						code=OP::OP_WITH_ROOT__VALUE__CONSTRUCT_VALUE;
+						break;
+					}
+				case 0x12:
+					{
+						code=OP::OP_WITH_ROOT__VALUE__CONSTRUCT_EXPR;
+						break;
+					}
+				case 0x21:
+					{
+						code=OP::OP_WITH_WRITE__VALUE__CONSTRUCT_VALUE;
+						break;
+					}
+				case 0x22:
+					{
+						code=OP::OP_WITH_WRITE__VALUE__CONSTRUCT_EXPR;
+						break;
+					}
+				case 0x31:
+					{
+						code=OP::OP_WITH_SELF__VALUE__CONSTRUCT_VALUE;
+						break;
+					}
+				case 0x32:
+					{
+						code=OP::OP_WITH_SELF__VALUE__CONSTRUCT_EXPR;
+						break;
+					}
+			}
+			O(opcodes, code);
+			P(opcodes, var_ops, 2/*offset*/, 2/*limit*/); // copy origin+value
+		} else {
+			P(opcodes, var_ops);
+			O(opcodes, construct_op);
 		}
+		return true;
 	}
-#endif // OPTIMIZE_BYTECODE_CONSTRUCT
 	return false;
 }
+#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);