--- parser3/src/main/compile.C	2003/11/20 16:34:26	1.71
+++ parser3/src/main/compile.C	2020/12/15 17:10:33	1.87
@@ -1,37 +1,34 @@
 /** @file
 	Parser: compiler part of request class.
 
-	Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2001-2020 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: 2003/11/20 16:34:26 $";
+volatile const char * IDENT_COMPILE_C="$Id: compile.C,v 1.87 2020/12/15 17:10:33 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) {
+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);
+	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,
-			"%s(%d:%d): %s",  file_list[file_no].cstr(), 1+pc.pos.line, 1+pc.pos.col,  pc.error);
+		exception_trace.push(Trace(0, Operation::Origin::create(file_no, pc.pos.line, pc.pos.col)));
+		throw Exception("parser.compile", 0, "%s", pc.error);
 	}
 
 	// result
-	return *pc.cclass;
+	return *pc.cclasses;
 }