--- parser3/src/main/compile_tools.C	2001/02/21 06:21:19	1.3
+++ parser3/src/main/compile_tools.C	2009/06/07 13:15:54	1.67
@@ -1,42 +1,107 @@
-/*
-  $Id: compile_tools.C,v 1.3 2001/02/21 06:21:19 paf Exp $
+/** @file
+	Parser: compiler support helper functions.
+
+	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/06/07 13:15:54 $";
+
 #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"
+
+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;
+}
 
-Array *L(String *string) {
-	// empty ops array
-	Array *result=N(&string->pool());
+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 OP_STRING
-	Operation op; op.code=OP_STRING;
-	*result+=reinterpret_cast<Array::Item *>(op.cast);
+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);
+}
 
-	// append 'string'
-	*result+=string;
+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;
+		}
+	}
 
-	return result;
+	opcodes+=Operation(notfound);
 }
 
-const String *LA2S(Array *literal_string_array) {
-	return static_cast<const String *>(literal_string_array->get(1));
+bool maybe_change_first_opcode(ArrayOperation& opcodes, OP::OPCODE find, OP::OPCODE replace) {
+	if(opcodes[0].code!=find)
+		return false;
+
+	opcodes.put(0, replace);
+	return true;
 }
 
 
-void push_LS(struct parse_control *pc) {
-	if(pc->sp<MAX_LEXICAL_STATES) {
-		pc->stack[pc->sp++]=pc->ls;  pc->ls=LS_VAR_NAME_SIMPLE;
+// 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);
+
+	if(first_name && *first_name==SELF_ELEMENT_NAME){
+#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;
+}
+
+
+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
-		(static_cast<Pool *>(pc->pool))->exception().raise(0, 0, 0, 
-			"push_LS: stack overflow");
+		throw Exception(0, 0, 
+			"push_LS: ls_stack overflow");
 }
-void pop_LS(struct 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
-		(static_cast<Pool *>(pc->pool))->exception().raise(0, 0, 0, 
-			"push_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;
 }