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

Timestamp:

Aug 12, 2010, 10:45:31 AM (14 years ago)

Author:

rybkin

Message:

See C.L. 434

File:

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

CMT/HEAD/source/cmt_symbol.cxx

@@ -828 +828 @@
 
   symbol.selected_value = -1;
+  symbol.printed = false;
 
   return (&symbol);
@@ -1490 +1491 @@
   if (Symbols.size () == 0) return;
 
-  for (number = 0; number < Symbol::symbol_number (); number++)
-    {
-      Symbol& symbol = Symbol::symbol (number);
-
-      if ((symbol.type == SymbolSet) ||
-          (symbol.type == SymbolAlias) ||
-          (symbol.type == SymbolSetupScript) ||
-          (symbol.type == SymbolPath))
-        {
-          if (symbol.print (mode))
-            {
-              if (mode == Bat)
-                {
-                  cout << endl;
-                }
-              else
-                {
-                  cout << endl;
-                }
-            }
-        }
+  switch (mode)
+    {
+    case Requirements :
+      for (number = 0; number < Symbol::symbol_number (); number++)
+        {
+          Symbol& symbol = Symbol::symbol (number);
+
+          if ((symbol.type == SymbolSet) ||
+              (symbol.type == SymbolAlias) ||
+              (symbol.type == SymbolSetupScript) ||
+              (symbol.type == SymbolPath) ||
+              (symbol.type == SymbolMacro))
+            {
+              if (symbol.print_macro (mode))
+                {
+                  //              cout << endl;
+                }
+            }
+        }
+      break;
+    default :
+      for (number = 0; number < Symbol::symbol_number (); number++)
+        {
+          Symbol& symbol = Symbol::symbol (number);
+          
+          if ((symbol.type == SymbolSet) ||
+              (symbol.type == SymbolAlias) ||
+              (symbol.type == SymbolSetupScript) ||
+              (symbol.type == SymbolPath))
+            {
+              if (symbol.print (mode))
+                {
+                  if (mode == Bat)
+                    {
+                      cout << endl;
+                    }
+                  else
+                    {
+                      cout << endl;
+                    }
+                }
+            }
+        }
+      break;
     }
 }
@@ -1799 +1823 @@
 
 //-------------------------------------------------------------
+int Symbol::print_macro (PrintMode mode, ostream& out) const
+{
+  if (mode != Requirements || printed) return 0;
+  return builder->print (*this, out);
+}
+
+//-------------------------------------------------------------
 cmt_string Symbol::clean_macro_value () const
 {
@@ -1977 +2008 @@
 
   return (temp);
+}
+
+//-------------------------------------------------------------
+int ValueBuilder::print (const Symbol& symbol, ostream& out)
+{
+  int result (0);
+
+  bool first_definition = true;
+  
+  for (int i = 0; i < symbol.value_lists.size (); i++)
+    {
+      const SymbolValueList& value_list = symbol.value_lists[i];
+
+      if ((value_list.use != 0) &&
+          (value_list.use->discarded)) continue;
+
+      const int selected = value_list.select_first ();
+
+      if (selected < 0) continue;
+
+      SymbolValue& value = value_list.values[selected];
+
+      result += value_list.print (symbol, value, first_definition);
+    }
+
+  return result;
 }
 
@@ -2986 +3043 @@
 
 //-------------------------------------------------------------
+//  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, 
+                            bool& first_definition) const
+{
+  int result (0);
+
+  if (use->get_package_name () == "CMT") return result;
+
+  cmt_string discarded_text;
+  cmt_string define_text;
+  ActionType action = Cmt::get_action ();
+
+  switch (command_type)
+    {
+      //case CommandSet :
+      case CommandSetAppend :
+      case CommandSetPrepend :
+      case CommandSetRemove :
+      case CommandSetRemoveRegexp :
+        //case CommandAlias :
+        //case CommandPath :
+      case CommandPathAppend :
+      case CommandPathPrepend :
+      case CommandPathRemove :
+      case CommandPathRemoveRegexp :
+      case CommandMacroPrepend :
+        //case CommandMacro :
+      case CommandMacroAppend :
+      case CommandMacroRemove :
+      case CommandMacroRemoveRegexp :
+      case CommandMacroRemoveAll :
+      case CommandMacroRemoveAllRegexp :
+        //case CommandAction :
+        if (value.text == "") return result;
+        break;
+    }
+
+  if (discarded) discarded_text = " (discarded by override)";
+  else discarded_text = "";
+
+  if (first_definition) define_text = "defines";
+  else define_text = "overrides";
+
+  cout << "# Package ";
+  if (use != 0)
+    {
+      cout << use->get_package_name () << " " << use->version;
+    }
+
+  switch (command_type)
+    {
+      case CommandSet :
+        cout << " " << define_text << " set " << symbol.name << " as " << endl;
+        //        cout << " " << define_text << " set " << symbol.name << " as ";
+        cout << "set " << symbol.name;
+        first_definition = false;
+        result = 1;
+        break;
+      case CommandSetAppend :
+        cout << " appends to set " << symbol.name << " : " << endl;;
+        //        cout << " appends to set " << symbol.name << " : ";
+        cout << "set_append " << symbol.name;
+        result = 1;
+        break;
+      case CommandSetPrepend :
+        cout << " prepends to set " << symbol.name << " : " << endl;
+        //        cout << " prepends to set " << symbol.name << " : ";
+        cout << "set_prepend " << symbol.name;
+        result = 1;
+        break;
+      case CommandSetRemove :
+        cout << " removes from set " << symbol.name << " : " << endl;
+        //        cout << " removes from set " << symbol.name << " : ";
+        cout << "set_remove " << symbol.name;
+        result = 1;
+        break;
+      case CommandSetRemoveRegexp :
+        cout << " removes RE from set " << symbol.name << " : " << endl;
+        //        cout << " removes RE from set " << symbol.name << " : ";
+        cout << "set_remove_regexp " << symbol.name;
+        result = 1;
+        break;
+      case CommandAlias :
+        cout << " " << define_text << " alias " << symbol.name << endl;
+        //        cout << " " << define_text << " alias " << symbol.name << " as ";
+        cout << "alias " << symbol.name;
+        first_definition = false;
+        result = 1;
+        break;
+      case CommandPath :
+        cout << " " << define_text << " path " << symbol.name << endl;
+        //        cout << " " << define_text << " path " << symbol.name << " as ";
+        cout << "path " << symbol.name;
+        first_definition = false;
+        result = 1;
+        break;
+      case CommandPathAppend :
+        cout << " appends to path " << symbol.name << endl;
+        //        cout << " appends to path " << symbol.name << " : ";
+        cout << "path_append " << symbol.name;
+        result = 1;
+        break;
+      case CommandPathPrepend :
+        cout << " prepends to path " << symbol.name << " : " << endl;
+        //        cout << " prepends to path " << symbol.name << " : ";
+        cout << "path_prepend " << symbol.name;
+        result = 1;
+        break;
+      case CommandPathRemove :
+        cout << " removes from path " << symbol.name << " : " << endl;
+        //        cout << " removes from path " << symbol.name << " : ";
+        cout << "path_remove " << symbol.name;
+        result = 1;
+        break;
+      case CommandPathRemoveRegexp :
+        cout << " removes RE from path " << symbol.name << " : " << endl;
+        //        cout << " removes RE from path " << symbol.name << " : ";
+        cout << "path_remove_regexp " << symbol.name;
+        result = 1;
+        break;
+      case CommandMacro :
+        cout << " " << define_text << " macro " << symbol.name << " as " << endl;
+        //        cout << " " << define_text << " macro " << symbol.name << " as ";
+        cout << "macro " << symbol.name;
+        result = 1;
+        break;
+      case CommandMacroPrepend :
+        cout << " prepends to macro " << symbol.name << " : " << endl;
+        //        cout << " prepends to macro " << symbol.name << " : ";
+        cout << "macro_prepend " << symbol.name;
+        result = 1;
+        break;
+      case CommandMacroAppend :
+        cout << " appends to macro " << symbol.name << " : " << endl;
+        //        cout << " appends to macro " << symbol.name << " : ";
+        cout << "macro_append " << symbol.name;
+        result = 1;
+        break;
+      case CommandMacroRemove :
+        cout << " remove from macro " << symbol.name << " : " << endl;
+        //        cout << " remove from macro " << symbol.name << " : ";
+        cout << "macro_remove " << symbol.name;
+        result = 1;
+        break;
+      case CommandMacroRemoveRegexp :
+        cout << " remove RE from macro " << symbol.name << " : " << endl;
+        //        cout << " remove RE from macro " << symbol.name << " : ";
+        cout << "macro_remove_regexp " << symbol.name;
+        result = 1;
+        break;
+      case CommandMacroRemoveAll :
+        cout << " remove all from macro " << symbol.name << " : " << endl;
+        //        cout << " remove all from macro " << symbol.name << " : ";
+        cout << "macro_remove_all " << symbol.name;
+        result = 1;
+        break;
+      case CommandMacroRemoveAllRegexp :
+        cout << " remove all RE from macro " << symbol.name << " : " << endl;
+        //        cout << " remove all RE from macro " << symbol.name << " : ";
+        cout << "macro_remove_all_regexp " << symbol.name;
+        result = 1;
+        break;
+      case CommandSetupScript :
+        cout << " " << define_text << " setup script " << symbol.name << endl;
+        //       cout << " " << define_text << " action " << symbol.name << " as ";
+        cout << "setup_script" /* << symbol.name */;
+        first_definition = false;
+        result = 1;
+        break;
+        /*
+      case CommandAction :
+        cout << " " << define_text << " action " << symbol.name << " as ";
+        first_definition = false;
+        break;
+        */
+    }
+
+  cout << " " << quote (value.text, " \t");
+  //  cout << "'" << value.text << "'";
+          
+  /*
+  Tag* selected_tag = value.tag;
+          
+  if ((selected_tag == 0) ||
+      (selected_tag == Tag::get_default ()))
+    {
+      cout << " for default tag";
+    }
+  else
+    {
+      cout << " for tag '" << selected_tag->get_name () << "'";
+    }
+  */
+
+  cout << endl;
+  //  cout << discarded_text << endl;
+  return result;
+}
+
+//-------------------------------------------------------------
 bool Symbol::check_tag_used (Tag* tag)
 {