--- parser3/src/main/compile_tools.C	2009/05/20 13:22:59	1.64
+++ parser3/src/main/compile_tools.C	2016/05/24 16:47:16	1.78
@@ -1,18 +1,19 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	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)
 */
 
-static const char * const IDENT_COMPILE_TOOLS_C="$Date: 2009/05/20 13:22:59 $";
-
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
 #include "pa_exception.h"
 #include "pa_vstring.h"
 #include "pa_vdouble.h"
+#include "pa_vmethod_frame.h"
+
+volatile const char * IDENT_COMPILE_TOOLS_C="$Id: compile_tools.C,v 1.78 2016/05/24 16:47:16 moko Exp $" IDENT_COMPILE_TOOLS_H;
 
 Value* LA2V(ArrayOperation& literal_string_array, int offset, OP::OPCODE code) {
 	return literal_string_array[offset+0].code==code?literal_string_array[offset+2/*skip opcode&origin*/].value
@@ -31,112 +32,79 @@ void change_string_literal_value(ArrayOp
 	static_cast<VString*>(literal_string_array[2/*opcode+origin*/].value)->set_string(new_value);
 }
 
-void changetail_or_append(ArrayOperation& opcodes, 
-						  OP::OPCODE find, bool with_argument, OP::OPCODE replace, OP::OPCODE notfound) {
-	int tail=opcodes.count()-(with_argument?2:1);
-	if(tail>=0) {
-		Operation& op=opcodes.get_ref(tail);
-		if(op.code==find) {
-			op.code=replace;
-			return;
-		}
-	}
+bool change_first(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace) {
+	Operation& op=opcodes.get_ref(0);
+	if(op.code!=find)
+		return false;
 
-	opcodes+=Operation(notfound);
+	op.code=replace;
+	return true;
 }
 
 
-bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace, bool strict) {
-	if(opcodes[0].code==find){
-		opcodes.put(0, replace);
-		return true;
-	}
-	if(strict)
-		assert(opcodes[0].code==find);
-
-	return false;
-}
-
+// OP_VALUE+origin+self+OP_GET_ELEMENT+OP_VALUE+origin+value+OP_GET_ELEMENT => OP_WITH_SELF__VALUE__GET_ELEMENT+origin+value
+bool maybe_make_self(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){
+	const String* first_name=LA2S(diving_code);
 
-bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE last, OP::OPCODE replace) {
-	if(opcodes[0].code==find && opcodes[opcodes.count()-1].code==last){
-		opcodes.put(0, replace);
+	if(first_name && SYMBOLS_EQ(*first_name,SELF_SYMBOL)){
+#ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
+		if(
+			divine_count>=8
+			&& diving_code[3].code==OP::OP_GET_ELEMENT
+			&& diving_code[4].code==OP::OP_VALUE
+			&& diving_code[7].code==OP::OP_GET_ELEMENT
+		){
+			// optimization for $self.field and ^self.method
+			O(opcodes, OP::OP_WITH_SELF__VALUE__GET_ELEMENT);
+			P(opcodes, diving_code, 5/*offset*/, 2/*limit*/); // copy second origin+value. we know that the first one is "self"
+			if(divine_count>8)
+				P(opcodes, diving_code, 8/*offset*/); // copy tail
+		} else
+#endif
+		{
+			// self.xxx... => xxx...
+			// OP_VALUE+origin+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+...
+			O(opcodes, OP::OP_WITH_SELF); /* stack: starting context */
+			P(opcodes, diving_code, divine_count>=4?4/*OP::OP_VALUE+origin+string+OP::OP_GET_ELEMENTx*/:3/*OP::OP_+origin+string*/);
+		}
 		return true;
 	}
 	return false;
 }
 
-
-// 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
-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);
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL
+bool maybe_append_simple_diving_code(ArrayOperation& code, ArrayOperation& diving_code){
 	if(
-		diving_code[4].code==OP::OP_VALUE
-		&& diving_code[divine_count-1].code==OP::OP_GET_ELEMENT
+		diving_code.count()==3
+		&& diving_code[0].code==OP::OP_STRING__WRITE
 	){
-		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
+		O(code, OP::OP_VALUE);
+		P(code, diving_code, 1/*offset*/, 2/*limit*/); /*copy origin+value*/
 		return true;
-	}
-	return false;
-}
-
-// 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
-bool maybe_make_get_object_var_element(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){
-	if(divine_count!=10)
+	} else {
 		return false;
-
-	assert(diving_code[0].code==OP::OP_VALUE);
-	if(
-		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
-	){
-		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
-		return true;
 	}
-	return false;
 }
 
-// $a(1) or $.b(2)
-// (OP_WITH_ROOT|OP_WITH_WRITE)+OP_VALUE+origin+value
-// OP_PREPARE_TO_EXPRESSION+OP_VALUE+origin+value+CONSTRUCT_EXPR
-
-// $c[d] or $.e[f]
-// OP_WITH_ROOT+OP_VALUE+origin+value
-// OP_VALUE+origin+value+OP_CONSTRUCT_VALUE
-bool maybe_make_root_or_write_construct(ArrayOperation& opcodes, ArrayOperation& var_ops, ArrayOperation& expr_ops){
-	if(var_ops.count()==4 && (var_ops[0].code==OP::OP_WITH_ROOT || var_ops[0].code==OP::OP_WITH_WRITE)){
-		if(
-			expr_ops.count()==5
-			&& expr_ops[0].code==OP::OP_PREPARE_TO_EXPRESSION
-			&& expr_ops[1].code==OP::OP_VALUE
-			&& expr_ops[4].code==OP::OP_CONSTRUCT_EXPR
-		){
-			// $a(1) or $.b(2)
-			O(opcodes, (var_ops[0].code==OP::OP_WITH_ROOT) ? OP::OP_ROOT_CONSTRUCT_EXPR : OP::OP_WRITE_CONSTRUCT_EXPR);
-			P(opcodes, var_ops, 2/*offset*/); // skip OP_WITH+OP_VALUE and copy 1st origin+value
-			P(opcodes, expr_ops, 2/*offset*/, 2/*limit*/); // copy 2nd origin+value
-			return true;
-		} else if(
-			 expr_ops.count()==4
-			 && expr_ops[0].code==OP::OP_VALUE
-			 && expr_ops[3].code==OP::OP_CONSTRUCT_VALUE
-		){
-			// $c[d] or $.e[f]
-			O(opcodes, (var_ops[0].code==OP::OP_WITH_ROOT) ? OP::OP_ROOT_CONSTRUCT_VALUE : OP::OP_WRITE_CONSTRUCT_VALUE);
-			P(opcodes, var_ops, 2/*offset*/); // skip OP_WITH+OP_VALUE and copy 1st origin+value
-			P(opcodes, expr_ops, 1/*offset*/, 2/*limit*/); // copy 2nd origin+value
-			return true;
-		}
+bool is_special_element(ArrayOperation& opcodes){
+	const String* name=LA2S(opcodes);
+	return name && ( SYMBOLS_EQ(*name,CLASS_SYMBOL) || SYMBOLS_EQ(*name,CLASS_NAME_SYMBOL) );
+}
+#endif
+
+Method::Call_type GetMethodCallType(Parse_control& pc, ArrayOperation& literal_array) {
+	const String* full_name=LA2S(literal_array);
+	int pos=full_name->pos(':');
+	if(pos > 0) {
+		const String call_type=full_name->mid(0, pos);
+		if(call_type!=Symbols::STATIC_SYMBOL)
+			throw Exception("parser.compile", &call_type, "incorrect method call type. the only valid call type method prefix is 'static'");
+		const String *sole_name=&full_name->mid(pos+1, full_name->length());
+		// replace full method name (static:method) by sole method name (method). it will be used later.
+		change_string_literal_value(literal_array, *sole_name);
+		return Method::CT_STATIC;
 	}
-	return false;
+	return pc.get_methods_call_type();
 }
 
 void push_LS(Parse_control& pc, lexical_state new_state) { 
@@ -144,15 +112,13 @@ void push_LS(Parse_control& pc, lexical_
 		pc.ls_stack[pc.ls_sp++]=pc.ls;  
 		pc.ls=new_state;
 	} else
-		throw Exception(0, 0, 
-			"push_LS: ls_stack overflow");
+		throw Exception(0, 0, "push_LS: ls_stack overflow");
 }
 void pop_LS(Parse_control& pc) {
 	if(--pc.ls_sp>=0)
 		pc.ls=pc.ls_stack[pc.ls_sp];
 	else
-		throw Exception(0, 0, 
-			"pop_LS: ls_stack underflow");
+		throw Exception(0, 0, "pop_LS: ls_stack underflow");
 }
 
 const String& Parse_control::alias_method(const String& name) {