--- parser3/src/main/compile.C 2004/02/26 14:37:30 1.73 +++ 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-2004 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_COMPILE_C="$Date: 2004/02/26 14:37:30 $"; +static const char * const IDENT_COMPILE_C="$Date: 2005/08/09 08:14:51 $"; #include "pa_opcode.h" #include "pa_request.h" @@ -25,12 +25,13 @@ 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