--- parser3/src/main/compile.C 2001/04/06 10:32:20 1.35 +++ parser3/src/main/compile.C 2001/08/28 10:36:57 1.47 @@ -4,11 +4,10 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: compile.C,v 1.35 2001/04/06 10:32:20 paf Exp $ */ +static const char *RCSId="$Id: compile.C,v 1.47 2001/08/28 10:36:57 parser Exp $"; -#include "code.h" +#include "pa_opcode.h" #include "pa_request.h" #include "pa_string.h" #include "pa_array.h" @@ -34,6 +33,7 @@ VStateless_class& Request::real_compile( // yes. create it cclass=NEW VClass(pool()); // defaulting base. may change with @BASE + // dont use ?: for there would be getting & of temp object if(base_class) cclass->set_base(*base_class); classes().put(*name, cclass); @@ -48,10 +48,12 @@ 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; @@ -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