--- parser3/src/main/compile_tools.h	2003/01/21 15:51:13	1.67
+++ parser3/src/main/compile_tools.h	2003/04/02 14:16:18	1.67.2.8.2.6
@@ -1,14 +1,14 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001, 2003 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: 2003/01/21 15:51:13 $";
+static const char* IDENT_COMPILE_TOOLS_H="$Date: 2003/04/02 14:16:18 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
@@ -42,20 +42,19 @@ enum lexical_state {
 struct parse_control {
 	//@{
 	/// @name input
-	Pool *pool;
-	Request *request;
-	VStateless_class *cclass;
-#ifndef NO_STRING_ORIGIN
-	const char *source;
-	const char *file;
-#endif
-	int line, col;
+	Request& request;
+	VStateless_class* cclass;
+	const char* source;
+	//const char* file;
+	uint file_no;
+	uint line;
+	uint col;
 	//@}
 	//@{
 	/// @name state; initially
 	bool trim_bof;
 	int pending_state; ///< i=0
-	String *string; ///< =new(pool) String(pool)
+	StringBody string; ///< lexical string accumulator
 	
 #define MAX_LEXICAL_STATES 100
 	enum lexical_state ls; ///< =LS_USER;
@@ -68,38 +67,53 @@ 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,
+		uint afile_no):
+		request(arequest), // input 
+
+		// we were told the class to compile to?
+		cclass(aclass), // until changed with @CLASS would consider operators loading
+
+		source(asource),
+
+		file_no(afile_no),
+		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 Array/*<Operation>*/ *N(Pool& pool) {
-	return new(pool) Array/*<Operation>*/(pool);
+inline ArrayOperation* N() {
+	return 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;
+	/// Assembler instruction // append ordinary instruction to ops
+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, ArrayOperation& 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, ArrayOperation& 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;
-
-	// append 'vstring'
-	*result+=code_array;
+/// append 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'
 }
 
 /**
@@ -107,36 +121,38 @@ inline void OA(Array/*<Operation>*/ *res
 	- first: OP_VALUE instruction
 	- second op: string itself
 */
-inline Array *VL(Value *value) {
+inline ArrayOperation* VL(Value* value, uint file_no, uint line, uint col) {
 	// empty ops array
-	Array *result=N(value->pool());
+	ArrayOperation* result=N();
 
 	// append 'value' to 'result'
-	PV(result, value);
+	*result+=Operation(OP_VALUE, file_no, line, col); // append OP_VALUE
+	*result+=Operation(value); // append 'value'
 
 	return result;
 }
 
 /// Literal Array to(2) Value @return Value from literal Array OP+Value
-Value *LA2V(Array *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 const String *LA2S(Array *literal_string_array, int offset=0) {
-	if(Value *value=LA2V(literal_string_array, offset))
+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(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.put(0, OP_STRING__WRITE);
 }
 
-void changetail_or_append(Array *opcodes, 
-						  OPCODE find, bool with_argument, OPCODE replace, OPCODE notfound);
 
-void change_string_literal_to_double_literal(Array *literal_string_array);
+void change_string_literal_to_double_literal(ArrayOperation& literal_string_array);
+
+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);
 
-void change_string_literal_value(Array *literal_string_array, const String& new_value);
 
 void push_LS(parse_control& pc, lexical_state new_state);
 void pop_LS(parse_control& pc);