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

Timestamp:

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

Author:

rybkin

Message:

See C.L. 444

File:

• CMT/HEAD/source/cmt_constituent.cxx (modified) (7 diffs)

CMT/HEAD/source/cmt_constituent.cxx

@@ -573 +573 @@
 
 //----------------------------------------------------------
-void Constituent::show () const
+void Constituent::show (ostream& out) const
+//void Constituent::show () const
 {
   int i;
@@ -580 +581 @@
     {
     case Library:
-      cout << "library";
+      out << "library";
       break;
     case Application:
-      cout << "application";
+      out << "application";
       break;
     case Document:
-      cout << "document " << generator;
+      out << "document " << generator;
       break;
     }
   
-  cout << " " << name;
+  out << " " << name;
   
   if (group != 0)
     {
-      cout << " -group=" << group->name ();
+      out << " -group=" << group->name ();
     }
   
   if (suffix != 0)
     {
-      cout << " -suffix=" << suffix;
+      out << " -suffix=" << suffix;
     }
   
   if ((type == Application) && need_check)
     {
-      cout << " -check";
+      out << " -check";
     }
   
   if ((type == Library) && no_share)
     {
-      cout << " -no_share";
+      out << " -no_share";
     }
   
   if ((type == Library) && no_static)
     {
-      cout << " -no_static";
+      out << " -no_static";
     }
   
   if ((type == Library) && build_triggers)
     {
-      cout << " -triggers";
+      out << " -triggers";
     }
   
   if (has_target_tag)
     {
-      cout << " -target_tag";
+      out << " -target_tag";
     }
   
@@ -631 +632 @@
       const cmt_string& import_name = imports[i];
       
-      cout << " -import=" << import_name;
+      out << " -import=" << import_name;
     }
   
@@ -638 +639 @@
       const cmt_string& exclude = excludes[i];
       
-      cout << " -x=" << exclude;
+      out << " -x=" << exclude;
     }
   
@@ -645 +646 @@
       const cmt_string& select = selects[i];
       
-      cout << " -k=" << select;
+      out << " -k=" << select;
     }
   
@@ -652 +653 @@
       const cmt_string& module_name = modules[i];
       
-      cout << " " << module_name;
+      out << " " << module_name;
     }
   
@@ -659 +660 @@
       const Variable& v = variables[i];
       
-      cout << " " << v.name << "=" << v.value;
-    }
-  
-  cout << endl;
-}
+      //      out << " " << v.name << "=" << v.value;
+      // quote (up to) 2 times as split is applied 2 times
+      // - before action
+      // - in parse
+      cmt_string qvalue (CmtSystem::quote (v.value, " \t"));
+      out << " " << v.name << "="
+          << (qvalue == v.value ? v.value : CmtSystem::quote (qvalue, " \t"));
+      //          << CmtSystem::quote (CmtSystem::quote (v.value, " \t"), " \t");
+    }
+  
+  out << endl;
+}