--- parser3/src/include/pa_exception.h 2002/02/08 07:27:43 1.30 +++ parser3/src/include/pa_exception.h 2002/04/29 05:59:33 1.34 @@ -2,9 +2,9 @@ Parser: exception decls. Copyright (c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://paf.design.ru) + Author: Alexandr Petrosian (http://paf.design.ru) - $Id: pa_exception.h,v 1.30 2002/02/08 07:27:43 paf Exp $ + $Id: pa_exception.h,v 1.34 2002/04/29 05:59:33 paf Exp $ */ #ifndef PA_EXCEPTION_H @@ -17,13 +17,12 @@ class Pool; // defines -/// Just simple longjump mechanizm dressed in class clothes. use Temp_exception class Exception { public: Exception(); Exception( - const String *atype, const String *acode, + const char *atype, const String *aproblem_source, const char *comment_fmt, ...); Exception(const Exception& src); @@ -32,25 +31,24 @@ public: #ifdef XML Exception( - const String *atype, const String *acode, const String *aproblem_source, GdomeException& exc); #endif /// extracts exception type - const String *type() const { return ftype; } - /// extracts exception code - const String *code() const { return fcode; } + const char *type() const { return ftype; } /// extracts exception problem_source - const String *problem_source() const { return fproblem_source; } + const String *problem_source() const { + return fproblem_source && fproblem_source->size()?fproblem_source:0; + } /// extracts exception comment const char *comment() const { return fcomment; } private: - const String *ftype, *fcode, *fproblem_source; - bool owns_comment; - char *fcomment; + const char *ftype; + const String *fproblem_source; + bool owns_comment; char *fcomment; };