--- parser3/src/main/compile.C 2005/08/09 08:14:51 1.78 +++ parser3/src/main/compile.C 2024/11/04 03:53:25 1.89 @@ -1,23 +1,19 @@ /** @file Parser: compiler part of request class. - Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2024 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ -static const char * const IDENT_COMPILE_C="$Date: 2005/08/09 08:14:51 $"; +volatile const char * IDENT_COMPILE_C="$Id: compile.C,v 1.89 2024/11/04 03:53:25 moko Exp $"; -#include "pa_opcode.h" #include "pa_request.h" #include "compile_tools.h" extern int yydebug; -extern int yyparse (void *); +extern int yyparse (Parse_control *); -VStateless_class& Request::compile(VStateless_class* aclass, - const char* source, const String* main_alias, - uint file_no, - int line_no_offset) { +ArrayClass& Request::compile(VStateless_class* aclass, const char* source, const String* main_alias, uint file_no, int line_no_offset) { // prepare to parse Parse_control pc(*this, aclass, source, main_alias, file_no, line_no_offset); @@ -29,11 +25,10 @@ VStateless_class& Request::compile(VStat if(pc.pos.col==0) // expecting something after EOL means they've expected it BEFORE pc.pos_prev_c(); - throw Exception("parser.compile", - 0, - "%s(%d:%d): %s", file_list[file_no].cstr(), 1+pc.pos.line, 1+pc.pos.col, pc.error); + exception_trace.push(Trace(0, Operation::Origin::create(file_no, pc.pos.line, pc.pos.col))); + throw Exception("parser.compile", 0, "%s", pc.error); } // result - return *pc.cclass; + return *pc.cclasses; }