--- parser3/src/main/compile.C 2001/07/24 12:26:22 1.41 +++ parser3/src/main/compile.C 2001/08/28 10:36:57 1.47 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ -static const char *RCSId="$Id: compile.C,v 1.41 2001/07/24 12:26:22 parser Exp $"; +static const char *RCSId="$Id: compile.C,v 1.47 2001/08/28 10:36:57 parser Exp $"; #include "pa_opcode.h" #include "pa_request.h" @@ -48,13 +48,15 @@ VStateless_class& Request::real_compile( pc.line=pc.col=0; #endif // initialise state + pc.trim_bof=true; pc.pending_state=0; pc.string=NEW String(pool()); pc.ls=LS_USER; pc.sp=0; + pc.object_constructor_allowed=false; // parse=compile! - yydebug=1; +// yydebug=1; if(yyparse(&pc)) { // error? if(pc.col==0) { // expecting something after EOL means they've expected it BEFORE // step back. -1 col means EOL @@ -63,7 +65,14 @@ VStateless_class& Request::real_compile( } THROW(0,0, 0, - "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); +#ifndef NO_STRING_ORIGIN + "%s(%d:%d): " +#endif + "%s", +#ifndef NO_STRING_ORIGIN + file, 1+pc.line, pc.col, +#endif + pc.error); } // result