--- parser3/src/main/compile.C 2001/02/20 19:21:13 1.2 +++ parser3/src/main/compile.C 2001/02/21 06:59:43 1.4 @@ -1,11 +1,13 @@ /* - $Id: compile.C,v 1.2 2001/02/20 19:21:13 paf Exp $ + $Id: compile.C,v 1.4 2001/02/21 06:59:43 paf Exp $ */ +#include "pa_string.h" #include "pa_array.h" #include "code.h" #include "compile_tools.h" #include "compile.h" +#include "pa_exception.h" #include @@ -16,22 +18,26 @@ Array *real_compile(COMPILE_PARAMS) { if(!source) return 0; - yydebug=1; + Pool& pool=request.pool(); + + ///yydebug=1; struct parse_control pc; /* input */ - pc.pool=pool; + pc.pool=&pool; + pc.exception=&request.exception(); pc.source=source; #ifndef NO_STRING_ORIGIN pc.file=file; - pc.line=1; + pc.line=pc.col=1; #endif /* state to initial */ pc.pending_state=0; - pc.string=string_create(pool); + pc.string=new(pool) String(pool); pc.ls=LS_USER; pc.sp=0; /* parse! */ - int parse_error=yyparse(&pc); + yyparse(&pc); + /* result */ - return parse_error?0:static_cast(pc.result); + return pc.result; }