Changeset 591 for CMT/HEAD/source

Timestamp:

Nov 29, 2011, 10:07:38 AM (13 years ago)

Author:

rybkin

Message:

See C.L. 468

Location:

CMT/HEAD/source

Files:

• cmt_constituent.cxx (modified) (2 diffs)
• cmt_generator.cxx (modified) (2 diffs)
• cmt_generators.cxx (modified) (5 diffs)

CMT/HEAD/source/cmt_constituent.cxx

@@ -389 +389 @@
     }
 
+  parameters.clear ();
+
   if (has_target_tag && (Document != type || "cmt_actions" != group->name ()))
     {
@@ -404 +406 @@
         }
     }
-
-  parameters.clear ();
 }
 

CMT/HEAD/source/cmt_generator.cxx

@@ -1079 +1079 @@
           const Symbol* filter_macro = Symbol::find (package_name + "_header_file_filter");
           if (filter_macro == 0) continue;
+          const cmt_string filter_expr (filter_macro->resolve_macro_value ());
+          if (filter_expr.size () == 0) continue;
           
           const Symbol* stamp_macro = Symbol::find (package_name + "_header_file_stamp");
@@ -1106 +1108 @@
 
           os << "macro " + package_name + "_header_file_filter ";
-          os << CmtSystem::quote (filter_macro->resolve_macro_value (), " \t");
+          os << CmtSystem::quote (filter_expr, " \t");
+          //os << CmtSystem::quote (filter_macro->resolve_macro_value (), " \t");
           os << "\n";
           os << "macro " + package_name + "_header_file_stamp ";

CMT/HEAD/source/cmt_generators.cxx

@@ -3073 +3073 @@
   m_deps_builder.clear ();
   m_stamps = true;
-  m_name = "unnamed";
+  m_name = "cmt_unnamed";
 }
 
@@ -3177 +3177 @@
       const Symbol* filter_macro = Symbol::find (package_name + "_header_file_filter");
       if (filter_macro == 0) continue;
+      const cmt_string filter_expr (filter_macro->resolve_macro_value ());
+      if (filter_expr.size () == 0) continue;
 
       const Symbol* stamp_macro = Symbol::find (package_name + "_header_file_stamp");
@@ -3206 +3208 @@
 
       //cerr << "0: adding filter: " << use->get_package_name () << "[" << use->get_index () << "]\n";
-      cmt_regexp* filter = new cmt_regexp (filter_macro->resolve_macro_value ());
+      cmt_regexp* filter = new cmt_regexp (filter_expr);
+      //cmt_regexp* filter = new cmt_regexp (filter_macro->resolve_macro_value ());
       assert (filter != 0);
 
@@ -3222 +3225 @@
               (r + 19) != symbol.name.size () ||
               r == 0) continue;
+          const cmt_string filter_expr (symbol.resolve_macro_value ());
+          if (filter_expr.size () == 0) continue;
 
           cmt_string package_name = symbol.name.substr(0, r);
@@ -3259 +3264 @@
           
           //cerr << "1: adding filter: " << package_name << "\n";
-          cmt_regexp* filter = new cmt_regexp (symbol.resolve_macro_value ());
+          cmt_regexp* filter = new cmt_regexp (filter_expr);
+          //cmt_regexp* filter = new cmt_regexp (symbol.resolve_macro_value ());
           assert (filter != 0);