Changeset 283 for CMT

Timestamp:

Oct 24, 2006, 3:03:22 PM (18 years ago)

Author:

arnault

Message:

New keyword cmtpath_pattern_revert - See CL 318

Location:

CMT/HEAD/source

Files:

• cmt_cmtpath_pattern.cxx (modified) (5 diffs)
• cmt_cmtpath_pattern.h (modified) (2 diffs)
• cmt_parser.cxx (modified) (1 diff)
• cmt_syntax.cxx (modified) (2 diffs)

CMT/HEAD/source/cmt_cmtpath_pattern.cxx

@@ -15 +15 @@
 //----------------------------------------------------------
 
-void CmtPathPattern::action (const CmtSystem::cmt_string_vector& words, Use* use)
+void CmtPathPattern::action (const CmtSystem::cmt_string_vector& words, Use* use, bool revert)
 {
   if (words.size () < 1) return;
@@ -30 +30 @@
     //
 
-  add (words, use);
+  add (words, use, revert);
 
   if (Cmt::get_debug ())
@@ -38 +38 @@
 }
 
-void CmtPathPattern::add (const CmtSystem::cmt_string_vector& words, Use* use)
+void CmtPathPattern::add (const CmtSystem::cmt_string_vector& words, Use* use, bool revert)
 {
   static CmtPathPatternVector& CmtPathPatterns = patterns ();
@@ -47 +47 @@
 
   p.use  = use;
+  p.revert  = revert;
 
   int first_word = 1;
@@ -252 +253 @@
       CmtPathPatternProjectAction pa (*this, current_use);
 
-      Project::reverse_broadcast (pa);
+      if (revert)
+        {
+          Project::broadcast (pa);
+        }
+      else
+        {
+          Project::reverse_broadcast (pa);
+        }
     }
 }

CMT/HEAD/source/cmt_cmtpath_pattern.h

@@ -16 +16 @@
   typedef cmt_vector<CmtPathPattern*> CmtPathPatternPtrVector;
 
-  static void action (const CmtSystem::cmt_string_vector& words, Use* use);
+  static void action (const CmtSystem::cmt_string_vector& words, Use* use, bool revert = false);
 
-  static void add (const CmtSystem::cmt_string_vector& words, Use* use);
+  static void add (const CmtSystem::cmt_string_vector& words, Use* use, bool revert);
 
   static int pattern_number ();
@@ -38 +38 @@
   cmt_string line;
   Use* use;
+  bool revert;
 };
 

CMT/HEAD/source/cmt_parser.cxx

@@ -6991 +6991 @@
             buffer += "\" ";
           }
-        
+
         for (int include_number = 0;
              include_number < use.includes.size ();

CMT/HEAD/source/cmt_syntax.cxx

@@ -289 +289 @@
   {}
 
+};
+
+class KwdCmtPathPatternRevert : public Kwd
+{
+public:
+  void action (const CmtSystem::cmt_string_vector& words,
+               Use* use,
+               const cmt_string& /*file_name*/,
+               int /*line_number*/)
+  {
+    CmtPathPattern::action (words, use, true);
+  }
+
+  void action (const CmtSystem::cmt_string_vector& words,
+                  Project* project,
+                  const cmt_string& file_name,
+                  int line_number)
+  {}
 };
 
@@ -1375 +1393 @@
   m_keywords.add ("cleanup_script", new KwdCleanupScript ());
   m_keywords.add ("cmtpath_pattern", new KwdCmtPathPattern ());
+  m_keywords.add ("cmtpath_pattern_revert", new KwdCmtPathPatternRevert ());
   m_keywords.add ("document", new KwdDocument ());
   m_keywords.add ("end_private", new KwdEndPrivate ());