--- parser3/src/main/compile.C	2004/02/26 14:37:30	1.73
+++ parser3/src/main/compile.C	2015/09/27 20:12:42	1.83
@@ -1,23 +1,22 @@
 /** @file
 	Parser: compiler part of request class.
 
-	Copyright (c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_COMPILE_C="$Date: 2004/02/26 14:37:30 $";
+volatile const char * IDENT_COMPILE_C="$Id: compile.C,v 1.83 2015/09/27 20:12:42 moko Exp $";
 
-#include "pa_opcode.h"
 #include "pa_request.h"
 #include "compile_tools.h"
 
 extern int yydebug;
-extern int yyparse (void *);
+extern int yyparse (Parse_control *);
 
-VStateless_class& Request::compile(VStateless_class* aclass, 
-				   const char* source, const String* main_alias, 
-				   uint file_no,
-				   int line_no_offset) {
+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, main_alias, file_no, line_no_offset);
 
@@ -25,14 +24,15 @@ VStateless_class& Request::compile(VStat
 	//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,
-			"%s(%u:%u): %s",  file_list[file_no].cstr(), 1+pc.pos.line, 1+pc.pos.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;
 }