Changeset 564 for CMT/HEAD

Timestamp:

Mar 22, 2011, 10:43:10 AM (13 years ago)

Author:

rybkin

Message:

See C.L. 447

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_fragment.cxx (modified) (1 diff)
• source/cmt_parser.cxx (modified) (1 diff)
• source/cmt_use.cxx (modified) (4 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2011-03-22    <rybkin@lal.in2p3.fr> 447
+
+        * source/cmt_use.cxx: In class Use, in functions, set_auto_imports_state,
+        set_auto_imports change order of setting auto_imports state to from first
+        to last, depth first, and first encountered taking precedence
+        * source/cmt_parser.cxx: In class Cmt, in function parser, configure
+        auto_imports state using same order as above
+        * source/cmt_fragment.cxx: Make diagnostic message more informative
+        
 2011-03-16    <rybkin@lal.in2p3.fr> 446
 

CMT/HEAD/source/cmt_fragment.cxx

@@ -575 +575 @@
   CmtMessage::warning
     (CmtError::get_error_name (CmtError::fragment_not_found)
-     + ": " + name);
+     + ": " + name + " (declared by " + use->get_package_name () + ")");
   return (false);
 }

CMT/HEAD/source/cmt_parser.cxx

@@ -6744 +6744 @@
 
   cmt_map <Use*, bool> visited;
-  for (int i = uses.size () - 1; i >= 0; i--)
+  for (int i = 0; i < uses.size (); i++)
+    //for (int i = uses.size () - 1; i >= 0; i--)
     {
       Use* use = uses[i];

CMT/HEAD/source/cmt_use.cxx

@@ -1233 +1233 @@
       cout << "Use::set_auto_imports_state>|";
       for (int i = level; i > 0; i--) cout << "-";
-      for (int i = uses.size () - 1; i >= 0; i--)
+      for (int i = 0; i < uses.size (); i++)
+      //for (int i = uses.size () - 1; i >= 0; i--)
         {
           cout << " " << uses[i]->get_package_name ()
@@ -1241 +1242 @@
     }
 
-  for (int i = uses.size () - 1; i >= 0; i--)
+  for (int i = 0; i < uses.size (); i++)
+  //for (int i = uses.size () - 1; i >= 0; i--)
     {
       Use* use = uses[i];
@@ -1281 +1283 @@
       cout << "Use::set_auto_imports_state><";
       for (int i = level; i > 0; i--) cout << "-";
-      for (int i = uses.size () - 1; i >= 0; i--)
+      for (int i = 0; i < uses.size (); i++)
+      //for (int i = uses.size () - 1; i >= 0; i--)
         {
           cout << " " << uses[i]->get_package_name ()
@@ -3885 +3888 @@
     }
   
-  for (int i = sub_uses.size () - 1; i >= 0; i--)
-    //for (int i = 0; i < sub_uses.size (); i++)
+  for (int i = 0; i < sub_uses.size (); i++)
+  //for (int i = sub_uses.size () - 1; i >= 0; i--)
     {
       State state = sub_use_auto_imports[i];