Changeset 610 for CMT/HEAD/source/cmt_symbol.cxx

Timestamp:

Apr 16, 2012, 12:17:30 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 485

File:

• CMT/HEAD/source/cmt_symbol.cxx (modified) (14 diffs)

CMT/HEAD/source/cmt_symbol.cxx

@@ -2220 +2220 @@
 }
 
-static bool find_path_entry (const cmt_string& paths, const cmt_string& value)
+static bool find_path_entry (const CmtSystem::cmt_string_vector& items, const cmt_string& value)
 {
   static const cmt_string path_separator = CmtSystem::path_separator ();
   static cmt_vmap <cmt_string, cmt_string> realpaths;
+
+  if (value.size () == 0) return true;
 
   cmt_string rvalue;
@@ -2240 +2242 @@
     }
 
-  CmtSystem::cmt_string_vector items;
-  CmtSystem::split (paths, path_separator, items);
+  //  CmtSystem::cmt_string_vector items;
+  //  CmtSystem::split (paths, path_separator, items);
 
   bool found = false;
@@ -2248 +2250 @@
     {
       const cmt_string& item = items[i];
+      if (item.size () == 0) continue;
       cmt_string ritem;
       const cmt_string * pritem;
@@ -2272 +2275 @@
 }
 
+static bool find_path_entry (const cmt_string& paths, const cmt_string& value)
+{
+  static const cmt_string path_separator = CmtSystem::path_separator ();
+  static cmt_vmap <cmt_string, cmt_string> realpaths;
+
+  cmt_string rvalue;
+  const cmt_string * prvalue;
+
+  if (!(prvalue = realpaths.find (value)))
+    {
+      if (!CmtSystem::realpath_ (value, rvalue))
+        {
+          rvalue = value;
+          CmtSystem::compress_path (rvalue);
+        }
+      prvalue = &rvalue;
+      realpaths.add (value, rvalue);
+      //      cerr << "realpaths.add: " << value << " , " << rvalue << endl;
+    }
+
+  CmtSystem::cmt_string_vector items;
+  CmtSystem::split (paths, path_separator, items);
+
+  bool found = false;
+
+  for (int i = 0; i < items.size (); i++)
+    {
+      const cmt_string& item = items[i];
+      cmt_string ritem;
+      const cmt_string * pritem;
+
+      if (!(pritem = realpaths.find (item)))
+        {
+          if (!CmtSystem::realpath_ (item, ritem))
+            {
+              ritem = item;
+              CmtSystem::compress_path (ritem);
+            }
+          pritem = &ritem;
+          realpaths.add (item, ritem);
+          //  cerr << "realpaths.add: " << item << " , " << ritem << endl;
+        }
+      if (*pritem == *prvalue)
+        {
+          found = true;
+          break;
+        }
+    }
+
+  return (found);
+}
+
 //-------------------------------------------------------------
 const cmt_string PathBuilder::build (const Symbol& symbol,
@@ -2282 +2337 @@
 
   cmt_string temp;
-  cmt_string previous_temp;
+  CmtSystem::cmt_string_vector temp_vector;
+  //  cmt_string previous_temp;
+  CmtSystem::cmt_string_vector new_value_vector;
   cmt_string new_value;
   static const cmt_string empty;
@@ -2301 +2358 @@
   level++;
 
-  temp = CmtSystem::getenv (symbol.name);
+  CmtSystem::split (CmtSystem::getenv (symbol.name), path_separator, temp_vector);
+  //temp = CmtSystem::getenv (symbol.name);
 
   bool first_definition = true;
@@ -2337 +2395 @@
                 !symbol.value_is_reflexive (value.text))
               {
+                Cmt::vector_to_string (temp_vector, path_separator, temp);
                 resolve_value (new_value, symbol.name, temp);
-                temp = new_value;
+                CmtSystem::split (new_value, path_separator, temp_vector);
+                //temp = new_value;
               }
 
@@ -2346 +2406 @@
             if (new_value != "")
               {
-                if (!find_path_entry (temp, new_value))
-                  {
-                    if (temp != "") temp += path_separator;
-                      
-                    temp += new_value;
-                  }
+                CmtSystem::split (new_value, path_separator, new_value_vector);
+                for (int i = 0; i < new_value_vector.size (); i++)
+                  if (!find_path_entry (temp_vector, new_value_vector[i]))
+                    //if (!find_path_entry (temp, new_value))
+                    {
+                      temp_vector.push_back (new_value_vector[i]);
+                      /*
+                        if (temp != "") temp += path_separator;
+                        
+                        temp += new_value;
+                      */
+                    }
               }
                   
@@ -2359 +2425 @@
             if (new_value != "")
               {
-                if (!find_path_entry (temp, new_value))
-                  {
-                    previous_temp = temp;
-                    temp = new_value;
-                    if (previous_temp != "") temp += path_separator;
-                    temp += previous_temp;
-                  }
+                CmtSystem::split (new_value, path_separator, new_value_vector);
+                int n (new_value_vector.size ());
+                temp_vector.resize (temp_vector.size () + n);
+                for (int i = temp_vector.size () - 1; i > n - 1; i--)
+                  temp_vector [i] = temp_vector [i - n];
+                for (int i = 0; i < new_value_vector.size (); i++)
+                  if (!find_path_entry (temp_vector, new_value_vector[i]))
+                    //if (!find_path_entry (temp, new_value))
+                    {
+                      temp_vector [i] = new_value_vector[i];
+                      /*
+                        previous_temp = temp;
+                        temp = new_value;
+                        if (previous_temp != "") temp += path_separator;
+                        temp += previous_temp;
+                      */
+                    }
+                  else
+                    temp_vector [i] = "";
               }
-                  
+            
             break;
           case CommandPathRemove :
@@ -2373 +2451 @@
             if (new_value != "")
               {
+                for (int j = 0; j < temp_vector.size (); ++j)
+                  {
+                    cmt_string& s = temp_vector[j];
+                    
+                    if (s.find (new_value) != cmt_string::npos)
+                      {
+                        s = "";
+                      }
+                  }
+                /*
                 CmtSystem::cmt_string_vector paths;
                   
@@ -2388 +2476 @@
 
                 Cmt::vector_to_string (paths, path_separator, temp);
+                */
               }
               
@@ -2397 +2486 @@
                 cmt_regexp e (new_value);
 
+                for (int j = 0; j < temp_vector.size (); ++j)
+                  {
+                    cmt_string& s = temp_vector[j];
+
+                    if (Cmt::get_debug () &&
+                        CmtSystem::getenv ("TESTPRR") != "")
+                      {
+                        cerr << "PRR> s=[" << s << "]";
+                      }
+
+                    if (e.match (s))
+                      {
+                        s = "";
+
+                        if (Cmt::get_debug () &&
+                            CmtSystem::getenv ("TESTPRR") != "")
+                          {
+                            cerr << " match ";
+                          }
+                      }
+                    else
+                      {
+                        if (Cmt::get_debug () &&
+                            CmtSystem::getenv ("TESTPRR") != "")
+                          {
+                            cerr << " no match ";
+                          }
+                      }
+
+                    if (Cmt::get_debug () &&
+                        CmtSystem::getenv ("TESTPRR") != "")
+                      {
+                        cerr << endl;
+                      }
+                  }
+
+                /*
                 CmtSystem::cmt_string_vector paths;
                   
@@ -2434 +2560 @@
 
                 Cmt::vector_to_string (paths, path_separator, temp);
+                */
               }
               
@@ -2440 +2567 @@
 
     }
+
+  Cmt::vector_to_string (temp_vector, path_separator, temp);
 
   level--;