Changeset 570 for CMT/HEAD

Timestamp:

Apr 23, 2011, 2:31:36 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 453

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_use.cxx (modified) (7 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-04-23    <rybkin@lal.in2p3.fr> 453
+
+        * source/cmt_use.cxx:  In class Use, in function set_auto_imports_state,
+        revisit uses specified explicitly with -import=<package> encountered in
+        constituent specification for the first time, to ensure <package> is
+        imported, in function set_auto_imports, revisit sub-uses of current use
+        encountered in its requirements file for the first time to ensure their
+        auto_imports state takes precedence
+        
 2011-04-20    <rybkin@lal.in2p3.fr> 452
 

CMT/HEAD/source/cmt_use.cxx

@@ -1257 +1257 @@
 
   static int level (-1);
+  level++;
+  if (level == 0)
+    {
+      unselect_all ();
+    }
+
   if (Cmt::get_debug ())
     {
-      level++;
       cout << "Use::set_auto_imports_state>|";
       for (int i = level; i > 0; i--) cout << "-";
@@ -1275 +1280 @@
     {
       Use* use = uses[i];
-      if (visited.has (use)) continue;
+      if (visited.has (use) &&
+          (0 != level || use->is_selected ()))
+        // revisit uses specified explicitly with -import=<package> (level == 0)
+        // encountered in constituent specification for the first time (selected == false)
+        // to ensure <package> is imported
+        {
+          continue;
+        }
+
       visited.add (use, yes);
+      if (0 == level) use->select ();
+
       if (!auto_imports_states[use->m_index])
         auto_imports_states[use->m_index] = true;
+      //if (0 == level && use->is_selected ()) continue;
 
       Use::UsePtrVector subuses;
@@ -1344 +1360 @@
         }
       cout << "|" << endl;
-      level--;
-    }
+    }
+
+  level--;
+  return;
 }
 
@@ -3942 +3960 @@
                             cmt_map <Use*, bool>& visited)
 {
-  if (visited.has (this)) return;
-
   static int level (-1);
+  level++;
+  if (level == 0)
+    {
+      unselect_all ();
+      selected = true;
+    }
+
+  if (visited.has (this) &&
+      (1 != level || selected))
+    // revisit sub-uses of current (level == 0) use
+    // encountered in its requirements file for the first time (selected == false)
+    // to ensure their auto_imports state takes precedence
+    {
+      level--;
+      return;
+    }
+
   if (Cmt::get_debug ())
     {
-      level++;
       cout << "Use::set_auto_imports>|";
       for (int i = level; i > 0; i--) cout << "-";
@@ -3957 +3989 @@
   static bool yes (true);
   visited.add (this, yes);
+  if (1 == level) selected = true;
   //  if (auto_imports == context_state) return;
   
@@ -4051 +4084 @@
             {
               visited.add (sub_uses[i], yes);
+              sub_uses[i]->select ();
             }
         }
@@ -4058 +4092 @@
     {
       cout << s << endl;
-      level--;
-    }
+    }
+
+  level--;
+  return;
 }
 /*