--- parser3/src/main/compile.C 2001/07/24 12:26:22 1.41 +++ parser3/src/main/compile.C 2003/01/31 12:10:45 1.69.2.3 @@ -1,20 +1,15 @@ /** @file Parser: compiler part of request class. - Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - - Author: Alexander Petrosyan (http://design.ru/paf) + Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char *RCSId="$Id: compile.C,v 1.41 2001/07/24 12:26:22 parser Exp $"; + +static const char* IDENT_COMPILE_C="$Date: 2003/01/31 12:10:45 $"; #include "pa_opcode.h" #include "pa_request.h" -#include "pa_string.h" -#include "pa_array.h" #include "compile_tools.h" -#include "pa_exception.h" - -#include extern int yydebug; extern int yyparse (void *); @@ -26,44 +21,34 @@ VStateless_class& Request::real_compile( // input pc.pool=&pool(); pc.request=this; - VStateless_class *cclass; - if(aclass) // we were told the class to compile to? - cclass=aclass; // yes, remember it [used in ^process] - else if(name) { // we were told the name of compiled class? - // 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); - cclass->set_name(*name); - } else - cclass=&OP; // until changed with @CLASS would consider operators loading - pc.cclass=cclass; + // we were told the class to compile to? + pc.cclass=aclass; // until changed with @CLASS would consider operators loading 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.string=StringPtr(new String); pc.ls=LS_USER; - pc.sp=0; + pc.ls_sp=0; + pc.in_call_value=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 pc.line--; pc.col=-1; } - THROW(0,0, - 0, - "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); + throw Exception("parser.compile", + Exception::undefined_source, + "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); } // result