--- parser3/src/main/compile.C 2001/02/21 11:13:16 1.7 +++ parser3/src/main/compile.C 2001/02/21 15:26:54 1.9 @@ -1,5 +1,5 @@ /* - $Id: compile.C,v 1.7 2001/02/21 11:13:16 paf Exp $ + $Id: compile.C,v 1.9 2001/02/21 15:26:54 paf Exp $ */ #include "pa_string.h" @@ -14,10 +14,7 @@ extern int yydebug; extern int yyparse (void *); -Array *real_compile(COMPILE_PARAMS) { - if(!source) - return 0; - +Array& real_compile(COMPILE_PARAMS) { Pool& pool=request.pool(); // prepare to parse @@ -25,6 +22,9 @@ Array *real_compile(COMPILE_PARAMS) { // input pc.pool=&pool; pc.methods=new(pool) Array(pool); + if(!source) + return *pc.methods; + // create new 'name' vclass, add it to request's classes pc.source=source; #ifndef NO_STRING_ORIGIN @@ -39,11 +39,17 @@ Array *real_compile(COMPILE_PARAMS) { // parse! yydebug=1; - if(yyparse(&pc)) // error? + if(yyparse(&pc)) {// error? + if(pc.col==1) { + // step back from last char. -1 col means EOL + pc.line--; + pc.col=-1; + } request.exception().raise(0,0, 0, - "%s @%s[%d:%d]", pc.error, file, 1+pc.line, pc.col/*already+1*/); + "%s [%s:%d:%d]", pc.error, file, 1+pc.line, pc.col); + } // result - return pc.methods; + return *pc.methods; }