Changeset 546 for CMT

Timestamp:

Jul 2, 2010, 11:24:30 AM (14 years ago)

Author:

rybkin

Message:

See C.L. 431

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt_tag.cxx (modified) (6 diffs)
• source/cmt_tag.h (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2010-07-02    <rybkin@lal.in2p3.fr> 431
+
+        * source/cmt_tag.h: In class Tag, introduce member m_ref_uses to hold uses
+        which by means of tag statement associate tag(s) with this tag and member
+        function add_ref_use
+        * source/cmt_tag.cxx: Implement function add_ref_use and make its use in
+        function show_definition to show list of packages which imply tags for
+        particular tag (previously, all tags were attributed to last package from
+        list)
+        
 2010-07-02    <rybkin@lal.in2p3.fr> 430
 

CMT/HEAD/source/cmt_tag.cxx

@@ -168 +168 @@
   //{
 
-  tag->m_set_use = use;
+  tag->add_ref_use (use);
+  //  tag->m_set_use = use;
 
   //}
@@ -618 +619 @@
   m_def_use = other.m_def_use;
   m_set_use = other.m_set_use;
+  m_ref_uses = other.m_ref_uses;
   m_priority = other.m_priority;
 }
@@ -634 +636 @@
   m_def_use = other.m_def_use;
   m_set_use = other.m_set_use;
+  m_ref_uses = other.m_ref_uses;
   m_priority = other.m_priority;
 
@@ -653 +656 @@
   m_def_use = 0;
   m_set_use = 0;
+  m_ref_uses.clear ();
   m_context = "";
 
@@ -695 +699 @@
 
   m_tag_excludes.push_back (ref);
+}
+
+/*----------------------------------------------------------*/
+void Tag::add_ref_use (Use* use)
+{
+  if (use == 0) return;
+
+  for (int number = 0; number < m_ref_uses.size (); number++)
+    {
+      Use* u = m_ref_uses[number];
+      if (u == use) return;
+    }
+
+  m_ref_uses.push_back (use);
 }
 
@@ -737 +755 @@
           int number;
           
+          if (m_ref_uses.size () != 0)
+            {
+              cout << " package [";
+              for (number = 0; number < m_ref_uses.size (); number++)
+                {
+                  Use* use = m_ref_uses[number];
+                  if (number > 0) cout << " ";
+                  cout << use->get_package_name ();
+                }
+              cout << "]";
+            }
+          /*
           if (m_set_use != 0)
             {
               cout << " package " << m_set_use->get_package_name ();
             }
+          */
           
           cout << " implies [";

CMT/HEAD/source/cmt_tag.h

@@ -49 +49 @@
   void add_tag_ref (Tag* ref);
   void add_tag_exclude (Tag* ref);
+  void add_ref_use (Use* use);
   void unmark ();
   void mark ();
@@ -70 +71 @@
   Use* m_def_use;
   Use* m_set_use;
+  Use::UsePtrVector m_ref_uses;
   int m_priority;
   ScopeType scope;