--- parser3/src/main/compile_tools.h	2003/03/27 10:04:07	1.67.2.8.2.4
+++ parser3/src/main/compile_tools.h	2004/02/11 15:33:15	1.72
@@ -1,20 +1,23 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2004 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/03/27 10:04:07 $";
+static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2004/02/11 15:33:15 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
 #include "pa_vstring.h"
 #include "pa_request.h"
 
+/// used to track source column number
+#define TAB_SIZE 8
+
 enum lexical_state {
 	LS_USER, LS_NAME_SQUARE_PART,
 	LS_USER_COMMENT,
@@ -38,21 +41,37 @@ 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;
+	uint last_line_end_col;
+public:
+	const String& alias_method(const String& name);
 	//@{
 	/// @name input
 	Request& request;
 	VStateless_class* cclass;
 	const char* source;
-	const char* file;
-	int line, col;
+	uint file_no;
+	Pos pos;
 	//@}
 	//@{
 	/// @name state; initially
 	bool trim_bof;
 	int pending_state; ///< i=0
-	StringBody string; ///< lexical string accumulator
+	String::Body string; ///< lexical string accumulator
+	Pos string_start;
 	
 #define MAX_LEXICAL_STATES 100
 	enum lexical_state ls; ///< =LS_USER;
@@ -66,26 +85,48 @@ struct parse_control {
 	/// output: filled input 'methods' and 'error' if any
 	char error[MAX_STRING];
 
-	parse_control(Request& arequest, 
+	Parse_control(Request& arequest, 
 		VStateless_class* aclass,
-		const char* asource,
-		const char* afile):
+		const char* asource, const String* amain_alias, 
+		uint afile_no):
+		main_alias(amain_alias),
+		last_line_end_col(0),
+
 		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),
 
-		source(asource),
-
-		file(afile),
-		line(0), col(0),
-
-		// initialise state
+		// initialize state
 		trim_bof(true),
 		pending_state(0),
 		ls(LS_USER),
 		ls_sp(0),
-		in_call_value(false) {
+		in_call_value(false) {}
+
+	void pos_next_line() {
+		pos.line++;
+		last_line_end_col=pos.col;
+		pos.col=0;
+	}
+	void pos_next_c(char c) {
+		if(c=='\t')
+			pos.col=(pos.col+TAB_SIZE)&~(TAB_SIZE-1);
+		else
+			pos.col++;
+	}
+	/// not precise in case of \t in the middle of the text
+	void pos_prev_c() {
+		if(pos.col==0) {
+			--pos.line;  pos.col=last_line_end_col;
+		} else
+			--pos.col;
+	}
+	void ungetc() {
+		source--;
+		pos_prev_c();
 	}
 };
 
@@ -108,12 +149,6 @@ inline void P(ArrayOperation& result, Ar
 	result.append(code_array, offset);
 }
 
-/// aPpend 'vstring' to 'result'
-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, ArrayOperation* code_array) {
 	result+=Operation(code); // append OP_CODE
@@ -122,22 +157,25 @@ inline void OA(ArrayOperation& result, O
 
 /**
 	Value Literal // returns array with 
-	- first: OP_VALUE instruction
-	- second op: string itself
+	- first op: OP_VALUE instruction
+	- second op: origin (debug information)
+	- third op: string itself
 */
-inline ArrayOperation* VL(Value* value) {
+inline ArrayOperation* VL(Value* value, uint file_no, uint line, uint col) {
 	// empty ops array
-	ArrayOperation* result=N();
+	ArrayOperation& result=*N();
 
 	// append 'value' to 'result'
-	PV(*result, value);
+	result+=Operation(OP_VALUE);
+	result+=Operation(file_no, line, col); // append origin
+	result+=Operation(value); // append 'value'
 
-	return result;
+	return &result;
 }
 
-/// Literal Array to(2) Value @return Value from literal Array OP+Value
+/// Literal Array to(2) Value @return Value from literal Array OP+origin+Value
 Value* LA2V(ArrayOperation& literal_string_array, int offset=0);
-/// Literal Array to(2) String  @return String value from literal Array OP+String array
+/// Literal Array to(2) String  @return String value from literal Array OP+origin+String array
 inline const String* LA2S(ArrayOperation& literal_string_array, int offset=0) {
 	if(Value* value=LA2V(literal_string_array, offset))
 		return value->get_string();
@@ -157,7 +195,7 @@ void changetail_or_append(ArrayOperation
 						  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