--- parser3/src/main/compile_tools.C	2001/02/20 19:21:13	1.2
+++ parser3/src/main/compile_tools.C	2002/08/21 11:47:25	1.53
@@ -1,89 +1,83 @@
-/*
-  $Id: compile_tools.C,v 1.2 2001/02/20 19:21:13 paf Exp $
+/** @file
+	Parser: compiler support helper functions.
+
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
+static const char* IDENT_COMPILE_TOOLS_C="$Date: 2002/08/21 11:47:25 $";
+
 #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);
-}
-
-void A(void **result, enum OPCODE acode) {
-	int code=acode;
-	(*static_cast<Array *>(*result))+=reinterpret_cast<Array::Item *>(code);
-}
-
-void G(void **result, void *param) {
-	(*static_cast<Array *>(*result))+=param;
-}
-
-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 P(void **result, void *code_array) {
-	(*(static_cast<Array *>(*result))).append_array(*static_cast<Array *>(code_array));
+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(Array *literal_string_array, int offset) {
+	Operation op;
+	op.cast=literal_string_array->get(offset+0);
+	return op.code==OP_VALUE?
+		static_cast<Value *>(literal_string_array->get(offset+1))
+		:0;
+}
+
+void change_string_literal_to_double_literal(Array *literal_string_array) {
+	Operation op;
+	op.cast=literal_string_array->get(0);
+	if(op.code==OP_VALUE) {
+		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_value(Array *literal_string_array, const String& new_value) {
+	Operation op;
+	op.cast=literal_string_array->get(0);
+	if(op.code==OP_VALUE) { // extra safety
+		VString *vstring=static_cast<VString *>(literal_string_array->get(1));
+		vstring->set_string(new_value);
+	}
+}
+
+void changetail_or_append(Array *opcodes, 
+						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound) {
+	int tail=opcodes->size()-(with_argument?2:1);
+	if(tail>=0) {
+		Operation op;
+		op.cast=opcodes->get(tail);
+		if(op.code==find) {
+			op.code=replace;
+			opcodes->put(tail, op.cast);
+			return;
+		}
+	}
+
+	Operation op; op.code=notfound;
+	*opcodes+=op.cast;
 }
 
 
-
-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();
-}
-
-/* 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);
+		throw Exception(0, 0, "pop_LS: ls_stack underflow");
 }