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

Timestamp:

Mar 8, 2011, 1:56:48 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 444

File:

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

CMT/HEAD/source/cmt_symbol.cxx

@@ -3061 +3061 @@
 
 //-------------------------------------------------------------
-//  Quote separators (spaces and tabs) with double quotes,
-//  double quotes with single quotes,
-//  single quotes with double quotes in text.
-//  Note: quotes preceded by backslash (i.e., \" or \') are NOT quoted
-//  (considered escaped)
-//-------------------------------------------------------------
-static cmt_string quote (const cmt_string& text,
-                         const cmt_string& separators)
-{
-  //cerr << "quote: `" << text << "'" << endl;
-  cmt_string result;
-  if (text.size () == 0) return result;
-
-  int allocated = 3 * text.size (); // if EACH character of text quoted with " or '
-  char* const buffer = (char*) malloc (allocated + 1);
-  char* b (buffer);
-
-  //  char* const beg (buffer);
-  const char* p = text.c_str ();
-  const char* const text_c (p);
-  //  const char* const beg_t (p);
-  //  cerr << "quote: p = `" << p << "'" << endl;
-
-  while (*p)
-    //  while (*p != '\0')
-    {
-      size_t l_nonsep = strcspn (p, separators.c_str ());
-      //cerr << "quote: l_nonsep = " << l_nonsep << " *p = '" << *p << "'" << endl;
-      while (l_nonsep--)
-        {
-          if (*p == '\"' &&
-              (p > text_c && *(p - 1) != '\\' || p == text_c))
-            { // quote " with '
-              *b++ = '\'';
-              *b++ = *p++;
-              *b++ = '\'';
-            }
-          else if (*p == '\'' &&
-                   (p > text_c && *(p - 1) != '\\' || p == text_c))
-            { // quote ' with "
-              *b++ = '\"';
-              *b++ = *p++;
-              *b++ = '\"';
-            }
-          else
-            { // simply copy
-              *b++ = *p++;
-            }
-        }
-      size_t l_sep = strspn (p, separators.c_str ());
-      //cerr << "quote: l_sep = " << l_sep << " *p = '" << *p << "'" << endl;
-      if (l_sep)
-        { // quote separators with "
-          // place quote before all backslashes preceding separators, if any
-          char* r = b;
-          while (r > buffer && *(r - 1) == '\\')
-            r--;
-          if (r == b)
-            *b++ = '\"';
-          else
-            *r = '\"', *b++ = '\\';
-          while (l_sep--)
-            *b++ = *p++;
-          *b++ = '\"';
-        }
-    }
-  *b = '\0';
-  result = buffer;
-  free (buffer);
-  return result;
-}
-
-//-------------------------------------------------------------
 int SymbolValueList::print (const Symbol& symbol, 
                             const SymbolValue& value, 
@@ -3311 +3238 @@
     }
 
-  cout << " " << quote (value.text, " \t");
+  cout << " " << CmtSystem::quote (value.text, " \t");
   //  cout << "'" << value.text << "'";