Changeset 1887:22fdc00894aa in lemon-0.x

Timestamp:

01/09/06 13:41:06 (18 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

The tree that is created for evaluation of expression string at new map creation is deleted after usage.

Location:

gui

Files:

• new_map_win.cc (modified) (3 diffs)
• new_map_win.h (modified) (2 diffs)

gui/new_map_win.cc

@@ -160 +160 @@
               //display it
               //gdc.changeEdgeText(mapname);
-
-              //delete emptr;
             }
           else //!edge.get_active()
@@ -241 +239 @@
               //display it
               //gdc.changeNodeText(mapname);
-
-              //delete emptr;
             }
           if(!abortion)
@@ -375 +371 @@
       std::string polishform=postOrder(root);
 
+      deleteTree(root);
+
       return polishform;
     }
   return "";
+}
+
+void NewMapWin::deleteTree(NewMapWin::tree_node * node)
+{
+  if(node->left_child!=NULL)
+    {
+      deleteTree(node->left_child);
+    }
+  if(node->right_child!=NULL)
+    {
+      deleteTree(node->right_child);
+    }
+  delete node;
 }
 

gui/new_map_win.h

@@ -29 +29 @@
   ///Constructor of NewMapWin creates the widgets shown in NewMapWin.
   NewMapWin(const std::string& title, NoteBookTab &, bool itisedge=true, bool edgenode=true);
-  
+
   ///Signal on button is connected to this function,
   ///Therefore this function determines whether to
@@ -48 +48 @@
   bool validVariable(std::string, bool);
 
+  void deleteTree(tree_node *);
+
   std::map<char, std::string> ch2var;