--- parser3/src/main/compile.C	2003/04/02 14:16:18	1.69.2.6.2.5
+++ parser3/src/main/compile.C	2008/06/10 14:06:22	1.79
@@ -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* IDENT_COMPILE_C="$Date: 2003/04/02 14:16:18 $";
+static const char * const IDENT_COMPILE_C="$Date: 2008/06/10 14:06:22 $";
 
 #include "pa_opcode.h"
 #include "pa_request.h"
@@ -14,23 +14,26 @@ static const char* IDENT_COMPILE_C="$Dat
 extern int yydebug;
 extern int yyparse (void *);
 
-VStateless_class& Request::compile(VStateless_class* aclass, const char* source, uint file_no) {
+ArrayClass& Request::compile(VStateless_class* aclass, 
+				   const char* source, const String* main_alias, 
+				   uint file_no,
+				   int line_no_offset) {
 	// prepare to parse
-	parse_control pc(*this, aclass, source, file_no);
+	Parse_control pc(*this, aclass, source, main_alias, file_no, line_no_offset);
 
 	// parse=compile! 
 	//yydebug=1;
 	if(yyparse(&pc)) { // error?
-		if(pc.col==0) { // expecting something after EOL means they've expected it BEFORE
-			// step back.  -1 col means EOL
-			pc.line--;
-			pc.col=-1;
-		} 
+		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,
-			"%s(%d:%d): %s",  file_list[file_no].cstr(), 1+pc.line, pc.col,  pc.error);
+			"%s(%d:%d): %s",  file_list[file_no].cstr(), 1+pc.pos.line, 1+pc.pos.col,  pc.error);
 	}
 
 	// result
-	return *pc.cclass;
+	return *pc.cclasses;
 }