Changes in CMT/v1r19/source/cmt_symbol.cxx [3:1]

File:

• CMT/v1r19/source/cmt_symbol.cxx (modified) (13 diffs)

CMT/v1r19/source/cmt_symbol.cxx

@@ -1541 +1541 @@
             case Sh :
               cout << "alias " << name <<
-                  "=\"" << temp << "\"";
+                  "=\"" << temp <<
+                  "\"; export " << name;
               result = 1;
               break;
@@ -1589 +1590 @@
 
 //-------------------------------------------------------------
-cmt_string Symbol::build_macro_value (bool display_it) const
+cmt_string Symbol::build_macro_value () const
 {
   cmt_string temp;
 
-  if (display_it)
-    {
-      temp = builder->build_and_display (*this);
-    }
-  else
-    {
-      temp = builder->build (*this);
-    }
+  temp = builder->build (*this);
 
   return (temp);
@@ -1658 +1652 @@
   ActionType action = Cmt::get_action ();
 
-  cmt_string value = build_macro_value (true);
+  cmt_string value = build_macro_value ();
 
   if ((!Cmt::get_quiet ()) &&
@@ -1760 +1754 @@
 
 //-------------------------------------------------------------
-ValueBuilder::ValueBuilder ()
-{
-  m_display_it = false;
-}
-
-//-------------------------------------------------------------
-const cmt_string ValueBuilder::build_and_display (const Symbol& symbol)
-{
-  cmt_string temp;
-
-  m_display_it = true;
-  temp = build (symbol);
-  m_display_it = false;
-
-  return (temp);
-}
-
-//-------------------------------------------------------------
 const cmt_string SetBuilder::build (const Symbol& symbol,
                                     const cmt_string& /*tag_name*/)
@@ -1784 +1760 @@
   static int level = 0;
 
-  bool show_it = false;
+  int show_it = 0;
 
   cmt_string temp;
@@ -1798 +1774 @@
         {
              // Should not display on recursive calls
-          if (level == 0) show_it = m_display_it;
+          if (level == 0) show_it = 1;
         }
     }
@@ -1965 +1941 @@
   static int level = 0;
 
-  bool show_it = false;
+  int show_it = 0;
 
   cmt_string temp;
@@ -1981 +1957 @@
         {
             // Should not display on recursive calls
-          if (level == 0) show_it = m_display_it;
+          if (level == 0) show_it = 1;
         }
     }
@@ -2300 +2276 @@
   cmt_string previous_temp;
   static const cmt_string empty;
-  bool show_it = false;
+  int show_it = 0;
 
   ActionType action = Cmt::get_action ();
@@ -2309 +2285 @@
         {
              // Should not display on recursive calls
-          if (level == 0) show_it = m_display_it;
+          if (level == 0) show_it = 1;
         }
     }
@@ -2546 +2522 @@
   cmt_string previous_temp;
   static const cmt_string empty;
-  bool show_it = false;
+  int show_it = 0;
 
   ActionType action = Cmt::get_action ();
@@ -2555 +2531 @@
         {
              // Should not display on recursive calls
-          if (level == 0) show_it = m_display_it;
+          if (level == 0) show_it = 1;
         }
     }
@@ -2813 +2789 @@
 }
 
-//-------------------------------------------------------------
-bool Symbol::check_tag_used (Tag* tag)
-{
-  if (tag == 0) return (false);
-
-  static SymbolVector& Symbols = symbols ();
-
-  if (Symbols.size () == 0) 
-    {
-      return (false);
-    }
-
-  for (int number = 0; number < Symbol::symbol_number (); number++)
-    {
-      Symbol& symbol = Symbol::symbol (number);
-
-      for (int i = 0; i < symbol.value_lists.size (); i++)
-        {
-          const SymbolValueList& value_list = symbol.value_lists[i];
-
-          for (int j = 0; j < value_list.values.size (); j++)
-            {
-              const SymbolValue& value = value_list.values[j];
-              Tag* t = value.tag;
-
-              if (t != 0)
-                {
-                  if (t->use_operand (tag)) return (true);
-                }
-            }
-        }
-    }
-
-  return (false);
-}
-