--- parser3/src/main/compile_tools.C	2002/04/15 06:45:58	1.47
+++ parser3/src/main/compile_tools.C	2003/01/21 15:51:13	1.54
@@ -1,12 +1,12 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
-
-	$Id: compile_tools.C,v 1.47 2002/04/15 06:45:58 paf Exp $
 */
 
+static const char* IDENT_COMPILE_TOOLS_C="$Date: 2003/01/21 15:51:13 $";
+
 #include "compile_tools.h"
 #include "pa_string.h"
 #include "pa_array.h"
@@ -23,72 +23,6 @@ void PV(Array/*<Operation>*/ *result, Va
 	*result+=value;
 }
 
-void PCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_CURLY_CODE__STORE_PARAM;
-	*result+=op.cast;
-
-	// append 'vstring'
-	*result+=code_array;
-}
-
-void PEA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_EXPR_CODE__STORE_PARAM;
-	*result+=op.cast;
-
-	// append 'vstring'
-	*result+=code_array;
-}
-
-void CCA(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_CURLY_CODE__CONSTRUCT;
-	*result+=op.cast;
-
-	// append 'vstring'
-	*result+=code_array;
-}
-
-void PNC(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_NESTED_CODE;
-	*result+=op.cast;
-
-	// append 'vstring'
-	*result+=code_array;
-}
-
-void PJP(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_OBJECT_POOL;
-	*result+=op.cast;
-
-	// append 'vstring'
-	*result+=code_array;
-}
-
-void PSP(Array/*<Operation>*/ *result, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=OP_STRING_POOL;
-	*result+=op.cast;
-
-	// append 'vstring'
-	*result+=code_array;
-}
-
-
-
-Array *VL(Value *value) {
-	// empty ops array
-	Array *result=N(value->pool());
-
-	// append 'value' to 'result'
-	PV(result, value);
-
-	return result;
-}
-
 Value *LA2V(Array *literal_string_array, int offset) {
 	Operation op;
 	op.cast=literal_string_array->get(offset+0);
@@ -98,15 +32,42 @@ Value *LA2V(Array *literal_string_array,
 }
 
 void change_string_literal_to_double_literal(Array *literal_string_array) {
-	VString *vstring=static_cast<VString *>(literal_string_array->get(1));
-	Value *value=vstring->as_expr_result();
-	literal_string_array->put(1, value);
+	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_to_write_string_literal(Array *literal_string_array) {
-	Operation op; op.code=OP_STRING__WRITE;
-	literal_string_array->put(0, op.cast);
+
+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(parse_control& pc, lexical_state new_state) { 
 	if(pc.ls_sp<MAX_LEXICAL_STATES) {
 		pc.ls_stack[pc.ls_sp++]=pc.ls;