--- parser3/src/main/compile.C 2003/01/21 15:51:12 1.69 +++ parser3/src/main/compile.C 2003/02/17 11:36:15 1.69.2.5 @@ -1,18 +1,15 @@ /** @file Parser: compiler part of request class. - Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_COMPILE_C="$Date: 2003/01/21 15:51:12 $"; +static const char* IDENT_COMPILE_C="$Date: 2003/02/17 11:36:15 $"; #include "pa_opcode.h" #include "pa_request.h" -#include "pa_string.h" -#include "pa_array.h" #include "compile_tools.h" -#include "pa_exception.h" extern int yydebug; extern int yyparse (void *); @@ -25,7 +22,7 @@ VStateless_class& Request::real_compile( pc.pool=&pool(); pc.request=this; // we were told the class to compile to? - pc.cclass=&aclass; // until changed with @CLASS would consider operators loading + pc.cclass=aclass; // until changed with @CLASS would consider operators loading pc.source=source; #ifndef NO_STRING_ORIGIN @@ -36,13 +33,13 @@ VStateless_class& Request::real_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.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 @@ -50,7 +47,7 @@ VStateless_class& Request::real_compile( pc.col=-1; } throw Exception("parser.compile", - 0, + Exception::undefined_source, "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); }