--- parser3/src/main/compile_tools.C	2001/02/22 13:52:26	1.8
+++ parser3/src/main/compile_tools.C	2003/03/19 16:28:08	1.54.2.5.2.2
@@ -1,41 +1,64 @@
-/*
-  $Id: compile_tools.C,v 1.8 2001/02/22 13:52:26 paf Exp $
+/** @file
+	Parser: compiler support helper functions.
+
+	Copyright (c) 2001-2003 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/03/19 16:28:08 $";
+
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
 #include "pa_exception.h"
-#include "pa_value.h"
-
-Array *L(Value *value) {
-	// empty ops array
-	Array *result=N(value->pool());
+#include "pa_vstring.h"
+#include "pa_vdouble.h"
 
-	// append OP_STRING
-	Operation op; op.code=OP_VALUE;
-	*result+=op.cast;
+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);
+}
 
-	// append 'value'
-	*result+=value;
+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;
+	}
+}
 
-	return 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);
+	}
 }
 
-String *LA2S(Array *literal_string_array, int offset) {
-	return static_cast<Value *>(literal_string_array->get(offset+1))->get_string();
+void changetail_or_append(ArrayOperation& opcodes, 
+						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound) {
+	int tail=opcodes.count()-(with_argument?2:1);
+	if(tail>=0) {
+		Operation& op=opcodes[tail];
+		if(op.code==find) {
+			op.code=replace;
+			return;
+		}
+	}
+
+	opcodes+=Operation(notfound);
 }
 
 
-void push_LS(struct 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(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
-		pc->pool->THROW(0, 0, 0, "push_LS: stack underflow");
+		throw Exception(0, 0, 
+			"pop_LS: ls_stack underflow");
 }