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

Timestamp:

Apr 5, 2012, 1:43:26 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 483

File:

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

CMT/HEAD/source/cmt_symbol.cxx

@@ -2223 +2223 @@
 {
   static const cmt_string path_separator = CmtSystem::path_separator ();
-
-  //  cmt_string here = CmtSystem::pwd ();
-  cmt_string rvalue = value;
-
-  /*
-  if (CmtSystem::cd (value))
-    {
-      rvalue = CmtSystem::pwd ();
-    }
-  else
-  */
-  if (!CmtSystem::realpath_ (value, rvalue))
-    {
-      CmtSystem::compress_path (rvalue);
+  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;
     }
 
@@ -2247 +2248 @@
     {
       const cmt_string& item = items[i];
-      cmt_string ritem = item;
-      /*
-      if (CmtSystem::cd (item))
+      cmt_string ritem;
+      const cmt_string * pritem;
+
+      if (!(pritem = realpaths.find (item)))
         {
-          ritem = CmtSystem::pwd ();
+          if (!CmtSystem::realpath_ (item, ritem))
+            {
+              ritem = item;
+              CmtSystem::compress_path (ritem);
+            }
+          pritem = &ritem;
+          realpaths.add (item, ritem);
+          //  cerr << "realpaths.add: " << item << " , " << ritem << endl;
         }
-      else
-      */
-      if (!CmtSystem::realpath_ (item, ritem))
-        {
-          CmtSystem::compress_path (ritem);
-        }
-
-      if (ritem == rvalue)
+      if (*pritem == *prvalue)
         {
           found = true;
@@ -2267 +2269 @@
     }
 
-  //  CmtSystem::cd (here);
   return (found);
 }