--- parser3/src/main/compile.C	2003/11/20 16:34:26	1.71
+++ parser3/src/main/compile.C	2005/08/09 08:14:51	1.78
@@ -1,11 +1,11 @@
 /** @file
 	Parser: compiler part of request class.
 
-	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)
 */
 
-static const char * const IDENT_COMPILE_C="$Date: 2003/11/20 16:34:26 $";
+static const char * const IDENT_COMPILE_C="$Date: 2005/08/09 08:14:51 $";
 
 #include "pa_opcode.h"
 #include "pa_request.h"
@@ -16,16 +16,18 @@ extern int yyparse (void *);
 
 VStateless_class& Request::compile(VStateless_class* aclass, 
 				   const char* source, const String* main_alias, 
-				   uint file_no) {
+				   uint file_no,
+				   int line_no_offset) {
 	// prepare to parse
-	Parse_control pc(*this, aclass, source, main_alias, file_no);
+	Parse_control pc(*this, aclass, source, main_alias, file_no, line_no_offset);
 
 	// parse=compile! 
 	//yydebug=1;
 	if(yyparse(&pc)) { // error?
 		pc.pos_prev_c();
-		if(pc.pos.col==0) // expecting something after EOL means they've expected it BEFORE
-			pc.pos_prev_c();
+		if(!pc.explicit_result)
+			if(pc.pos.col==0) // expecting something after EOL means they've expected it BEFORE
+				pc.pos_prev_c();
 
 		throw Exception("parser.compile",
 			0,