--- parser3/src/main/compile_tools.C	2001/04/03 07:54:25	1.34
+++ parser3/src/main/compile_tools.C	2009/05/19 13:33:14	1.62
@@ -1,13 +1,12 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: compile_tools.C,v 1.34 2001/04/03 07:54:25 paf Exp $
+	Copyright (c) 2001-2009 ArtLebedev Group (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/19 13:33:14 $";
+
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
@@ -15,71 +14,93 @@
 #include "pa_vstring.h"
 #include "pa_vdouble.h"
 
-void PV(Array/*<Operation>*/ *result, Value *value) {
-	// append OP_VALUE
-	Operation op; op.code=OP_VALUE;
-	*result+=op.cast;
-
-	// append 'value'
-	*result+=value;
+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 PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_CURLY_CODE__STORE_PARAM;
-	*result+=op.cast;
+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());
+}
 
-	// append 'vstring'
-	*result+=code_array;
+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 PEA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_EXPR_CODE__STORE_PARAM;
-	*result+=op.cast;
+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;
+		}
+	}
 
-	// append 'vstring'
-	*result+=code_array;
+	opcodes+=Operation(notfound);
 }
 
-Array *VL(Value *value) {
-	// empty ops array
-	Array *result=N(value->pool());
 
-	// append 'value' to 'result'
-	PV(result, value);
+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 result;
+	return false;
 }
 
-Value *LA2V(Array *literal_string_array, int offset) {
-	Operation op;
-	op.cast=literal_string_array->get(offset+0);
-	if(op.code!=OP_VALUE)
-		return 0;
 
-	return static_cast<Value *>(literal_string_array->get(offset+1));
+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;
 }
 
-void change_string_literal_to_double_literal(Array *literal_string_array) {
-	VString *vstring=static_cast<VString *>(literal_string_array->get(1));
-	Value *value=vstring->as_expr_result();
-	literal_string_array->put(1, value);
-}
-void change_string_literal_to_write_string_literal(Array *literal_string_array) {
-	Operation op; op.code=OP_STRING__WRITE;
-	literal_string_array->put(0, op.cast);
+
+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.sp<MAX_LEXICAL_STATES) {
-		pc.stack[pc.sp++]=pc.ls;  pc.ls=new_state;
+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
-		pc.pool->THROW(0, 0, 0, "push_LS: stack overflow");
+		throw Exception(0, 0, 
+			"push_LS: ls_stack overflow");
 }
-void pop_LS(parse_control& pc) {
-	if(--pc.sp>=0)
-		pc.ls=pc.stack[pc.sp];
+void pop_LS(Parse_control& pc) {
+	if(--pc.ls_sp>=0)
+		pc.ls=pc.ls_stack[pc.ls_sp];
 	else
-		pc.pool->THROW(0, 0, 0, "pop_LS: stack underflow");
+		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;
 }