--- parser3/src/main/compile_tools.h	2003/04/03 15:34:02	1.67.2.8.2.10
+++ parser3/src/main/compile_tools.h	2005/12/08 10:02:45	1.76.2.1
@@ -1,20 +1,23 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2005 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/04/03 15:34:02 $";
+static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2005/12/08 10:02:45 $";
 
 #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,
@@ -40,9 +43,9 @@ enum lexical_state {
 };
 
 struct Pos {
-	uint line;
-	uint col;
-	//Pos(uint aline, uint acol): line(aline), col(acol) {}
+	int line;
+	int col;
+	Pos(int aline, int acol): line(aline), col(acol) {}
 	Pos(): line(0), col(0) {}
 
 	void clear() { line=col=0; }
@@ -67,7 +70,7 @@ public:
 	/// @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
@@ -77,6 +80,7 @@ public:
 	int brackets_nestages[MAX_LEXICAL_STATES]; ///< brackets nestage on each state
 
 	bool in_call_value;
+	bool explicit_result;
 	//@}
 	
 	/// output: filled input 'methods' and 'error' if any
@@ -85,29 +89,39 @@ public:
 	Parse_control(Request& arequest, 
 		VStateless_class* aclass,
 		const char* asource, const String* amain_alias, 
-		uint afile_no):
+		uint afile_no,
+		int line_no_offset):
+		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), main_alias(amain_alias),
-
+		source(asource), 
 		file_no(afile_no),
-		last_line_end_col(0),
+		pos(line_no_offset, 0),
 
 		// initialize state
 		trim_bof(true),
 		pending_state(0),
 		ls(LS_USER),
 		ls_sp(0),
-		in_call_value(false) {}
+		in_call_value(false),
+		explicit_result(false) {}
 
 	void pos_next_line() {
 		pos.line++;
 		last_line_end_col=pos.col;
 		pos.col=0;
 	}
+	void pos_next_c(int 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;
@@ -177,7 +191,7 @@ inline void change_string_literal_to_wri
 }
 
 
-void change_string_literal_to_double_literal(ArrayOperation& literal_string_array);
+void maybe_change_string_literal_to_double_literal(ArrayOperation& literal_string_array);
 
 void change_string_literal_value(ArrayOperation& literal_string_array, const String& new_value);