--- parser3/src/main/compile_tools.h	2002/08/01 11:41:17	1.63
+++ parser3/src/main/compile_tools.h	2003/01/30 11:00:41	1.67.2.3
@@ -1,14 +1,14 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	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)
 */
 
 #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS
 
-static const char* IDENT_COMPILE_TOOLS_H="$Date: 2002/08/01 11:41:17 $";
+static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/01/30 11:00:41 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
@@ -17,7 +17,7 @@ static const char* IDENT_COMPILE_TOOLS_H
 
 enum lexical_state {
 	LS_USER, LS_NAME_SQUARE_PART,
-	LS_COMMENT,
+	LS_USER_COMMENT,
 	LS_DEF_NAME,
 	LS_DEF_PARAMS,
 	LS_DEF_LOCALS,
@@ -26,6 +26,7 @@ enum lexical_state {
 	LS_EXPRESSION_STRING_QUOTED,
 	LS_EXPRESSION_STRING_APOSTROFED,
 	LS_EXPRESSION_VAR_NAME_WITH_COLON, LS_EXPRESSION_VAR_NAME_WITHOUT_COLON,
+	LS_EXPRESSION_COMMENT,
 	LS_VAR_NAME_SIMPLE_WITH_COLON, LS_VAR_NAME_SIMPLE_WITHOUT_COLON,
 	LS_VAR_NAME_CURLY,
 	LS_VAR_ROUND,
@@ -44,7 +45,7 @@ struct parse_control {
 	Pool *pool;
 	Request *request;
 	VStateless_class *cclass;
-#ifndef NO_CSTRING_ORIGIN
+#ifndef NO_STRING_ORIGIN
 	const char *source;
 	const char *file;
 #endif
@@ -54,7 +55,7 @@ struct parse_control {
 	/// @name state; initially
 	bool trim_bof;
 	int pending_state; ///< i=0
-	String *string; ///< =new(pool) String(pool)
+	StringPtr string; ///< lexical string accumulator
 	
 #define MAX_LEXICAL_STATES 100
 	enum lexical_state ls; ///< =LS_USER;
@@ -70,35 +71,34 @@ struct parse_control {
 };
 
 /// New array // return empty array
-inline Array/*<Operation>*/ *N(Pool& pool) {
-	return new(pool) Array/*<Operation>*/(pool);
+inline ArrayOperationPtr N() {
+	return ArrayOperationPtr(new ArrayOperation);
 }
 
 /// Assembler instruction // append ordinary instruction to ops
-inline void O(Array/*<Operation>*/ *result, enum OPCODE code) {
-	Operation op; op.code=code;
-	*result+=op.cast;
+inline void O(ArrayOperation& result, OPCODE code) {
+	result+=Operation(code);
 }
 
 /// aPpend 'code_array' to 'result'
-inline void P(Array/*<Operation>*/ *result, Array *code_array) {
-	result->append_array(*code_array);
+inline void P(ArrayOperation& result, ArrayOperationPtr code_array) {
+	result.append(*code_array);
 }
 /// aPpend part of 'code_array', starting from offset, to 'result'
-inline void P(Array/*<Operation>*/ *result, Array *code_array, int offset) {
-	result->append_array(*code_array, offset);
+inline void P(ArrayOperation& result, ArrayOperationPtr code_array, int offset) {
+	result.append(*code_array, offset);
 }
 
 /// aPpend 'vstring' to 'result'
-void PV(Array/*<Operation>*/ *result, Value *value);
-
-inline void OA(Array/*<Operation>*/ *result, OPCODE opcode, Array/*<Operation>*/ *code_array) {
-	// append OP_CODE
-	Operation op; op.code=opcode;
-	*result+=op.cast;
+inline void PV(ArrayOperation& result, ValuePtr value) {
+	result+=Operation(OP_VALUE); // append OP_VALUE
+	result+=Operation(value); // append 'value'
+}
 
-	// append 'vstring'
-	*result+=code_array;
+/// append cOde Array
+inline void OA(ArrayOperation& result, OPCODE code, ArrayOperationPtr code_array) {
+	result+=Operation(code); // append OP_CODE
+	result+=Operation(code_array); // append 'code_array'
 }
 
 /**
@@ -106,34 +106,37 @@ inline void OA(Array/*<Operation>*/ *res
 	- first: OP_VALUE instruction
 	- second op: string itself
 */
-inline Array *VL(Value *value) {
+inline ArrayOperationPtr VL(ValuePtr value) {
 	// empty ops array
-	Array *result=N(value->pool());
+	ArrayOperationPtr result=N();
 
 	// append 'value' to 'result'
-	PV(result, value);
+	PV(*result, value);
 
 	return result;
 }
 
 /// Literal Array to(2) Value @return Value from literal Array OP+Value
-Value *LA2V(Array *literal_string_array, int offset=0);
+ValuePtr LA2V(ArrayOperation& literal_string_array, int offset=0);
 /// Literal Array to(2) String  @return String value from literal Array OP+String array
-inline const String *LA2S(Array *literal_string_array, int offset=0) {
-	if(Value *value=LA2V(literal_string_array, offset))
-		return value->get_string();
+inline ConstStringPtr LA2S(ArrayOperation& literal_string_array, int offset=0) {
+	if(ValuePtr value=LA2V(literal_string_array, offset))
+		return value->get_string(0);
 	return 0;
 }
 
-inline 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);
+inline void change_string_literal_to_write_string_literal(ArrayOperation& literal_string_array) {
+	literal_string_array[0].code=OP_STRING__WRITE;
 }
 
-void changetail_or_append(Array *opcodes, 
+
+void change_string_literal_to_double_literal(ArrayOperation& literal_string_array);
+
+void change_string_literal_value(ArrayOperation& literal_string_array, ConstStringPtr new_value);
+
+void changetail_or_append(ArrayOperation& opcodes, 
 						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound);
 
-void change_string_literal_to_double_literal(Array *literal_string_array);
 
 void push_LS(parse_control& pc, lexical_state new_state);
 void pop_LS(parse_control& pc);