Changeset 571:9632ea8be6ca in lemon-0.x for src/work/deba/map_base.h

Timestamp:

05/07/04 10:18:30 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

• src/work/deba/map_base.h (modified) (7 diffs)

src/work/deba/map_base.h

@@ -40 +40 @@
                 */
         
-                MapBase(Registry& r) : registry(0) {
-                        registry->add(*this);
+                MapBase(Graph& g, Registry& r) : graph(&g), registry(0) {
+                        registry->attach(*this);
                 }
 
@@ -48 +48 @@
                 */      
         
-                MapBase(const MapBase& copy) : registry(0) {
-                        if (registry) {
-                                registry->add(*this);
+                MapBase(const MapBase& copy) : registry(0), graph(copy.graph) {
+                        if (copy.registry) {
+                                copy.registry->attach(*this);
                         }
                 } 
@@ -60 +60 @@
                 const MapBase& operator=(const MapBase& copy) {
                         if (registry) {
-                                registry->erase(*this);
+                                registry->detach(*this);
                         }
-                        registry = copy.registry;
-                        if (registry) {
-                                registry->add(*this);
+                        graph = copy.graph;
+                        if (copy.registry) {
+                                copy.registry->attach(*this);
                         }
                 }
@@ -75 +75 @@
                 virtual ~MapBase() {
                         if (registry) {
-                                registry->erase(*this);
+                                registry->detach(*this);
                         }
                 }
@@ -82 +82 @@
                 
                 Registry* registry;
+                Graph* graph;
 
                 int registry_index;
@@ -89 +90 @@
                 */
         
-                virtual void init(Graph& g) {
+                virtual void init() {
 
-                        for (KeyIt it(g); g.valid(it); g.next(it)) {
+                        for (KeyIt it(*graph); graph->valid(it); graph->next(it)) {
                                 add(it);
                         }
@@ -100 +101 @@
                 */
         
-                virtual void destroy(Graph& g) {
-                        for (KeyIt it(g); g.valid(it); g.next(it)) {
+                virtual void destroy() {
+                        for (KeyIt it(*graph); graph->valid(it); graph->next(it)) {
                                 erase(it);
                         }