--- parser3/src/main/compile_tools.C	2003/04/02 14:16:18	1.54.2.5.2.8
+++ parser3/src/main/compile_tools.C	2005/08/08 13:30:45	1.58
@@ -1,11 +1,11 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 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/04/02 14:16:18 $";
+static const char * const IDENT_COMPILE_TOOLS_C="$Date: 2005/08/08 13:30:45 $";
 
 #include "compile_tools.h"
 #include "pa_string.h"
@@ -15,21 +15,20 @@ static const char* IDENT_COMPILE_TOOLS_C
 #include "pa_vdouble.h"
 
 Value* LA2V(ArrayOperation& literal_string_array, int offset) {
-	return literal_string_array[offset+0].code()==OP_VALUE?literal_string_array[offset+1].value
+	return literal_string_array[offset+0].code==OP_VALUE?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) {
-		Value& value=literal_string_array[1].value->as_expr_result();
-		literal_string_array.put(1, &value);
-	}
+void maybe_change_string_literal_to_double_literal(ArrayOperation& literal_array) {
+	assert(literal_array[0].code==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, const String& new_value) {
-	if(literal_string_array[0].code()==OP_VALUE) { // extra safety
-		static_cast<VString*>(literal_string_array[1].value)->set_string(new_value);
-	}
+	assert(literal_string_array[0].code==OP_VALUE);
+	static_cast<VString*>(literal_string_array[2/*opcode+origin*/].value)->set_string(new_value);
 }
 
 void changetail_or_append(ArrayOperation& opcodes, 
@@ -37,8 +36,8 @@ void changetail_or_append(ArrayOperation
 	int tail=opcodes.count()-(with_argument?2:1);
 	if(tail>=0) {
 		Operation& op=opcodes.get_ref(tail);
-		if(op.code()==find) {
-			op.fcode=replace;
+		if(op.code==find) {
+			op.code=replace;
 			return;
 		}
 	}
@@ -47,7 +46,7 @@ void changetail_or_append(ArrayOperation
 }
 
 
-void push_LS(parse_control& pc, lexical_state 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;
@@ -55,10 +54,14 @@ void push_LS(parse_control& pc, lexical_
 		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(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;
+}