Changeset 571 for CMT/HEAD

Timestamp:

Apr 25, 2011, 8:37:18 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 454

Location:

CMT/HEAD

Files:

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

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-04-25    <rybkin@lal.in2p3.fr> 454
+
+        * source/cmt_use.cxx: In class Use, in function show_sub_uses, make use of
+        find_valid ensure valid uses are followed
+        
 2011-04-23    <rybkin@lal.in2p3.fr> 453
 

CMT/HEAD/source/cmt_use.cxx

@@ -4561 +4561 @@
 
   level++;
-  for (n = 0; n < sub_uses.size (); n++)
-    {
-      use = sub_uses[n];
-      if (use == 0) continue;
-
-      const cmt_string& request = requests[n];
+  for (int i = 0; i < sub_uses.size (); i++)
+    {
+      //use = sub_uses[n];
+      //if (use == 0) continue;
+      if (sub_uses[i]->m_index >= 0 && !sub_uses[i]->discarded)
+        {
+          use = sub_uses[i];
+        }
+      else
+        {
+          Use* au (find_valid (sub_uses[i]->get_package_name ()));
+          if (au)
+            {
+              use = au;
+            }
+          else
+            {
+              continue;
+            }
+        }
+
+      const cmt_string& request = requests[i];
 
       ScopeType saved_scope = use->initial_scope;
       State saved_state = use->auto_imports;
 
-      use->initial_scope = sub_use_scopes[n];
-      use->auto_imports = sub_use_auto_imports[n];
+      use->initial_scope = sub_use_scopes[i];
+      use->auto_imports = sub_use_auto_imports[i];
 
       use->show_sub_uses (request, skip_discarded, out);