Changeset 612 for CMT/HEAD/source/cmt_parser.cxx

Timestamp:

Apr 26, 2012, 9:51:00 AM (12 years ago)

Author:

rybkin

Message:

See C.L. 487

File:

• CMT/HEAD/source/cmt_parser.cxx (modified) (12 diffs)

CMT/HEAD/source/cmt_parser.cxx

@@ -4353 +4353 @@
 void Cmt::do_show_action (const ArgParser& ap)
 {
-  cmt_string target;
-
-  if (ap.arguments.size () > 0) target = ap.arguments[0];
-
-  Symbol* symbol;
-
-  set_standard_macros ();
-
-  symbol = Symbol::find (target);
-
-  if (symbol == 0) 
-    {
-      cmt_string t (target);
-      t += " is not defined";
-
-      CmtError::set (CmtError::symbol_not_found, t);
-
-      return;
-    }
-  else
-    {
-      cmt_string t = target;
-      t += " is a ";
-
-      if ((Me.m_action == action_show_action) ||
-          (Me.m_action == action_show_action_value))
-        {
-          if (symbol->type != Symbol::SymbolAction)
-            {
-              if (symbol->type == Symbol::SymbolMacro)
-                {
-                  t += "macro";
-                }
-              else if (symbol->type == Symbol::SymbolSet)
-                {
-                  t += "set";
-                }
-              else if (symbol->type == Symbol::SymbolPath)
-                {
-                  t += "path";
-                }
-              else if (symbol->type == Symbol::SymbolAlias)
-                {
-                  t += "alias";
-                }
-
-              CmtError::set (CmtError::wrong_symbol_type, t);
-            }
-        }
-    }
-
-  if (symbol->value_lists.size () < 1) return;
-
-  symbol->show_macro (ap.mode);
+  do_show_macro (ap);
 }
 
@@ -4431 +4378 @@
 //----------------------------------------------------------
 void Cmt::do_show_actions (const ArgParser& ap)
+{
+  if (ap.arguments.size () > 0)
+    {
+      const cmt_string& pattern = ap.arguments[0];
+      print_macros (ap.mode, pattern);
+    }
+  else
+    {
+      print_macros (ap.mode);
+    }
+}
+
+//----------------------------------------------------------
+void Cmt::do_show_alias (const ArgParser& ap)
+{
+  do_show_macro (ap);
+}
+
+//----------------------------------------------------------
+void Cmt::do_show_alias_names (const ArgParser& ap)
+{
+  if (ap.arguments.size () > 0)
+    {
+      const cmt_string& pattern = ap.arguments[0];
+      print_symbol_names (ap.mode, pattern);
+    }
+  else
+    {
+      print_symbol_names (ap.mode);
+    }
+}
+
+//----------------------------------------------------------
+void Cmt::do_show_alias_value (const ArgParser& ap)
+{
+  do_show_macro (ap);
+}
+
+//----------------------------------------------------------
+void Cmt::do_show_aliases (const ArgParser& ap)
 {
   if (ap.arguments.size () > 0)
@@ -4717 +4704 @@
     {
       cmt_string t = target;
-      t += " is a ";
+      t += " is ";
 
       if ((Me.m_action == action_show_macro) ||
@@ -4759 +4746 @@
             }
         }
+      else if (
+               ((Me.m_action == action_show_action ||
+                 Me.m_action == action_show_action_value) &&
+                symbol->type != Symbol::SymbolAction)
+               ||
+               ((Me.m_action == action_show_alias ||
+                 Me.m_action == action_show_alias_value) &&
+                symbol->type != Symbol::SymbolAlias)
+               )
+        {
+          switch (symbol->type)
+            {
+            case Symbol::SymbolUndefined:
+              t += "undefined";
+              break;
+            case Symbol::SymbolAction:
+              t += "action";
+              break;
+            case Symbol::SymbolAlias:
+              t += "alias";
+              break;
+            case Symbol::SymbolMacro:
+              t += "macro";
+              break;
+            case Symbol::SymbolSetupScript:
+              t += "setup_script";
+              break;
+            case Symbol::SymbolCleanupScript:
+              t += "cleanup_script";
+              break;
+            case Symbol::SymbolSet:
+              t += "set";
+              break;
+            case Symbol::SymbolPath:
+              t += "path";
+              break;
+            default:
+              t += "unknown";
+              break;
+            }
+          
+          CmtError::set (CmtError::wrong_symbol_type, t);
+        }
     }
 
@@ -6605 +6635 @@
     case action_show_action_value :
     case action_show_actions :
+    case action_show_alias :
+    case action_show_alias_names :
+    case action_show_alias_value :
+    case action_show_aliases :
     case action_show_all_tags :
     case action_show_applied_patterns :
@@ -6724 +6758 @@
     case action_show_action_value :
     case action_show_actions :
+    case action_show_alias :
+    case action_show_alias_names :
+    case action_show_alias_value :
+    case action_show_aliases :
     case action_show_all_tags :
     case action_show_applied_patterns :
@@ -6832 +6870 @@
     case action_show_action_value :
     case action_show_actions :
+    case action_show_alias :
+    case action_show_alias_names :
+    case action_show_alias_value :
+    case action_show_aliases :
     case action_show_all_tags :
     case action_show_applied_patterns :
@@ -6980 +7022 @@
           // case action_show_action_value :
           // case action_show_actions :
+          // case action_show_alias :
+          // case action_show_alias_names :
+          // case action_show_alias_value :
+          // case action_show_aliases :
           // case action_show_all_tags :
           // case action_show_applied_patterns :
@@ -7193 +7239 @@
           do_show_actions (ap);
           break;
+        case action_show_alias :
+          do_show_alias (ap);
+          break;
+        case action_show_alias_names :
+          do_show_alias_names (ap);
+          break;
+        case action_show_alias_value :
+          do_show_alias_value (ap);
+          break;
+        case action_show_aliases :
+          do_show_aliases (ap);
+          break;
         case action_show_all_tags :
           do_show_all_tags (ap);
@@ -7760 +7818 @@
       else if (Me.m_action == action_show_set_names)
         {
-          // Exclude macros.
+          // Exclude macros, actions.
           if ((symbol.type == Symbol::SymbolMacro) ||
               (symbol.type == Symbol::SymbolAction)) continue;
@@ -7766 +7824 @@
       else if (Me.m_action == action_show_action_names)
         {
-          // Exclude macros.
+          // Only keep actions.
           if (symbol.type != Symbol::SymbolAction) continue;
+        }
+      else if (Me.m_action == action_show_alias_names)
+        {
+          // Only keep aliases.
+          if (symbol.type != Symbol::SymbolAlias) continue;
         }
 
@@ -7827 +7890 @@
         {
           if (symbol.type != Symbol::SymbolAction) continue;
+        }
+      else if (Me.m_action == action_show_aliases)
+        {
+          if (symbol.type != Symbol::SymbolAlias) continue;
         }