--- parser3/src/main/compile_tools.h	2003/02/04 08:29:26	1.67.2.8
+++ parser3/src/main/compile_tools.h	2003/03/21 13:42:30	1.67.2.8.2.2
@@ -8,13 +8,17 @@
 #ifndef COMPILE_TOOLS
 #define COMPILE_TOOLS
 
-static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/02/04 08:29:26 $";
+static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/03/21 13:42:30 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
 #include "pa_vstring.h"
 #include "pa_request.h"
 
+extern "C" { 
+#include "cord.h"
+}
+
 enum lexical_state {
 	LS_USER, LS_NAME_SQUARE_PART,
 	LS_USER_COMMENT,
@@ -42,20 +46,17 @@ enum lexical_state {
 struct parse_control {
 	//@{
 	/// @name input
-	Pool* pool;
-	Request* request;
+	Request& request;
 	VStateless_class* cclass;
-#ifndef NO_STRING_ORIGIN
 	const char* source;
 	const char* file;
-#endif
 	int line, col;
 	//@}
 	//@{
 	/// @name state; initially
 	bool trim_bof;
 	int pending_state; ///< i=0
-	StringPtr string; ///< lexical string accumulator
+	StringBody string; ///< lexical string accumulator
 	
 #define MAX_LEXICAL_STATES 100
 	enum lexical_state ls; ///< =LS_USER;
@@ -68,11 +69,33 @@ struct parse_control {
 	
 	/// output: filled input 'methods' and 'error' if any
 	char error[MAX_STRING];
+
+	parse_control(Request& arequest, 
+		VStateless_class* aclass,
+		const char* asource,
+		const char* afile):
+		request(arequest), // input 
+
+		// we were told the class to compile to?
+		cclass(aclass), // until changed with @CLASS would consider operators loading
+
+		source(asource),
+
+		file(afile),
+		line(0), col(0),
+
+		// initialise state
+		trim_bof(true),
+		pending_state(0),
+		ls(LS_USER),
+		ls_sp(0),
+		in_call_value(false) {
+	}
 };
 
 /// New array // return empty array
-inline ArrayOperationPtr N() {
-	return ArrayOperationPtr(new ArrayOperation);
+inline ArrayOperation* N() {
+	return new ArrayOperation;
 }
 
 /// Assembler instruction // append ordinary instruction to ops
@@ -90,13 +113,13 @@ inline void P(ArrayOperation& result, Ar
 }
 
 /// aPpend 'vstring' to 'result'
-inline void PV(ArrayOperation& result, ValuePtr value) {
+inline void PV(ArrayOperation& result, Value* value) {
 	result+=Operation(OP_VALUE); // append OP_VALUE
 	result+=Operation(value); // append 'value'
 }
 
 /// append cOde Array
-inline void OA(ArrayOperation& result, OPCODE code, ArrayOperationPtr code_array) {
+inline void OA(ArrayOperation& result, OPCODE code, ArrayOperation* code_array) {
 	result+=Operation(code); // append OP_CODE
 	result+=Operation(code_array); // append 'code_array'
 }
@@ -106,9 +129,9 @@ inline void OA(ArrayOperation& result, O
 	- first: OP_VALUE instruction
 	- second op: string itself
 */
-inline ArrayOperationPtr VL(ValuePtr value) {
+inline ArrayOperation* VL(Value* value) {
 	// empty ops array
-	ArrayOperationPtr result=N();
+	ArrayOperation* result=N();
 
 	// append 'value' to 'result'
 	PV(*result, value);
@@ -117,12 +140,12 @@ inline ArrayOperationPtr VL(ValuePtr val
 }
 
 /// Literal Array to(2) Value @return Value from literal Array OP+Value
-ValuePtr LA2V(ArrayOperation& literal_string_array, int offset=0);
+Value* LA2V(ArrayOperation& literal_string_array, int offset=0);
 /// Literal Array to(2) String  @return String value from literal Array OP+String array
-inline StringPtr LA2S(ArrayOperation& literal_string_array, int offset=0) {
-	if(ValuePtr value=LA2V(literal_string_array, offset))
-		return value->get_string(0);
-	return StringPtr(0);
+inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0) {
+	if(Value* value=LA2V(literal_string_array, offset))
+		return value->get_string();
+	return 0;
 }
 
 inline void change_string_literal_to_write_string_literal(ArrayOperation& literal_string_array) {
@@ -132,7 +155,7 @@ inline void change_string_literal_to_wri
 
 void change_string_literal_to_double_literal(ArrayOperation& literal_string_array);
 
-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);
 
 void changetail_or_append(ArrayOperation& opcodes, 
 						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound);