--- parser3/src/main/compile.C 2002/02/07 11:16:27 1.55 +++ parser3/src/main/compile.C 2002/08/13 13:02:40 1.66 @@ -1,12 +1,12 @@ /** @file Parser: compiler part of request class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) - - $Id: compile.C,v 1.55 2002/02/07 11:16:27 paf Exp $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ +static const char* IDENT_COMPILE_C="$Date: 2002/08/13 13:02:40 $"; + #include "pa_opcode.h" #include "pa_request.h" #include "pa_string.h" @@ -33,7 +33,7 @@ VStateless_class& Request::real_compile( // defaulting base. may change with @BASE // dont use ?: for there would be getting & of temp object if(base_class) - cclass->set_base(*base_class); + cclass->set_base(base_class); classes().put(*name, cclass); cclass->set_name(*name); } else @@ -43,15 +43,16 @@ VStateless_class& Request::real_compile( pc.source=source; #ifndef NO_STRING_ORIGIN pc.file=file; - pc.line=pc.col=0; #endif + pc.line=pc.col=0; // off the check, 'col' used in compile + // initialise state pc.trim_bof=true; pc.pending_state=0; pc.string=NEW String(pool()); pc.ls=LS_USER; pc.ls_sp=0; - pc.object_constructor_allowed=false; + pc.in_call_value=false; // parse=compile! //yydebug=1; @@ -61,16 +62,9 @@ VStateless_class& Request::real_compile( pc.line--; pc.col=-1; } - throw Exception(0,0, + throw Exception("parser.compile", 0, -#ifndef NO_STRING_ORIGIN - "%s(%d:%d): " -#endif - "%s", -#ifndef NO_STRING_ORIGIN - file, 1+pc.line, pc.col, -#endif - pc.error); + "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); } // result