--- parser3/src/main/compile_tools.C	2012/03/16 09:24:12	1.69
+++ parser3/src/main/compile_tools.C	2016/05/24 16:47:16	1.78
@@ -1,7 +1,7 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (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)
 */
 
@@ -13,7 +13,7 @@
 #include "pa_vdouble.h"
 #include "pa_vmethod_frame.h"
 
-volatile const char * IDENT_COMPILE_TOOLS_C="$Id: compile_tools.C,v 1.69 2012/03/16 09:24:12 moko Exp $" IDENT_COMPILE_TOOLS_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
@@ -32,25 +32,12 @@ 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;
-		}
-	}
-
-	opcodes+=Operation(notfound);
-}
-
-bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace) {
-	if(opcodes[0].code!=find)
+bool change_first(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace) {
+	Operation& op=opcodes.get_ref(0);
+	if(op.code!=find)
 		return false;
 
-	opcodes.put(0, replace);
+	op.code=replace;
 	return true;
 }
 
@@ -59,7 +46,7 @@ bool maybe_change_first_opcode(ArrayOper
 bool maybe_make_self(ArrayOperation& opcodes, ArrayOperation& diving_code, size_t divine_count){
 	const String* first_name=LA2S(diving_code);
 
-	if(first_name && *first_name==SELF_ELEMENT_NAME){
+	if(first_name && SYMBOLS_EQ(*first_name,SELF_SYMBOL)){
 #ifdef OPTIMIZE_BYTECODE_GET_SELF_ELEMENT
 		if(
 			divine_count>=8
@@ -85,17 +72,33 @@ bool maybe_make_self(ArrayOperation& opc
 	return false;
 }
 
+#ifdef OPTIMIZE_BYTECODE_GET_ELEMENT__SPECIAL
+bool maybe_append_simple_diving_code(ArrayOperation& code, ArrayOperation& diving_code){
+	if(
+		diving_code.count()==3
+		&& diving_code[0].code==OP::OP_STRING__WRITE
+	){
+		O(code, OP::OP_VALUE);
+		P(code, diving_code, 1/*offset*/, 2/*limit*/); /*copy origin+value*/
+		return true;
+	} else {
+		return false;
+	}
+}
+
+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!=method_call_type_static)
-			throw Exception("parser.compile",
-					&call_type,
-					"incorrect method call type. the only valid call type method prefix is '"METHOD_CALL_TYPE_STATIC"'"
-				);
+		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);
@@ -109,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) {