--- parser3/src/main/compile_tools.h	2004/02/11 15:33:15	1.72
+++ parser3/src/main/compile_tools.h	2008/06/10 14:06:36	1.78
@@ -1,14 +1,14 @@
 /** @file
 	Parser: compiler support helper functions decls.
 
-	Copyright (c) 2001-2004 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 * const IDENT_COMPILE_TOOLS_H="$Date: 2004/02/11 15:33:15 $";
+static const char * const IDENT_COMPILE_TOOLS_H="$Date: 2008/06/10 14:06:36 $";
 
 #include "pa_opcode.h"
 #include "pa_types.h"
@@ -43,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; }
@@ -62,6 +62,7 @@ public:
 	/// @name input
 	Request& request;
 	VStateless_class* cclass;
+	ArrayClass* cclasses;
 	const char* source;
 	uint file_no;
 	Pos pos;
@@ -80,6 +81,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
@@ -88,7 +90,8 @@ 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),
 
@@ -96,22 +99,28 @@ public:
 
 		// we were told the class to compile to?
 		cclass(aclass), // until changed with @CLASS would consider operators loading
+		cclasses(new ArrayClass(1)),
 		source(asource), 
 		file_no(afile_no),
+		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) {
+
+		*cclasses+=aclass;
+	}
 
 	void pos_next_line() {
 		pos.line++;
 		last_line_end_col=pos.col;
 		pos.col=0;
 	}
-	void pos_next_c(char c) {
+	void pos_next_c(int c) {
 		if(c=='\t')
 			pos.col=(pos.col+TAB_SIZE)&~(TAB_SIZE-1);
 		else
@@ -187,7 +196,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);