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

Timestamp:

Nov 27, 2011, 4:36:15 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 465

File:

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

CMT/HEAD/source/cmt_constituent.cxx

@@ -47 +47 @@
       if (symbol.type != Symbol::SymbolAction) continue;
 
+      /*
       if (symbol.value_lists.size () < 1) continue;
 
@@ -55 +56 @@
           add_for_action (symbol.name);
         }
+      */
+      add_for_action (symbol);
     }
 
@@ -368 +371 @@
       //cerr << "Constituent " << name << " Analyzing module " << ew << endl;
 
-      if (ew.substr (0, 13) == "action_value=")
-        {
-          it.set (ew);
-        }
-      else
-        {
+//       if (ew.substr (0, 13) == "action_value=")
+//      {
+//           it.set (ew);
+//      }
+//       else
+//      {
           CmtSystem::split (ew, " \t", ws);
 
@@ -383 +386 @@
               it.set (w);
             }
-        }
+//      }
     }
 
@@ -417 +420 @@
 
 //----------------------------------------------------------
-Constituent* Constituent::add_for_action (const cmt_string& name)
-{
-  Constituent* constituent;
-
-  constituent = add (Document, name, "cmt_action_runner");
+Constituent* Constituent::add_for_action (const Symbol& symbol)
+//Constituent* Constituent::add_for_action (const cmt_string& name)
+{
+  Constituent* constituent (0);
+  if (symbol.value_lists.size () < 1) return constituent;
+
+  const Tag* tag = Tag::find ("target_" + symbol.name);
+  const bool target_tag_used
+    (Tag::check_tag_used (tag) || Symbol::check_tag_used (tag));
+
+  cmt_string value = symbol.build_macro_value ();
+  if ( "" == value && !target_tag_used) return constituent;
+
+  constituent = add (Document, symbol.name, "cmt_action_runner");
 
   constituent->group = Group::add ("cmt_actions");
-  constituent->has_target_tag = true;
+
+  // Do NOT assign target_<name> by default
+  // but only if this tag is used somewhere
+  if (target_tag_used)
+    constituent->has_target_tag = true;
 
   cmt_string& p1 = constituent->parameters.add ();
   p1 = "action_value=";
-  p1 += "$(";
-  p1 += name;
-  p1 += ")";
+  Symbol::expand (value);
+  // quote since split will later be applied
+  // - in parse
+  p1 += CmtSystem::quote (value, " \t");
+//   p1 += "$(";
+//   p1 += symbol.name;
+//   p1 += ")";
 
   return (constituent);
@@ -549 +569 @@
   if (!simulation)
     {
-      Generator::build_constituent_makefile (*this);
+      bool dependencies (false);
+      Generator::build_constituent_makefile (*this, dependencies);
     }
 }