--- parser3/src/main/compile.C 2001/02/22 14:14:07 1.15 +++ parser3/src/main/compile.C 2001/02/25 09:14:02 1.19 @@ -1,5 +1,5 @@ /* - $Id: compile.C,v 1.15 2001/02/22 14:14:07 paf Exp $ + $Id: compile.C,v 1.19 2001/02/25 09:14:02 paf Exp $ */ #include "pa_request.h" @@ -14,15 +14,17 @@ extern int yydebug; extern int yyparse (void *); -Array& Request::real_compile(COMPILE_PARAMS) { +VClass& Request::real_compile(COMPILE_PARAMS) { // prepare to parse struct parse_control pc; // input pc.pool=&pool(); - pc.methods=NEW Array(pool()); - if(!source) - return *pc.methods; + pc.request=this; + VClass *vclass=NEW VClass(pool()); + if(default_name) // they forced some default_name? + vclass->set_name(*default_name); + pc.vclass=vclass; pc.source=source; #ifndef NO_STRING_ORIGIN @@ -41,13 +43,13 @@ Array& Request::real_compile(COMPILE_PAR if(pc.col==0) { // expecting something after EOL means they've expected it BEFORE // step back. -1 col means EOL pc.line--; - pc.col=-2; - } + pc.col=-1; + } THROW(0,0, 0, - "%s [%s:%d:%d]", pc.error, file, 1+pc.line, 1+pc.col); + "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); } // result - return *pc.methods; + return *pc.vclass; }