--- parser3/src/main/pa_exception.C	2001/03/11 08:16:35	1.6
+++ parser3/src/main/pa_exception.C	2003/01/23 16:08:01	1.43.2.2
@@ -1,31 +1,108 @@
-/*
-	Parser
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+/** @file
+	Parser: exception class.
 
-	$Id: pa_exception.C,v 1.6 2001/03/11 08:16:35 paf Exp $
+	Copyright (c) 2001, 2003 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-#include <stdio.h>
-#include <stdlib.h>
+static const char* IDENT_EXCEPTION_C="$Date: 2003/01/23 16:08:01 $";
 
+//#include "pa_common.h"
 #include "pa_exception.h"
-#include "pa_common.h"
-
-void Exception::_throw(const String *atype, const String *acode,
-					  const String *aproblem_source, 
-					  const char *comment_fmt, ...) const {
+//#include "pa_globals.h"
+#include "pa_sapi.h"
+#include "pa_string.h"
+
+Exception::problem_source_type Exception::undefined_source=object_ptr<const String>(0);
+
+Exception::Exception() {
+	ftype=0;
+	fproblem_source=0;
+	owns_comment=false; fcomment=0;
+}
+Exception::Exception(const char *atype, 
+					  problem_source_type aproblem_source, 
+					  const char *comment_fmt, ...) {
+	//_asm int 3;
+//__asm__("int3");
 	ftype=atype;
-	fcode=acode;
 	fproblem_source=aproblem_source;
+	owns_comment=true;
 
 	if(comment_fmt) {
+		fcomment=(char *)malloc(MAX_STRING);
+		if(!fcomment)
+			SAPI::die("out of memory in 'Exception::Exception', failed to allocated %u bytes", MAX_STRING);
 		va_list args;
 		va_start(args, comment_fmt);
 		vsnprintf(fcomment, MAX_STRING, comment_fmt, args);
 		va_end(args);
-	} else 
-		fcomment[0]=0;
+	} else
+		fcomment=0;
+}
+
+#ifdef XML
+Exception::Exception(
+	const String *aproblem_source, 
+	GdomeException& exc) :
+	ftype("xml"),
+	fproblem_source(aproblem_source),
+	owns_comment(true) {
+
+	const char *xml_generic_errors=xmlGenericErrors();
+	if(xml_generic_errors || exc) {
+		const char *s;
+		switch((GdomeExceptionCode)exc) {
+		case GDOME_NOEXCEPTION_ERR: s="NOEXCEPTION_ERR"; break;
+		case GDOME_INDEX_SIZE_ERR: s="INDEX_SIZE_ERR"; break;
+		case GDOME_DOMSTRING_SIZE_ERR: s="DOMSTRING_SIZE_ERR"; break;
+		case GDOME_HIERARCHY_REQUEST_ERR: s="HIERARCHY_REQUEST_ERR"; break;
+		case GDOME_WRONG_DOCUMENT_ERR: s="WRONG_DOCUMENT_ERR"; break;
+		case GDOME_INVALID_CHARACTER_ERR: s="INVALID_CHARACTER_ERR"; break;
+		case GDOME_NO_DATA_ALLOWED_ERR: s="NO_DATA_ALLOWED_ERR"; break;
+		case GDOME_NO_MODIFICATION_ALLOWED_ERR: s="NO_MODIFICATION_ALLOWED_ERR"; break;
+		case GDOME_NOT_FOUND_ERR: s="NOT_FOUND_ERR"; break;
+		case GDOME_NOT_SUPPORTED_ERR: s="NOT_SUPPORTED_ERR"; break;
+		case GDOME_INUSE_ATTRIBUTE_ERR: s="INUSE_ATTRIBUTE_ERR"; break;
+		case GDOME_INVALID_STATE_ERR: s="INVALID_STATE_ERR"; break;
+		case GDOME_SYNTAX_ERR: s="SYNTAX_ERR"; break;
+		case GDOME_INVALID_MODIFICATION_ERR: s="INVALID_MODIFICATION_ERR"; break;
+		case GDOME_NAMESPACE_ERR: s="NAMESPACE_ERR"; break;
+		case GDOME_INVALID_ACCESS_ERR: s="INVALID_ACCESS_ERR"; break;
+		case GDOME_NULL_POINTER_ERR: s="NULL_POINTER_ERR"; break;
+		default: s="<UNKNOWN CODE>"; break;
+		}
+		
+		fcomment=(char *)malloc(MAX_STRING);
+		const char *xml_error_message;
+		const char *xml_error_prefix;
+		if(xml_generic_errors) {
+			xml_error_prefix="\n";
+			xml_error_message=xml_generic_errors;
+		} else {
+			xml_error_prefix="";
+			xml_error_message="";
+		}
+		if(exc)
+			snprintf(fcomment, MAX_STRING, 
+				"DOMException %s (%d)."
+				"%s%s", 
+					s,  // decoded code of exception
+					exc, // DOM exception code
+					xml_error_prefix, xml_error_message // xml generic messages accumulated
+			);
+		else // no DOM exception
+			snprintf(fcomment, MAX_STRING, 
+				"%s", 
+					xml_error_message // xml generic messages accumulated
+			);
+		if(xml_generic_errors)
+			free((void *)xml_generic_errors);
+	} else
+		fcomment=0;
+}
+#endif
 
-	longjmp(mark, 1);
+object_ptr<const String> Exception::problem_source() const { 
+	return fproblem_source && fproblem_source->size()?fproblem_source:0; 
 }