--- parser3/src/main/compile.C 2001/05/21 12:36:39 1.36.2.2 +++ parser3/src/main/compile.C 2001/11/05 11:46:26 1.53 @@ -2,10 +2,9 @@ Parser: compiler part of request class. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://paf.design.ru) - Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: compile.C,v 1.36.2.2 2001/05/21 12:36:39 parser Exp $ + $Id: compile.C,v 1.53 2001/11/05 11:46:26 paf Exp $ */ #include "pa_opcode.h" @@ -15,8 +14,6 @@ #include "compile_tools.h" #include "pa_exception.h" -#include - extern int yydebug; extern int yyparse (void *); @@ -37,8 +34,6 @@ VStateless_class& Request::real_compile( // dont use ?: for there would be getting & of temp object if(base_class) cclass->set_base(*base_class); - else // register "operators" as a superclass of all user classes - cclass->set_base(OP); classes().put(*name, cclass); cclass->set_name(*name); } else @@ -51,22 +46,31 @@ VStateless_class& Request::real_compile( pc.line=pc.col=0; #endif // initialise state + pc.trim_bof=true; pc.pending_state=0; pc.string=NEW String(pool()); pc.ls=LS_USER; pc.sp=0; + pc.object_constructor_allowed=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(0,0, 0, - "%s(%d:%d): %s", file, 1+pc.line, pc.col, pc.error); +#ifndef NO_STRING_ORIGIN + "%s(%d:%d): " +#endif + "%s", +#ifndef NO_STRING_ORIGIN + file, 1+pc.line, pc.col, +#endif + pc.error); } // result