Changeset 3 for CMT/v1r19/source/cmt_symbol.cxx

Timestamp:

Mar 2, 2005, 5:39:59 PM (19 years ago)

Author:

arnault

Message:

Various improvements - Introduction of CMTPROJECTPATH - see CL251

File:

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

CMT/v1r19/source/cmt_symbol.cxx

@@ -1541 +1541 @@
             case Sh :
               cout << "alias " << name <<
-                  "=\"" << temp <<
-                  "\"; export " << name;
+                  "=\"" << temp << "\"";
               result = 1;
               break;
@@ -1590 +1589 @@
 
 //-------------------------------------------------------------
-cmt_string Symbol::build_macro_value () const
+cmt_string Symbol::build_macro_value (bool display_it) const
 {
   cmt_string temp;
 
-  temp = builder->build (*this);
+  if (display_it)
+    {
+      temp = builder->build_and_display (*this);
+    }
+  else
+    {
+      temp = builder->build (*this);
+    }
 
   return (temp);
@@ -1652 +1658 @@
   ActionType action = Cmt::get_action ();
 
-  cmt_string value = build_macro_value ();
+  cmt_string value = build_macro_value (true);
 
   if ((!Cmt::get_quiet ()) &&
@@ -1754 +1760 @@
 
 //-------------------------------------------------------------
+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*/)
@@ -1760 +1784 @@
   static int level = 0;
 
-  int show_it = 0;
+  bool show_it = false;
 
   cmt_string temp;
@@ -1774 +1798 @@
         {
              // Should not display on recursive calls
-          if (level == 0) show_it = 1;
+          if (level == 0) show_it = m_display_it;
         }
     }
@@ -1941 +1965 @@
   static int level = 0;
 
-  int show_it = 0;
+  bool show_it = false;
 
   cmt_string temp;
@@ -1957 +1981 @@
         {
             // Should not display on recursive calls
-          if (level == 0) show_it = 1;
+          if (level == 0) show_it = m_display_it;
         }
     }
@@ -2276 +2300 @@
   cmt_string previous_temp;
   static const cmt_string empty;
-  int show_it = 0;
+  bool show_it = false;
 
   ActionType action = Cmt::get_action ();
@@ -2285 +2309 @@
         {
              // Should not display on recursive calls
-          if (level == 0) show_it = 1;
+          if (level == 0) show_it = m_display_it;
         }
     }
@@ -2522 +2546 @@
   cmt_string previous_temp;
   static const cmt_string empty;
-  int show_it = 0;
+  bool show_it = false;
 
   ActionType action = Cmt::get_action ();
@@ -2531 +2555 @@
         {
              // Should not display on recursive calls
-          if (level == 0) show_it = 1;
+          if (level == 0) show_it = m_display_it;
         }
     }
@@ -2789 +2813 @@
 }
 
+//-------------------------------------------------------------
+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);
+}
+