--- parser3/src/main/compile_tools.C	2001/02/20 19:21:13	1.2
+++ parser3/src/main/compile_tools.C	2008/08/15 15:26:14	1.60
@@ -1,89 +1,67 @@
-/*
-  $Id: compile_tools.C,v 1.2 2001/02/20 19:21:13 paf Exp $
+/** @file
+	Parser: compiler support helper functions.
+
+	Copyright (c) 2001-2005 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: 2008/08/15 15:26:14 $";
+
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
 #include "pa_exception.h"
+#include "pa_vstring.h"
+#include "pa_vdouble.h"
 
-void *N(void *apool) {
-	Pool& pool=*static_cast<Pool *>(apool);
-	return new(pool) Array(pool);
+Value* LA2V(ArrayOperation& literal_string_array, int offset) {
+	return literal_string_array[offset+0].code==OP::OP_VALUE?literal_string_array[offset+2/*skip opcode&origin*/].value
+		:0;
 }
 
-void A(void **result, enum OPCODE acode) {
-	int code=acode;
-	(*static_cast<Array *>(*result))+=reinterpret_cast<Array::Item *>(code);
+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 G(void **result, void *param) {
-	(*static_cast<Array *>(*result))+=param;
+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 *L(void *astring) {
-	String *string=static_cast<String *>(astring);
-
-	// empty ops array
-	void *result=N(&string->pool());
-
-	// append OP_STRING
-	int code=OP_STRING;
-	*(static_cast<Array *>(result))+=reinterpret_cast<Array::Item *>(code);
-
-	// append 'string'
-	*(static_cast<Array *>(result))+=string;
-
-	return result;
-}
-
-void *LS(void *literal) {
-	return const_cast<void *>(static_cast<Array *>(literal)->get(1));
-}
+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;
+		}
+	}
 
-void P(void **result, void *code_array) {
-	(*(static_cast<Array *>(*result))).append_array(*static_cast<Array *>(code_array));
+	opcodes+=Operation(notfound);
 }
 
 
-
-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;
+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");
-}
-
-void *string_create(void *apool) {
-	Pool& pool=*static_cast<Pool *>(apool);
-	return new(pool) String(pool);
-}
-
-void real_cstring_append(CSTRING_APPEND_PARAMS) {
-	static_cast<String *>(astring)->APPEND(piece, size, file, line);
-}
-
-char *string_cstr(void *astring) {
-	return static_cast<String *>(astring)->cstr();
+		throw Exception(0, 0, 
+			"pop_LS: ls_stack underflow");
 }
 
-/* exception */
-
-void exception(void *pool, 
-		void *atype, void *acode,
-		void *aproblem_source, 
-		char *acomment) {
-	static_cast<Pool *>(pool)->exception().raise(
-		static_cast<class String *>(atype), 
-		static_cast<class String *>(acode), 
-		static_cast<class String *>(aproblem_source), 
-		acomment);
+const String& Parse_control::alias_method(const String& name) {
+	return (main_alias && name==main_method_name)?*main_alias:name;
 }