--- parser3/src/main/compile_tools.C	2003/01/30 11:00:41	1.54.2.2
+++ parser3/src/main/compile_tools.C	2009/05/19 13:33:14	1.62
@@ -1,11 +1,11 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_COMPILE_TOOLS_C="$Date: 2003/01/30 11:00:41 $";
+static const char * const IDENT_COMPILE_TOOLS_C="$Date: 2009/05/19 13:33:14 $";
 
 #include "compile_tools.h"
 #include "pa_string.h"
@@ -14,49 +14,93 @@ static const char* IDENT_COMPILE_TOOLS_C
 #include "pa_vstring.h"
 #include "pa_vdouble.h"
 
-ValuePtr LA2V(ArrayOperation& literal_string_array, int offset) {
-	return literal_string_array[offset+0].code==OP_VALUE?literal_string_array[offset+1].value
-		:ValuePtr(0);
+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
+		:0;
 }
 
-void change_string_literal_to_double_literal(ArrayOperation& literal_string_array) {
-	if(literal_string_array[0].code==OP_VALUE) {
-		ValuePtr value=literal_string_array[1].value->as_expr_result();
-		literal_string_array[1].value=value;
-	}
+void maybe_change_string_literal_to_double_literal(ArrayOperation& literal_array) {
+	assert(literal_array[0].code==OP::OP_VALUE);
+	VString& vstring=*static_cast<VString*>(literal_array[2/*opcode+origin*/].value);
+	if(isdigit(vstring.string().first_char()))
+		literal_array.put(2/*opcode+origin*/, &vstring.as_expr_result());
 }
 
-void change_string_literal_value(ArrayOperation& literal_string_array, ConstStringPtr new_value) {
-	if(literal_string_array[0].code==OP_VALUE) { // extra safety
-		static_cast<VString&>(*literal_string_array[1].value).set_string(new_value);
-	}
+void change_string_literal_value(ArrayOperation& literal_string_array, const String& new_value) {
+	assert(literal_string_array[0].code==OP::OP_VALUE);
+	static_cast<VString*>(literal_string_array[2/*opcode+origin*/].value)->set_string(new_value);
 }
 
 void changetail_or_append(ArrayOperation& opcodes, 
-						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound) {
+						  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[tail];
-		if(op.code==find)
+		Operation& op=opcodes.get_ref(tail);
+		if(op.code==find) {
 			op.code=replace;
+			return;
+		}
 	}
 
 	opcodes+=Operation(notfound);
 }
 
 
-void push_LS(parse_control& pc, lexical_state new_state) { 
+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;
+}
+
+
+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);
+		return true;
+	}
+	return false;
+}
+
+
+bool append_2ops_opcode(ArrayOperation& opcodes, ArrayOperation& diving_code, OP::OPCODE code, size_t offset) {
+	assert(diving_code[0].code==OP::OP_VALUE);
+	if(diving_code[diving_code.count()-1].code==OP::OP_GET_ELEMENT){
+		O(opcodes, code);
+		P(opcodes, diving_code, 1/*offset*/, 2/*limit*/); // copy origin+value
+		P(opcodes, diving_code,
+#ifdef OPTIMIZE_BYTECODE_USE_TWO_OPERANDS_INSTRUCTIONS
+			offset, 3
+#else
+			offset-1, 4
+#endif
+		); // copy specified tail
+		return true;
+	} else {
+		return false;
+	}
+}
+
+void push_LS(Parse_control& pc, lexical_state new_state) { 
 	if(pc.ls_sp<MAX_LEXICAL_STATES) {
 		pc.ls_stack[pc.ls_sp++]=pc.ls;  
 		pc.ls=new_state;
 	} else
-		throw Exception(Exception::undefined_type, Exception::undefined_source, 
+		throw Exception(0, 0, 
 			"push_LS: ls_stack overflow");
 }
-void pop_LS(parse_control& pc) {
+void pop_LS(Parse_control& pc) {
 	if(--pc.ls_sp>=0)
 		pc.ls=pc.ls_stack[pc.ls_sp];
 	else
-		throw Exception(Exception::undefined_type, Exception::undefined_source, 
+		throw Exception(0, 0, 
 			"pop_LS: ls_stack underflow");
 }
+
+const String& Parse_control::alias_method(const String& name) {
+	return (main_alias && name==main_method_name)?*main_alias:name;
+}