--- parser3/src/main/compile_tools.h	2003/02/04 08:29:26	1.67.2.8
+++ parser3/src/main/compile_tools.h	2003/04/03 11:19:50	1.67.2.8.2.8
@@ -8,7 +8,7 @@
 #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/04/03 11:19:50 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
@@ -38,24 +38,36 @@ enum lexical_state {
 	LS_METHOD_ROUND,
 	LS_METHOD_AFTER
 };
+
+struct Pos {
+	uint line;
+	uint col;
+	//Pos(uint aline, uint acol): line(aline), col(acol) {}
+	Pos(): line(0), col(0) {}
+
+	void clear() { line=col=0; }
+	operator bool() { return col!=0; }
+};
+
 /// compiler status
-struct parse_control {
+class Parse_control {
+	const String* main_alias;
+public:
+	const String& alias_method(const String& name);
 	//@{
 	/// @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;
+	uint file_no;
+	Pos pos;
 	//@}
 	//@{
 	/// @name state; initially
 	bool trim_bof;
 	int pending_state; ///< i=0
-	StringPtr string; ///< lexical string accumulator
+	StringBody string; ///< lexical string accumulator
+	Pos string_start;
 	
 #define MAX_LEXICAL_STATES 100
 	enum lexical_state ls; ///< =LS_USER;
@@ -68,14 +80,35 @@ 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 String* amain_alias, 
+		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), main_alias(amain_alias),
+
+		file_no(afile_no),
+
+		// initialize 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
+	/// Assembler instruction // append ordinary instruction to ops
 inline void O(ArrayOperation& result, OPCODE code) {
 	result+=Operation(code);
 }
@@ -89,14 +122,8 @@ inline void P(ArrayOperation& result, Ar
 	result.append(code_array, offset);
 }
 
-/// aPpend 'vstring' to 'result'
-inline void PV(ArrayOperation& result, ValuePtr 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,39 +133,40 @@ inline void OA(ArrayOperation& result, O
 	- first: OP_VALUE instruction
 	- second op: string itself
 */
-inline ArrayOperationPtr VL(ValuePtr value) {
+inline ArrayOperation* VL(Value* value, uint file_no, uint line, uint col) {
 	// empty ops array
-	ArrayOperationPtr result=N();
+	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
-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) {
-	literal_string_array[0].code=OP_STRING__WRITE;
+	literal_string_array.put(0, OP_STRING__WRITE);
 }
 
 
 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);
 
 
-void push_LS(parse_control& pc, lexical_state new_state);
-void pop_LS(parse_control& pc);
+void push_LS(Parse_control& pc, lexical_state new_state);
+void pop_LS(Parse_control& pc);
 
 #endif