--- parser3/src/main/compile.C 2012/03/16 09:24:12 1.82 +++ parser3/src/main/compile.C 2015/10/21 21:45:25 1.84 @@ -5,18 +5,15 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_COMPILE_C="$Id: compile.C,v 1.82 2012/03/16 09:24:12 moko Exp $"; +volatile const char * IDENT_COMPILE_C="$Id: compile.C,v 1.84 2015/10/21 21:45:25 moko Exp $"; #include "pa_request.h" #include "compile_tools.h" extern int yydebug; -extern int yyparse (void *); +extern int yyparse (Parse_control *); -ArrayClass& 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); @@ -28,9 +25,8 @@ ArrayClass& Request::compile(VStateless_ 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