--- parser3/src/main/compile_tools.C	2001/07/25 08:16:21	1.37
+++ parser3/src/main/compile_tools.C	2002/08/01 11:26:49	1.51
@@ -1,11 +1,11 @@
 /** @file
 	Parser: compiler support helper functions.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
-static const char *RCSId="$Id: compile_tools.C,v 1.37 2001/07/25 08:16:21 parser Exp $"; 
+
+static const char* IDENT_COMPILE_TOOLS_C="$Id: compile_tools.C,v 1.51 2002/08/01 11:26:49 paf Exp $";
 
 #include "compile_tools.h"
 #include "pa_string.h"
@@ -23,71 +23,51 @@ 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;
-}
-
-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);
-	if(op.code!=OP_VALUE)
-		return 0;
-
-	return static_cast<Value *>(literal_string_array->get(offset+1));
+	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) {
-	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);
+	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 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.sp<MAX_LEXICAL_STATES) {
-		pc.stack[pc.sp++]=pc.ls;  pc.ls=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(parse_control& pc) {
-	if(--pc.sp>=0)
-		pc.ls=pc.stack[pc.sp];
+	if(--pc.ls_sp>=0)
+		pc.ls=pc.ls_stack[pc.ls_sp];
 	else
-		pc.pool->THROW(0, 0, 0, "pop_LS: stack underflow");
+		throw Exception(0, 0, "pop_LS: ls_stack underflow");
 }