Changeset 3585 in Sophya

Timestamp:

Mar 5, 2009, 2:24:17 PM (17 years ago)

Author:

ansari

Message:

Ajout heritage exceptions SOPHYA de std::exception (+method what()) - nettoyage/suppression TRY/CATCH... , Reza 05/03/2009

Location:

trunk/SophyaLib/BaseTools

Files:

• pexceptions.cc (modified) (3 diffs)
• pexceptions.h (modified) (21 diffs)
• sophyainit.cc (modified) (1 diff)

trunk/SophyaLib/BaseTools/pexceptions.cc

@@ -3 +3 @@
 #include <iostream>
 #include <stdio.h>
+#include <string.h>
 
-void PFailHandler(void); 
-
+/* --- Nettoyage par Reza, Mars 2009 
 // egcs ne semble pas connaitre set_new_handler (Reza 26/04/99)
 // ca ne passe plus avec SGI-CC -LANG:std $CHECK$ Reza 14/02/2003
-#if defined( __GNUG__ ) || defined(__SGICC__)
-void PFailHandler(void) {}
-void InitFailNewHandler() {}
-#else
-
 void PFailHandler(void)
 {
@@ -19 +14 @@
   throw(AllocationError("new"));
 }
-
 void InitFailNewHandler()
 {
    set_new_handler(PFailHandler);
 }
-#endif
+--- FIN nettoyage */
 
-string SOPHYA::BuildLongExceptionMessage(const char * s, const char *file, int line)
+
+namespace SOPHYA {
+
+/*!
+  \ingroup BaseTools
+  \brief Utility function for appending a file name and line number to a message
+
+  In practice, the macro \b PExcLongMessage(a) can be used to append file name 
+  and line number to the message a.
+*/
+
+string BuildLongExceptionMessage(const char * s, const char *file, int line)
 {
   char buff[32];
@@ -34 +39 @@
   return(rs);
 }
+
+/*! 
+    \class PThrowable
+    \ingroup BaseTools
+    \brief Base exception class in Sophya, inherits from std::exception
+
+    This class is the ancestor class for PError and PException classes which are 
+    the base classes for all exceptions used in SOPHYA. The PThrowable class inherits
+    from the standard c++ exception base class, std::exception and implements the what()
+    method. A message (string/char*) passed to the constructor is kept in the exception object, 
+    and can be retrieved  using the \b what() method or \b Msg() method. An integer identifier 
+    can also be associated with the exception objet and retrieved by \b Id().
+    The message passed to the constructor is truncated to a maximum length defined by 
+    SEXC_MAXMSGLEN (=160 characters).
+*/
+
+PThrowable::PThrowable(const string& m, int ident) throw() 
+{
+  id_ = ident;
+  strncpy(msg_, m.c_str(), SEXC_MAXMSGLEN-1);
+  msg_[SEXC_MAXMSGLEN-1] = '\0';
+}
+
+PThrowable::PThrowable(const char* m, int ident) throw()
+{
+  id_ = ident;
+  if (m!=NULL) { 
+    strncpy(msg_, m, SEXC_MAXMSGLEN-1);
+    msg_[SEXC_MAXMSGLEN-1] = '\0';
+  }
+  else msg_[0] = '\0';
+}
+
+PThrowable::~PThrowable() throw()
+{
+}
+const char* PThrowable::what() const throw()
+{
+  return msg_;
+}
+
+string const PThrowable::Msg() const 
+{
+  return (string(msg_));
+}
+
+int PThrowable::Id() const
+{
+  return id_;
+}
+
+} // namespace SOPHYA

trunk/SophyaLib/BaseTools/pexceptions.h

@@ -10 +10 @@
 // Petit utilitaire pour accoler numero de ligne et nom de fichier aux messages
 // d'exception
+//! Utiliy macro to append file name and line number to a const char* string  
 #define PExcLongMessage(a) BuildLongExceptionMessage(a,__FILE__,__LINE__)
 
+#define SEXC_MAXMSGLEN 160
 namespace SOPHYA {
 
@@ -17 +19 @@
   string BuildLongExceptionMessage(const char * s, const char *file, int line);
 
-/*! \ingroup BaseTools
-    \brief Base exception class in Sophya
-
-    Ancestor for PError and PException
-    It has a message, and an id to give more
-    information on the exception.
-*/
-  class PThrowable {
+  class PThrowable : public std::exception {
   public:
     //! Constructor with the message and error-id (optional) specification
-    explicit PThrowable(const string& m, int ident=0) 
-      : msg(m), id(ident) {}
-    explicit PThrowable(const char* m, int ident=0) 
-      : msg(m), id(ident) {}
-    virtual ~PThrowable() { }
+    explicit PThrowable(const string& m, int ident=0) throw() ; 
+    explicit PThrowable(const char* m, int ident=0) throw() ; 
+    virtual ~PThrowable() throw();
+    //! Implementation of std::exception what() method, returning the exception message
+    virtual const char* what() const throw();
     //! Returns the associated message string
-    virtual string const& Msg() const  {return msg;}
+    virtual string const Msg() const; 
     //! Returns the associated error-id
-    virtual int Id() const {return id; }
+    virtual int Id() const;
   private:
-    string msg;
-    int    id;
+    char msg_[SEXC_MAXMSGLEN];
+    int    id_;
   };
 
@@ -49 +44 @@
   class PError : public PThrowable {
   public:
-    explicit PError(const string& m, int id=0) : PThrowable(m,id) {}
-    explicit PError(const char* m, int id=0) : PThrowable(m,id) {}
+    explicit PError(const string& m, int id=0) throw() : PThrowable(m,id) {}
+    explicit PError(const char* m, int id=0) throw() : PThrowable(m,id) {}
   };
   
@@ -57 +52 @@
   class PException : public PThrowable {
   public:
-    explicit PException(const string& m, int id=0) : PThrowable(m,id) {}
+    explicit PException(const string& m, int id=0) throw() : PThrowable(m,id) {}
+    explicit PException(const char* m, int id=0) throw() : PThrowable(m,id) {}
   };
   
@@ -71 +67 @@
   class AllocationError : public PError {
   public:
-    explicit AllocationError(const string& m, int id=0) : PError(m,id) {}
-    explicit AllocationError(const char* m, int id=0) : PError(m,id) {}
+    explicit AllocationError(const string& m, int id=0) throw() : PError(m,id) {}
+    explicit AllocationError(const char* m, int id=0) throw() : PError(m,id) {}
   };
   
@@ -79 +75 @@
   class NullPtrError : public PError {
   public:
-    explicit NullPtrError(const string& m, int id=0) : PError(m,id) {}
-    explicit NullPtrError(const char* m, int id=0) : PError(m,id) {}
+    explicit NullPtrError(const string& m, int id=0) throw() : PError(m,id) {}
+    explicit NullPtrError(const char* m, int id=0) throw() : PError(m,id) {}
   };
   
@@ -88 +84 @@
   class ForbiddenError : public PError {
   public:
-    explicit ForbiddenError(const string& m, int id=0) : PError(m,id) {}
-    explicit ForbiddenError(const char* m, int id=0) : PError(m,id) {}
+    explicit ForbiddenError(const string& m, int id=0) throw() : PError(m,id) {}
+    explicit ForbiddenError(const char* m, int id=0) throw() : PError(m,id) {}
   };
 
@@ -97 +93 @@
   class AssertionFailedError : public PError {
   public:
-    explicit AssertionFailedError(const string& m, int id=0) : PError(m,id) {}
-    explicit AssertionFailedError(const char* m, int id=0) : PError(m,id) {}
+    explicit AssertionFailedError(const string& m, int id=0) throw() : PError(m,id) {}
+    explicit AssertionFailedError(const char* m, int id=0) throw() : PError(m,id) {}
   };
   
@@ -120 +116 @@
   class IOExc : public PException {
   public:
-    explicit IOExc(const string& m, int id=0) : PException(m,id) {}
-    explicit IOExc(const char* m, int id=0) : PException(m,id) {}
+    explicit IOExc(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit IOExc(const char* m, int id=0) throw() : PException(m,id) {}
   };
 
@@ -128 +124 @@
   class FileFormatExc : public IOExc {
   public:
-    explicit FileFormatExc(const string& m, int id=0) : IOExc(m,id) {}
-    explicit FileFormatExc(const char* m, int id=0) : IOExc(m,id) {}
+    explicit FileFormatExc(const string& m, int id=0) throw() : IOExc(m,id) {}
+    explicit FileFormatExc(const char* m, int id=0) throw() : IOExc(m,id) {}
   };
 
@@ -136 +132 @@
   class SzMismatchError : public PException {
   public:
-    explicit SzMismatchError(const string& m, int id=0) : PException(m,id) {}
-    explicit SzMismatchError(const char* m, int id=0) : PException(m,id) {}
+    explicit SzMismatchError(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit SzMismatchError(const char* m, int id=0) throw() : PException(m,id) {}
   };
   
@@ -144 +140 @@
   class RangeCheckError : public PException {
   public:
-    explicit RangeCheckError(const string& m, int id=0) : PException(m,id) {}
-    explicit RangeCheckError(const char* m, int id=0) : PException(m,id) {}
+    explicit RangeCheckError(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit RangeCheckError(const char* m, int id=0) throw() : PException(m,id) {}
   };
   
@@ -152 +148 @@
   class ParmError : public PException {
   public:
-    explicit ParmError(const string& m, int id=0) : PException(m,id) {}
-    explicit ParmError(const char* m, int id=0) : PException(m,id) {}
+    explicit ParmError(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit ParmError(const char* m, int id=0) throw() : PException(m,id) {}
   };
 
@@ -160 +156 @@
   class NotAvailableOperation : public PException {
   public:
-    explicit NotAvailableOperation(const string& m, int id=0) : PException(m,id) {}
-    explicit NotAvailableOperation(const char* m, int id=0) : PException(m,id) {}
+    explicit NotAvailableOperation(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit NotAvailableOperation(const char* m, int id=0) throw() : PException(m,id) {}
   };
 
@@ -168 +164 @@
   class TypeMismatchExc : public PException {
   public:
-    explicit TypeMismatchExc(const string& m, int id=0) : PException(m,id) {}
-    explicit TypeMismatchExc(const char* m, int id=0) : PException(m,id) {}
+    explicit TypeMismatchExc(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit TypeMismatchExc(const char* m, int id=0) throw() : PException(m,id) {}
   };
 
@@ -176 +172 @@
   class MathExc : public PException {
   public:
-    explicit MathExc(const string& m, int id=0) : PException(m,id) {}
-    explicit MathExc(const char* m, int id=0) : PException(m,id) {}
+    explicit MathExc(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit MathExc(const char* m, int id=0) throw() : PException(m,id) {}
   };
   
@@ -184 +180 @@
   class SingMatrixExc : public MathExc {
   public:
-    explicit SingMatrixExc(const string& m, int id=0) : MathExc(m,id) {}
-    explicit SingMatrixExc(const char* m, int id=0) : MathExc(m,id) {}
+    explicit SingMatrixExc(const string& m, int id=0) throw() : MathExc(m,id) {}
+    explicit SingMatrixExc(const char* m, int id=0) throw() : MathExc(m,id) {}
   };
 
@@ -192 +188 @@
   class DuplicateIdExc : public PException {
   public:
-    explicit DuplicateIdExc(const string& m, int id=0) : PException(m,id) {}
-    explicit DuplicateIdExc(const char* m, int id=0) : PException(m,id) {}
+    explicit DuplicateIdExc(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit DuplicateIdExc(const char* m, int id=0) throw() : PException(m,id) {}
   };
   
@@ -200 +196 @@
   class NotFoundExc : public PException {
   public:
-    explicit NotFoundExc(const string& m, int id=0) : PException(m,id) {}
-    explicit NotFoundExc(const char* m, int id=0) : PException(m,id) {}
+    explicit NotFoundExc(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit NotFoundExc(const char* m, int id=0) throw() : PException(m,id) {}
   };
   
@@ -208 +204 @@
   class CaughtSignalExc : public PException {
   public:
-    explicit CaughtSignalExc(const string& m, int id=0) : PException(m,id) {}
-    explicit CaughtSignalExc(const char* m, int id=0) : PException(m,id) {}
+    explicit CaughtSignalExc(const string& m, int id=0) throw() : PException(m,id) {}
+    explicit CaughtSignalExc(const char* m, int id=0) throw() : PException(m,id) {}
  };
     
@@ -223 +219 @@
        {if (!(_x_)) throw(NullPtrError(#_x_))}
 
-void InitFailNewHandler();
-  
+
      
-// Compatibility with EROS-PEIDA exceptions
-
-
-#define TRY try
-#define CATCH(_var) catch(long _var)
-#define CATCHALL catch(...)
-#define ENDTRY
-
-#define THROW(_i) throw( _i);
-
-#define THROW_ THROW(0)
-
-#define THROW_SAME throw;
-
-
-#define DBASSERT(_x_) ASSERT(_x_)
-
 #endif

trunk/SophyaLib/BaseTools/sophyainit.cc

@@ -61 +61 @@
   if (FgInit > 1)  return;
 
-  InitFailNewHandler();
   ModListP = new map<string, double>;