Changeset 575 for CMT/HEAD

Timestamp:

May 4, 2011, 5:46:28 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 457

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_parser.cxx (modified) (3 diffs)
• source/cmt_use.cxx (modified) (1 diff)
• source/cmt_use.h (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-05-04    <rybkin@lal.in2p3.fr> 457
+
+        * source/cmt_use.h: In class Use, declare function set_auto_imports_state
+        with modified signature to follow policy similar to that of function
+        set_auto_imports
+        * source/cmt_use.cxx: In class Use, in function set_auto_imports_state,
+        implement policy similar to that of function set_auto_imports
+        * source/cmt_parser.cxx: In class StandardMacroBuilder, in function
+        fill_for_all_constituents, make use of set_auto_imports_state with modified
+        signature
+        
 2011-05-02    <rybkin@lal.in2p3.fr> 456
 

CMT/HEAD/source/cmt_parser.cxx

@@ -9023 +9023 @@
                 if (Cmt::get_debug ())
                   {
-                    cout << constituent.name  << " needs imports " << import
+                    cout << constituent.name  << " has import request " << import
                          << " i=" << use_index << " package=" 
                          << u->get_package()->get_name()
@@ -9057 +9057 @@
           }
 
+        /*
         cmt_map <Use*, bool> visited;
         static bool yes (true);
         visited.add (&(Use::current()), yes);
         Use::set_auto_imports_state (uses, auto_imports_states, visited);
-        
-        if (Cmt::get_debug ())
-          {
-            cout << constituent.name  << " has imports " << endl;
-          }
-        
-        
+        */      
+        Use::set_auto_imports_state (uses, auto_imports_states);
+
         /**
          *   Find all newly exposed packages and precompute this list inside
@@ -9090 +9087 @@
             Package* p = u->get_package ();
             if (p->is_cmt ()) continue;
-            
-            if (Cmt::get_debug ())
-              {
-                cout << constituent.name  << " has import " << p->get_name () << endl;
-              }
-            
+
             imports.push_back (u);
           }
         
+        if (Cmt::get_debug ())
+          {
+            if (imports.size () == 0)
+              {
+                cout << constituent.name  << " needs no imports" << endl;
+              }
+            else
+              {
+                cout << constituent.name  << " has imports" << endl;
+                for (int i = 0; i < imports.size (); i++)
+                  {
+                    cout << constituent.name  << " has import "
+                         << imports[i]->get_package_name () << endl;
+                  }
+              }
+          }
+
         /**
          *  Only for linkopts we take care of the order. This means

CMT/HEAD/source/cmt_use.cxx

@@ -1251 +1251 @@
 //----------------------------------------------------------
 void Use::set_auto_imports_state (const Use::UsePtrVector& uses,
+                                  cmt_vector<bool>& auto_imports_states)
+{
+  if (0 == uses.size ()) return;
+
+  static int level (0);
+  if (level == 0)
+    {
+      unselect_all ();
+      Use::current().select ();
+    }
+
+  if (Cmt::get_debug ())
+    {
+      cout << "Use::set_auto_imports_state>|";
+      for (int i = level; i > 0; i--) cout << "-";
+      for (int i = 0; i < uses.size (); i++)
+      //for (int i = uses.size () - 1; i >= 0; i--)
+        {
+          cout << " " << uses[i]->get_package_name ()
+               << "(" << uses[i]->auto_imports << ")";
+        }
+      cout << ">" << endl;
+    }
+
+  for (int i = 0; i < uses.size (); i++)
+  //for (int i = uses.size () - 1; i >= 0; i--)
+    {
+      const Use* use = uses[i];
+      if (!auto_imports_states[use->m_index])
+        auto_imports_states[use->m_index] = true;
+    }
+
+  Use::UsePtrVector subuses;
+  for (int k = 0; k < uses.size (); k++)
+  //for (int i = uses.size () - 1; i >= 0; i--)
+    {
+      Use* use = uses[k];
+      if (use->is_selected ()) continue;
+      use->select ();
+      for (int i = 0; i < use->sub_uses.size (); i++)
+        {
+          if (use->sub_uses[i]->m_index >= 0 && !use->sub_uses[i]->discarded)
+            {
+              if (use->sub_use_auto_imports[i] != Off
+                  && !use->sub_uses[i]->is_selected ())
+                {
+                  subuses.push_back (use->sub_uses[i]);
+                }
+            }
+          else
+            {
+              if (Cmt::get_debug ())
+                {
+                  cout << "Use::set_auto_imports_state> " << use->get_package_name ()
+                       << " -> sub_use " << use->sub_uses[i]->get_package_name ()
+                       << "[" << use->sub_uses[i] << ", discarded="
+                       << use->sub_uses[i]->discarded << ", m_index="
+                       << use->sub_uses[i]->m_index << " : invalid]" << endl;
+                }
+              Use* au (find_valid (use->sub_uses[i]->get_package_name ()));
+              if (au)
+                {
+                  if (Cmt::get_debug ())
+                    {
+                      cout << "Use::set_auto_imports_state> " << use->get_package_name ()
+                           << " -> sub_use " << au->get_package_name ()
+                           << "[" << au << ", discarded="
+                           << au->discarded << ", m_index="
+                           << au->m_index << " : valid]" << endl;
+                    }
+                  if (use->sub_use_auto_imports[i] != Off
+                      && !au->is_selected ())
+                    {
+                      subuses.push_back (au);
+                    }
+                }
+              else
+                {
+                  use->sub_uses[i]->select ();
+                }
+            }
+        }
+    }
+
+  level++;
+  Use::set_auto_imports_state (subuses, auto_imports_states);
+  level--;
+
+  if (Cmt::get_debug ())
+    {
+      cout << "Use::set_auto_imports_state><";
+      for (int i = level; i > 0; i--) cout << "-";
+      for (int i = 0; i < uses.size (); i++)
+      //for (int i = uses.size () - 1; i >= 0; i--)
+        {
+          cout << " " << uses[i]->get_package_name ()
+               << "(" << (auto_imports_states[uses[i]->m_index] ? "+" : "-") << ")";
+        }
+      cout << "|" << endl;
+    }
+
+  return;
+}
+
+//----------------------------------------------------------
+void Use::set_auto_imports_state (const Use::UsePtrVector& uses,
                                   cmt_vector<bool>& auto_imports_states,
                                   cmt_map <Use*, bool>& visited)

CMT/HEAD/source/cmt_use.h

@@ -35 +35 @@
   //static void set_auto_imports_state (int use_index,
   //cmt_vector<bool>& auto_imports_states);
+  static void set_auto_imports_state (const Use::UsePtrVector& uses,
+                                      cmt_vector<bool>& auto_imports_states);
   static void set_auto_imports_state (const Use::UsePtrVector& uses,
                                       cmt_vector<bool>& auto_imports_states,