--- parser3/src/main/compile.C 2001/04/06 10:32:20 1.35 +++ parser3/src/main/compile.C 2002/08/01 11:41:17 1.65 @@ -1,22 +1,19 @@ /** @file Parser: compiler part of request class. - 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 $ + Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexandr Petrosian (http://paf.design.ru) */ -#include "code.h" +static const char* IDENT_COMPILE_C="$Date: 2002/08/01 11:41:17 $"; + +#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 *); @@ -34,6 +31,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); @@ -45,25 +43,28 @@ 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.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, + throw Exception("parser.compile", 0, - "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); + "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); } // result