Changeset 563 for CMT/HEAD/source/cmt_parser.cxx

Timestamp:

Mar 16, 2011, 3:32:16 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 446

File:

• CMT/HEAD/source/cmt_parser.cxx (modified) (6 diffs)

CMT/HEAD/source/cmt_parser.cxx

@@ -6729 +6729 @@
     }
 
+  //
+  // Set auto_imports
+  //
+
+  Use::UsePtrVector uses;
+  Use* use (0);
+  use = Use::find (CmtSystem::get_home_package ());
+  if (use != 0 && !use->discarded && !use->m_hidden && use->located ())
+    uses.push_back (use);
+  uses.push_back (&(Use::current()));
+  use = Use::find (CmtSystem::get_user_context_package ());
+  if (use != 0 && !use->discarded && !use->m_hidden && use->located ())
+    uses.push_back (use);
+
+  cmt_map <Use*, bool> visited;
+  for (int i = uses.size () - 1; i >= 0; i--)
+    {
+      Use* use = uses[i];
+      use->set_auto_imports (use->auto_imports, use->auto_imports, visited);
+    }
+
   if (Me.m_debug) cout << "parser3> current_tag=" << Me.m_current_tag << endl;
 
@@ -8935 +8956 @@
          */
         cmt_vector<bool> auto_imports_states (base_auto_imports_states);
-        
+        Use::UsePtrVector uses;
+
         for (i = 0; i < constituent.imports.size (); i++)
           {
@@ -8955 +8977 @@
                 if (Cmt::get_debug ())
                   {
-                    cout << constituent.name  << " needs imports " << import << " "
-                         << use_index << " " 
-                         << u->get_package()->get_name() << " "
-                         << " u->auto_imports=" << u->auto_imports
-                         << " Off=" << Off
-                         << " On=" << On
+                    cout << constituent.name  << " needs imports " << import
+                         << " i=" << use_index << " package=" 
+                         << u->get_package()->get_name()
+                         << " auto_imports=" << u->auto_imports
+                         << " (Off=" << Off
+                         << " On=" << On << ")"
                          << endl;
                   }
@@ -8967 +8989 @@
                 if (p->is_cmt ()) continue;
                 
-                if (u->auto_imports != Off) continue;
-                
-                Use::set_auto_imports_state (use_index, auto_imports_states);
+                uses.push_back (u);
+                //u->set_auto_imports_state (auto_imports_states, visited);
+                //if (u->auto_imports != Off) continue;
+                //Use::set_auto_imports_state (use_index, auto_imports_states);
               }
             else
@@ -8978 +9001 @@
                                        " cannot be imported (requested for " +
                                        constituent.name +")");
+                if (Cmt::get_debug ())
+                  {
+                    cout << "import [" << i << "] "
+                         << ("package " + import +
+                             " cannot be imported (requested for " +
+                             constituent.name +")")  << endl;
+                  }
               }
           }
+
+        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 ())
@@ -8994 +9029 @@
           {
             //      if (base_auto_imports_states[i]== On && auto_imports_states[i] == Off) continue;
-            if (base_auto_imports_states[i] == On || auto_imports_states[i] == Off) continue;
+            if (base_auto_imports_states[i] || !auto_imports_states[i]) continue;
+            //if (base_auto_imports_states[i] == On || auto_imports_states[i] == Off) continue;
             /**
              *  Consider the package (i) for import only if it is:
-             *   o not imported yet (i.e., base_auto_imports_states[i] != On)
+             *   o not imported yet (i.e., base_auto_imports_states[i] != true)
              *   o requested for import according to -import=xxx modifiers for
-             *     the current constituent (i.e., auto_imports_states[i] != Off)
+             *     the current constituent (i.e., auto_imports_states[i] != false)
              */
             Use* u = Uses[i];