--- parser3/src/main/compile.C 2004/02/11 15:33:15 1.72 +++ parser3/src/main/compile.C 2005/07/25 08:53:12 1.76 @@ -5,33 +5,39 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_COMPILE_C="$Date: 2004/02/11 15:33:15 $"; +static const char * const IDENT_COMPILE_C="$Date: 2005/07/25 08:53:12 $"; #include "pa_opcode.h" #include "pa_request.h" #include "compile_tools.h" +#include "pa_vclass.h" extern int yydebug; extern int yyparse (void *); VStateless_class& Request::compile(VStateless_class* aclass, const char* source, const String* main_alias, - uint file_no) { + 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); } + // fill properties + static_cast(pc.cclass)->fill_properties(); + // result return *pc.cclass; }