Changeset 581 for CMT/HEAD

Timestamp:

Jun 8, 2011, 3:12:36 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 459

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_project.cxx (modified) (2 diffs)
• source/cmt_project.h (modified) (2 diffs)
• source/cmt_regexp.cxx (modified) (1 diff)
• source/cmt_regexp.h (modified) (1 diff)
• source/cmt_use.cxx (modified) (2 diffs)
• source/cmt_use.h (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-06-08    <rybkin@lal.in2p3.fr> 459
+
+        * source/cmt_regexp.h: In class cmt_regexp, introduce clear function
+        * source/cmt_regexp.cxx: In class cmt_regexp, implement clear function
+        * source/cmt_use.h: In class Use, make class Project friend (to give access
+        to function clear)
+        * source/cmt_use.cxx: In class Use, function clear, clear new members
+        alternate_is_head_versions and m_head_version, in class UseProjectAction,
+        function run, clear Use new member alternate_is_head_versions
+        * source/cmt_project.h: In class Project, make copy constructor and
+        assignment operator private
+        * source/cmt_project.cxx: In class Project, function container_action,
+        invoke clear function on container (rather than destructor)
+        
 2011-05-10    <rybkin@lal.in2p3.fr> 458
 

CMT/HEAD/source/cmt_project.cxx

@@ -2305 +2305 @@
   //    omission does not permit <path>)
   //
-  Use* use = &m_container;
-  use->~Use ();
   if (words.size () < 2) return;
 
@@ -2337 +2335 @@
   if (ewords.size () > 2) path = ewords[2];
 
-  if (name != "")
-    {
-      use->set (name, version, path);
-      use->get_package ()->remove_use (use);
-      CmtSystem::cd (m_cmtpath_pwd);
-      if (use->move_to ("", true) &&
-          !CmtSystem::absolute_path (use->real_path))
-        {
-          use->change_path (m_cmtpath_pwd);
-        }
-      CmtSystem::cd (m_cmtpath_pwd + CmtSystem::file_separator () + "cmt");
-    }
+  Use* use = &m_container;
+  if (name == "")
+    {
+      use->clear ();
+      return;
+    }
+  if (version == "") version = "*";
+
+  use->set (name, version, path);
+  use->get_package ()->remove_use (use);
+  CmtSystem::cd (m_cmtpath_pwd);
+  if (use->move_to ("", true) &&
+      !CmtSystem::absolute_path (use->real_path))
+    {
+      use->change_path (m_cmtpath_pwd);
+    }
+  CmtSystem::cd (m_cmtpath_pwd + CmtSystem::file_separator () + "cmt");
 
   set_container_name (name);

CMT/HEAD/source/cmt_project.h

@@ -180 +180 @@
   void use_action (const cmt_string& name, const cmt_string& release);
 
-  Project& operator = (const Project& other);
+  //  Project& operator = (const Project& other);
   bool operator == (const cmt_string& name) const;
   bool operator != (const cmt_string& name) const;
@@ -215 +215 @@
 private:
 
+  Project& operator = (const Project& other);
+  Project (const Project& other);
+
   void fill_cmtpath (cmt_string& buffer);
 

CMT/HEAD/source/cmt_regexp.cxx

@@ -1581 +1581 @@
 }
 
+//----------------------------------------------------------
+void cmt_regexp::clear ()
+{
+  if (_root != 0)
+    {
+      delete _root;
+      _root = 0;
+    }
+}
+
+//----------------------------------------------------------
 bool cmt_regexp::is_valid () const
 {

CMT/HEAD/source/cmt_regexp.h

@@ -18 +18 @@
   cmt_regexp (const cmt_string& expression);
   ~cmt_regexp ();
+  void clear ();
 
   void set (const cmt_string& expression);

CMT/HEAD/source/cmt_use.cxx

@@ -1869 +1869 @@
   alternate_versions.clear ();
   alternate_paths.clear ();
+  alternate_is_head_versions.clear ();
+
+  m_head_version.clear (); 
 
   version_alias = "";
@@ -2293 +2296 @@
     m_use->alternate_versions.clear ();
     m_use->alternate_paths.clear ();
+    m_use->alternate_is_head_versions.clear ();
 
     if (m_use->reach_package (path, this->native_version))

CMT/HEAD/source/cmt_use.h

@@ -17 +17 @@
 class Package;
 class UseProjectAction;
+class Project;
 
 class Use
@@ -240 +241 @@
 
   friend class UseProjectAction;
+  friend class Project;
 };