--- parser3/src/main/compile_tools.C	2003/01/31 12:34:35	1.54.2.4
+++ parser3/src/main/compile_tools.C	2003/04/02 09:32:11	1.54.2.5.2.7
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_COMPILE_TOOLS_C="$Date: 2003/01/31 12:34:35 $";
+static const char* IDENT_COMPILE_TOOLS_C="$Date: 2003/04/02 09:32:11 $";
 
 #include "compile_tools.h"
 #include "pa_string.h"
@@ -14,21 +14,21 @@ static const char* IDENT_COMPILE_TOOLS_C
 #include "pa_vstring.h"
 #include "pa_vdouble.h"
 
-ValuePtr LA2V(ArrayOperation& literal_string_array, int offset) {
+Value* LA2V(ArrayOperation& literal_string_array, int offset) {
 	return literal_string_array[offset+0].code==OP_VALUE?literal_string_array[offset+1].value
-		:ValuePtr(0);
+		:0;
 }
 
 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;
+		Value& value=literal_string_array[1].value->as_expr_result();
+		literal_string_array.put(1, &value);
 	}
 }
 
-void change_string_literal_value(ArrayOperation& literal_string_array, StringPtr new_value) {
+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);
+		static_cast<VString*>(literal_string_array[1].value)->set_string(new_value);
 	}
 }
 
@@ -36,9 +36,11 @@ void changetail_or_append(ArrayOperation
 						  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)
+		Operation& op=opcodes.get_ref(tail);
+		if(op.code==find) {
 			op.code=replace;
+			return;
+		}
 	}
 
 	opcodes+=Operation(notfound);
@@ -50,13 +52,13 @@ void push_LS(parse_control& pc, lexical_
 		pc.ls_stack[pc.ls_sp++]=pc.ls;  
 		pc.ls=new_state;
 	} else
-		throw Exception(Exception::undefined_type, Exception::undefined_source, 
+		throw Exception(0, 0, 
 			"push_LS: ls_stack overflow");
 }
 void pop_LS(parse_control& pc) {
 	if(--pc.ls_sp>=0)
 		pc.ls=pc.ls_stack[pc.ls_sp];
 	else
-		throw Exception(Exception::undefined_type, Exception::undefined_source, 
+		throw Exception(0, 0, 
 			"pop_LS: ls_stack underflow");
 }