Changeset 625 for CMT

Timestamp:

Nov 7, 2012, 3:13:05 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 496

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_symbol.cxx (modified) (7 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2012-11-07    <rybkin@lal.in2p3.fr> 496
+
+        * source/cmt_symbol.cxx: Introduce helper function process_cmd_output to
+        process command output similar to `shell' function of GNU Make. Make use of
+        this function in functions resolve_value, resolve_value_for_macros,
+        suppress_OS_delimiters in order to allow for possibly multi-line output of
+        commands in command substitution (introduced with backquotes)
+        
 2012-09-21    <rybkin@lal.in2p3.fr> 495
 

CMT/HEAD/source/cmt_symbol.cxx

@@ -223 +223 @@
 #endif
 }
+/**
+ * similar to processing
+ * `shell' function of GNU Make does
+ *  on command output
+ */
+static void process_cmd_output (cmt_string& text)
+{
+  //cerr << "process_cmd_output (begin): [" << text << "]" << endl;
+  // remove trailing (carriage-return and) newline(s)
+  int nl = text.size ();
+  while (nl > 0 && text[nl - 1] == '\n')
+    {
+      nl--;
+      if (nl > 0 && text[nl - 1] == '\r')
+        nl--;
+    }
+  if (nl != text.size ())
+    text.erase (nl);
+
+  // convert each newline (or carriage-return / newline pair) to a single space
+  text.replace_all ("\r\n", " ");
+  text.replace_all ("\n", " ");
+  //cerr << "process_cmd_output (end): [" << text << "]" << endl;
+}
 
 /**
@@ -318 +342 @@
           CmtSystem::execute (command, result);
           
+          /*
           int pos;
           pos = result.find ('\n');
@@ -323 +348 @@
           pos = result.find ('\r');
           if (pos != cmt_string::npos) result.erase (pos);
-          
+          */          
+          process_cmd_output (result);
+
           if (Cmt::get_debug ())
             {
-              cout << "   Executing [" << command << "] to expand a symbol value =>[" 
+              cout << "resolve_value: Executing [" << command << "] to expand a symbol value =>[" 
                    << result << "]" << endl;
             }
@@ -462 +489 @@
           CmtSystem::execute (command, result);
           
+          /*
           int pos;
           pos = result.find ('\n');
@@ -467 +495 @@
           pos = result.find ('\r');
           if (pos != cmt_string::npos) result.erase (pos);
+          */
+          process_cmd_output (result);
           
           if (Cmt::get_debug ())
@@ -596 +626 @@
           CmtSystem::execute (command, result);
           
+          /*
           int pos;
           pos = result.find ('\n');
@@ -601 +632 @@
           pos = result.find ('\r');
           if (pos != cmt_string::npos) result.erase (pos);
+          */          
+          process_cmd_output (result);
           
           if (Cmt::get_debug ())