Changeset 334 for CMT

Timestamp:

Nov 22, 2006, 6:49:05 PM (18 years ago)

Author:

garonne

Message:

fixed bug with the hidden type package

Location:

CMT/v1r20b1/source

Files:

• cmt_parser.cxx (modified) (7 diffs)
• cmt_project.cxx (modified) (1 diff)
• cmt_use.cxx (modified) (19 diffs)
• cmt_use.h (modified) (2 diffs)

CMT/v1r20b1/source/cmt_parser.cxx

@@ -1757 +1757 @@
       if (use == 0) continue;
       if (use->discarded) continue;
+      if (use->m_hidden) continue;
 
       if (use->get_package_name () == "CMT") continue;
@@ -2968 +2969 @@
 
       if (use->discarded) continue;
+      if (use->m_hidden) continue;
 
       if (!use->located ())
@@ -5917 +5919 @@
 
           if (use->discarded) continue;
+          if (use->m_hidden) continue;
 
           Package* p = use->get_package ();
@@ -6737 +6740 @@
             
             if (use->discarded) continue;
+            if (use->m_hidden) continue;
             
             if (use->located ())
@@ -6779 +6783 @@
             
             if (use->discarded) continue;
+            if (use->m_hidden) continue;
 
             Package* p = use->get_package ();
@@ -6838 +6843 @@
             
             if (use->discarded) continue;
+            if (use->m_hidden) continue;
 
             Package* p = use->get_package ();
@@ -6981 +6987 @@
             
             if (use->discarded) continue;
+            if (use->m_hidden) continue;
             
             Package* p = use->get_package ();

CMT/v1r20b1/source/cmt_project.cxx

@@ -586 +586 @@
       project_use->selected  = true;
       project_use->m_located = true;
-      project_use->set_auto_imports(On);
+      project_use->set_auto_imports(Off);
       project_use->initial_scope = ScopePublic;      
       project->set_use(project_use);

CMT/v1r20b1/source/cmt_use.cxx

@@ -1432 +1432 @@
       cout << "Use::reach_package> (" << get_package_name () << " " 
            << version << ")from " << from_path << endl;
+          cout << "Use::reach_package> native_version required "<<n_version<<endl;
     }
     
@@ -1584 +1585 @@
       // There are alternate possibilities when it contains wild cards
       //
-      if ((version == "") ||
-          (version.find ("*") != cmt_string::npos))
+      if ((version == "") || (version.find ("*") != cmt_string::npos))
         {
           static CmtSystem::cmt_string_vector versions;
@@ -1598 +1598 @@
           if (n_version != "")
           {
-              static CmtSystem::cmt_string_vector native_versions;           
+              CmtSystem::cmt_string_vector native_versions;           
               for (int i = 0; i < versions.size (); i++)
               {
@@ -1621 +1621 @@
                           int pos = nv.find ('\n');
                           if (pos != cmt_string::npos) nv.erase (pos);
-                          pos = nv.find ('\r');
+                          pos     = nv.find ('\r');
                           if (pos != cmt_string::npos) nv.erase (pos);
                           if (nv == n_version)
                           {
                                cmt_string& name_entry = native_versions.add ();
-                               name_entry += versions[i];
+                               // We have found at least one
+                               // cout <<"native_version :"<<n_version<<" ,version: "<< versions[i]<<endl;
+                               this->native_version   = n_version;
+                               name_entry            += versions[i];
                           }
                       }                   
@@ -1749 +1752 @@
 public:
   UseProjectAction (Use* use, cmt_string n_version="") : m_use (use), m_found (false), native_version(n_version)
-  
   {
   }
@@ -1766 +1768 @@
 
     if (m_use->reach_package (path, this->native_version))
-      {
+    {
         if (Cmt::get_debug ())
           {
@@ -1888 +1890 @@
   // Second try is among the CMTPATHs
   //
-      
   UseProjectAction pa (this, native_version);
 
@@ -1997 +1998 @@
                     const cmt_string& package,
                     const cmt_string& version,
+                    const cmt_string& n_version,
                     Use** old_use,
-                    Use* context_use)
+                            Use* context_use)
 {
   bool new_request = add_request (path, package, version);
-
+   
   Use& current_use = Use::current ();
 
@@ -2086 +2088 @@
               (path == use.specified_path))
             {
+              
               if (Cmt::get_debug ())
-                {
-                  cout << " ... exactly same version and path!" << endl;
-                }
-              
+                  {
+                      cout << " ... exactly same version and path!" << endl;
+                  }           
               do_need_new = false; // We don't need a new one
-            }
+              if (n_version != use.native_version)
+              {
+                  if (Cmt::get_debug ())
+                       cout << " ... but native_version differs (" <<n_version<<"!="<<use.native_version<<") !" <<endl; 
+                  do_need_new = true;    
+              }       
+           }
           else if (version != use.specified_version)
             {
@@ -2211 +2219 @@
               
                   do_need_new = false; // We don't need a new one
+                  if (n_version != use.native_version)
+              {
+                  if (Cmt::get_debug ())
+                       cout << " ... but native_version differs (" <<n_version<<"!="<<use.native_version<<") !" <<endl;
+                  do_need_new = true;    
+              }
+                  
                 }
               else if (version != use.specified_version)
@@ -2310 +2325 @@
                   const cmt_string& version,
                   const cmt_string& version_alias,
-                  const cmt_string& path_alias)
+                  const cmt_string& path_alias,
+                  const cmt_string& n_version)
 {
   Package* p = 0;
@@ -2324 +2340 @@
 
       if ((use->specified_version == version) && 
-          (use->specified_path == path)) return (use);
+          (use->specified_path == path) && use->native_version==n_version) return (use);
     }
 
@@ -2359 +2375 @@
   Use* use = 0;
 
-  do_need_new = need_new (path, package_name, version, &old_use, context_use);
-  //cout <<"native_version: "<<native_version<<" "<<version<<endl;
-    
+  do_need_new = need_new (path, package_name, version, native_version, &old_use, context_use);
 
   if (Cmt::get_debug ())
     {
-      if (old_use != 0)
+      if (old_use != 0 && !do_need_new)
         {
           cout << "add> old_use " << old_use->get_package_name () <<
@@ -2376 +2390 @@
   if (do_need_new)
     {
-      use = create (path, package_name, version, version_alias, path_alias);
+      use = create (path, package_name, version, version_alias, path_alias, native_version);
     }
   else
@@ -2503 +2517 @@
       if (Cmt::get_debug ())
         {
-          cout << "select? [" << use << "] vs old_use[" << old_use << "] "
+          cout << "select? [" << use << "] "<< use->version <<" vs old_use[" << old_use << "] "
                << old_use->get_package_name ()
                << " " << old_use->version
@@ -2528 +2542 @@
             //
           static BestFitSelector selector;
-          Use* selected_use = selector.operate (old_use, use);
+      Use* selected_use = selector.operate (old_use, use);
 
           if (Cmt::get_debug ())
@@ -2544 +2558 @@
           if (use != selected_use) 
             {
-              use = use->set_selected_version (selected_use);
+                   use = use->set_selected_version (selected_use);
             }
           
@@ -3545 +3559 @@
 
       if (use->discarded) continue;
+      if (use->m_hidden) continue;
 
       if (!use->located ()) continue;
@@ -4235 +4250 @@
 
 
-
-
-
-
 Package* Package::find (const cmt_string& name)
 {

CMT/v1r20b1/source/cmt_use.h

@@ -64 +64 @@
                       const cmt_string& version,
                       const cmt_string& version_alias,
-                      const cmt_string& path_alias);
+                      const cmt_string& path_alias,
+                      const cmt_string& n_version="");
 
   void add_sub_use(Use* use) 
@@ -189 +190 @@
                         const cmt_string& package,
                         const cmt_string& version,
+                        const cmt_string& n_version,
                         Use** old_use,
                                     Use* context_use);