--- parser3/src/main/compile.C	2003/04/02 16:05:19	1.69.2.6.2.6
+++ parser3/src/main/compile.C	2003/07/24 11:31:22	1.70
@@ -5,7 +5,7 @@
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_COMPILE_C="$Date: 2003/04/02 16:05:19 $";
+static const char* IDENT_COMPILE_C="$Date: 2003/07/24 11:31:22 $";
 
 #include "pa_opcode.h"
 #include "pa_request.h"
@@ -14,21 +14,22 @@ 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) {
+VStateless_class& Request::compile(VStateless_class* aclass, 
+				   const char* source, const String* main_alias, 
+				   uint file_no) {
 	// prepare to parse
-	Parse_control pc(*this, aclass, source, file_no);
+	Parse_control pc(*this, aclass, source, main_alias, file_no);
 
 	// parse=compile! 
 	//yydebug=1;
 	if(yyparse(&pc)) { // error?
-		if(pc.pos.col==0) { // expecting something after EOL means they've expected it BEFORE
-			// step back.  -1 col means EOL
-			pc.pos.line--;
-			pc.pos.col=-1;
-		} 
+		pc.pos_prev_c();
+		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, 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