Changeset 2191:ef3560193856 in lemon-0.x for lemon/edge_set.h

Timestamp:

09/04/06 13:09:59 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2916

Message:

Proper exception handling in the SmartEdgeSet?

File:

• lemon/edge_set.h (modified) (5 diffs)

lemon/edge_set.h

@@ -603 +603 @@
         return;
       }
-      throw UnsupportedOperation();
+      throw typename NodesImplBase::Notifier::ImmediateDetach();
     }
     
@@ -622 +622 @@
 
       virtual void erase(const Node& node) {
-        _edgeset.eraseNode(node);
-        Parent::erase(node);
+        try {
+          _edgeset.eraseNode(node);
+          Parent::erase(node);
+        } catch (const typename NodesImplBase::Notifier::ImmediateDetach&) {
+          Parent::clear();
+        }
       }
       virtual void erase(const std::vector<Node>& nodes) {
-        for (int i = 0; i < (int)nodes.size(); ++i) {
-          _edgeset.eraseNode(nodes[i]);
+        try {
+          for (int i = 0; i < (int)nodes.size(); ++i) {
+            _edgeset.eraseNode(nodes[i]);
+          }
+          Parent::erase(nodes);
+        } catch (const typename NodesImplBase::Notifier::ImmediateDetach&) {
+          Parent::clear();
         }
-        Parent::erase(nodes);
       }
       virtual void clear() {
@@ -682 +690 @@
     typedef _Graph Graph;
 
-    class UnsupportedOperation : public LogicError {
-    public:
-      virtual const char* what() const throw() {
-        return "lemon::SmartUEdgeSet::UnsupportedOperation";
-      }
-    };
-
   protected:
 
@@ -697 +698 @@
         return;
       }
-      throw UnsupportedOperation();
+      throw typename NodesImplBase::Notifier::ImmediateDetach();
     }
     
@@ -716 +717 @@
 
       virtual void erase(const Node& node) {
-        _edgeset.eraseNode(node);
-        Parent::erase(node);
+        try {
+          _edgeset.eraseNode(node);
+          Parent::erase(node);
+        } catch (const typename NodesImplBase::Notifier::ImmediateDetach&) {
+          Parent::clear();
+        }
       }
       virtual void erase(const std::vector<Node>& nodes) {
-        for (int i = 0; i < (int)nodes.size(); ++i) {
-          _edgeset.eraseNode(nodes[i]);
-        }
-        Parent::erase(nodes);
+        try {
+          for (int i = 0; i < (int)nodes.size(); ++i) {
+            _edgeset.eraseNode(nodes[i]);
+          }
+          Parent::erase(nodes);
+        } catch (const typename NodesImplBase::Notifier::ImmediateDetach&) {
+          Parent::clear();
+        }
       }
       virtual void clear() {