Changeset 659 for CMT/HEAD

Timestamp:

Dec 11, 2013, 10:48:59 AM (10 years ago)

Author:

rybkin

Message:

See C.L. 518

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt.h (modified) (3 diffs)
• source/cmt_commands.cxx (modified) (3 diffs)
• source/cmt_commands.h (modified) (1 diff)
• source/cmt_parser.cxx (modified) (7 diffs)
• source/cmt_symbol.cxx (modified) (9 diffs)
• source/cmt_symbol.h (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2013-12-11    <rybkin@lal.in2p3.fr> 518
+
+        * source/cmt_commands.cxx: In class ArgParser, functions
+        option(_no)_path_strip renamed option(_no)_strip_path, command line options
+        -(no_)path_strip renamed -(no_)strip_path
+        * source/cmt_commands.h: idem
+        * source/cmt_symbol.h: In class class Symbol, function set_path_strip
+        renamed set_strip_path
+        * source/cmt_symbol.cxx: In class PathBuilder, functions get/set_path_strip
+        renamed get/set_strip_path, member m_path_strip renamed m_strip_path
+        * source/cmt.h: In class CmtContext, member m_path_strip renamed
+        m_strip_path, in class Cmt, function get_path_strip renamed get_strip_path
+        * source/cmt_parser.cxx: In class Cmt function do_setup, use
+        -no_strip_path, -strip_path option names, function get_strip_path, class
+        Symbol function set_strip_path
+        
 2013-12-06    <rybkin@lal.in2p3.fr> 517
 

CMT/HEAD/source/cmt.h

@@ -78 +78 @@
   bool m_env_access;
   PrintMode m_print_mode;
-  bool m_path_strip;
+  bool m_strip_path;
 
 private:
@@ -313 +313 @@
   static inline const PrintMode& get_print_mode ();
   static inline void set_print_mode (const PrintMode& mode);
-  static inline const bool& get_path_strip ();
+  static inline const bool& get_strip_path ();
 
 private:
@@ -458 +458 @@
 }
 
-inline const bool& Cmt::get_path_strip ()
-{
-  return m_cmt_context.m_path_strip;
+inline const bool& Cmt::get_strip_path ()
+{
+  return m_cmt_context.m_strip_path;
 }
 //----------------------------------------------------------

CMT/HEAD/source/cmt_commands.cxx

@@ -256 +256 @@
   pv.push_back (&ArgParser::option_no_cleanup); i++;
 
-  parsers.add ("-no_path_s", i);
-  parsers.add ("-no_path_st", i);
-  parsers.add ("-no_path_str", i);
-  parsers.add ("-no_path_stri", i);
-  parsers.add ("-no_path_strip", i);
-  pv.push_back (&ArgParser::option_no_path_strip); i++;
+  parsers.add ("-no_strip_p", i);
+  parsers.add ("-no_strip_pa", i);
+  parsers.add ("-no_strip_pat", i);
+  parsers.add ("-no_strip_path", i);
+  pv.push_back (&ArgParser::option_no_strip_path); i++;
 
   parsers.add ("-pac", i);
@@ -271 +270 @@
   pv.push_back (&ArgParser::option_path); i++;
 
-  parsers.add ("-path_s", i);
-  parsers.add ("-path_st", i);
-  parsers.add ("-path_str", i);
-  parsers.add ("-path_stri", i);
-  parsers.add ("-path_strip", i);
-  pv.push_back (&ArgParser::option_path_strip); i++;
+  parsers.add ("-strip_p", i);
+  parsers.add ("-strip_pa", i);
+  parsers.add ("-strip_pat", i);
+  parsers.add ("-strip_path", i);
+  pv.push_back (&ArgParser::option_strip_path); i++;
 
   parsers.add ("-pr", i);
@@ -2056 +2054 @@
 }
 
-void ArgParser::option_no_path_strip ()
-{
-  cmt.m_path_strip = false;
-  if (!Cmt::add_cmt_flag ("-no_path_strip"))
-    CmtMessage::error ("Cannot add flag `-no_path_strip'");
-}
-
-void ArgParser::option_path_strip ()
-{
-  cmt.m_path_strip = true;
-  if (!Cmt::add_cmt_flag ("-path_strip"))
-    CmtMessage::error ("Cannot add flag `-path_strip'");
+void ArgParser::option_no_strip_path ()
+{
+  cmt.m_strip_path = false;
+  if (!Cmt::add_cmt_flag ("-no_strip_path"))
+    CmtMessage::error ("Cannot add flag `-no_strip_path'");
+}
+
+void ArgParser::option_strip_path ()
+{
+  cmt.m_strip_path = true;
+  if (!Cmt::add_cmt_flag ("-strip_path"))
+    CmtMessage::error ("Cannot add flag `-strip_path'");
 }
 

CMT/HEAD/source/cmt_commands.h

@@ -88 +88 @@
   void option_without_version_directory ();
   void option_no_cleanup ();
-  void option_no_path_strip ();
-  void option_path_strip ();
+  void option_no_strip_path ();
+  void option_strip_path ();
   void option_private ();
   void option_public ();

CMT/HEAD/source/cmt_parser.cxx

@@ -113 +113 @@
   m_env_access = true;
   m_print_mode = Csh;
-  m_path_strip = false;
+  m_strip_path = false;
 }
 //----------------------------------------------------------
@@ -4611 +4611 @@
   bool reset (false);
   CmtSystem::cmt_string_vector flags;
-  cmt_string path_strip_flag;
-  bool path_strip (false);
-
-  bool strip_saved (get_path_strip ());
+  cmt_string strip_path_flag;
+  bool strip_path (false);
+
+  bool strip_saved (get_strip_path ());
   bool access_saved (Cmt::get_env_access ());
 
@@ -4624 +4624 @@
       for (int i = 0; i < flags.size (); i++)
         {
-          if (flags[i] == "-no_path_strip")
-            path_strip_flag = "-no_path_strip";
-          else if (flags[i] == "-path_strip")
-            path_strip_flag = "-path_strip";
-        }
-      if (path_strip_flag != "-no_path_strip" &&
-          !get_path_strip ())
-        reset = Symbol::set_path_strip (true);
-
-      if (get_path_strip () || reset)
-        path_strip = true;
+          if (flags[i] == "-no_strip_path")
+            strip_path_flag = "-no_strip_path";
+          else if (flags[i] == "-strip_path")
+            strip_path_flag = "-strip_path";
+        }
+      if (strip_path_flag != "-no_strip_path" &&
+          !get_strip_path ())
+        reset = Symbol::set_strip_path (true);
+
+      if (get_strip_path () || reset)
+        strip_path = true;
       else
-        path_strip = false;
+        strip_path = false;
 
       Cmt::set_env_access (false);
@@ -4643 +4643 @@
 
       if (CmtError::get_last_error_code () == CmtError::warning &&
-          (get_path_strip () || reset))
-        {
-          reset = Symbol::set_path_strip (false);
+          (get_strip_path () || reset))
+        {
+          reset = Symbol::set_strip_path (false);
           if (reset)
             {
-              path_strip = false;
+              strip_path = false;
 
               CmtError::print ();
@@ -4665 +4665 @@
         }
 
-      if (reset) Symbol::set_path_strip (strip_saved);
+      if (reset) Symbol::set_strip_path (strip_saved);
       Cmt::set_env_access (access_saved);
 
@@ -4672 +4672 @@
         " -without_cmt"
         " -without_projects"
-        //" -path_strip"
+        //" -strip_path"
         ;
       for (int i = 0; i < flags.size (); i++)
@@ -4685 +4685 @@
             oh << " -without_projects";
           /*
-          else if (flags[i] == "-no_path_strip")
-            oh << " -path_strip";
-          else if (flags[i] == "-path_strip")
-            oh << " -no_path_strip";
+          else if (flags[i] == "-no_strip_path")
+            oh << " -strip_path";
+          else if (flags[i] == "-strip_path")
+            oh << " -no_strip_path";
           */
-          else if (flags[i] == "-no_path_strip" ||
-                   flags[i] == "-path_strip")
+          else if (flags[i] == "-no_strip_path" ||
+                   flags[i] == "-strip_path")
             continue;
           else
             oh << " " << flags[i]; 
         }
-      //if (reset) oh << " -path_strip";
-      if (path_strip)
-        oh << " -no_path_strip";
+      //if (reset) oh << " -strip_path";
+      if (strip_path)
+        oh << " -no_strip_path";
       else
-        oh << " -path_strip";
+        oh << " -strip_path";
       oh << endl;
 

CMT/HEAD/source/cmt_symbol.cxx

@@ -50 +50 @@
                           CmtSystem::cmt_string_vector& value,
                           const cmt_string& tag_name = "") const;
-  inline const bool& get_path_strip () const;
-  inline void set_path_strip (const bool& path_strip);
+  inline const bool& get_strip_path () const;
+  inline void set_strip_path (const bool& strip_path);
 
   PathBuilder ();
-  PathBuilder (bool path_strip);
+  PathBuilder (bool strip_path);
 
 private:
-  bool m_path_strip;
+  bool m_strip_path;
 };
 //-------------------------------------------------------------
@@ -754 +754 @@
 {
   static SetBuilder Set;
-  static PathBuilder Path (Cmt::get_path_strip ());
+  static PathBuilder Path (Cmt::get_strip_path ());
   //static PathBuilder Path;
   static MacroBuilder Macro;
@@ -1255 +1255 @@
 
 //-------------------------------------------------------------
-bool Symbol::set_path_strip (const bool& path_strip)
+bool Symbol::set_strip_path (const bool& strip_path)
 {
   // searching for a path symbol
@@ -1264 +1264 @@
       if (symbol.type == Symbol::SymbolPath)
         {
-          static_cast<PathBuilder*> (symbol.builder)->set_path_strip (path_strip);
+          static_cast<PathBuilder*> (symbol.builder)->set_strip_path (strip_path);
           return true;
         }
@@ -2570 +2570 @@
 //-------------------------------------------------------------
 PathBuilder::PathBuilder ()
-  : m_path_strip (false)
-{
-}
-
-//-------------------------------------------------------------
-PathBuilder::PathBuilder (bool path_strip)
+  : m_strip_path (false)
+{
+}
+
+//-------------------------------------------------------------
+PathBuilder::PathBuilder (bool strip_path)
 {
   PathBuilder ();
-  m_path_strip = path_strip;
+  m_strip_path = strip_path;
 }
 
@@ -3033 +3033 @@
       if (!exists)
         {
-          if (m_path_strip)
+          if (m_strip_path)
             {
               if (!reg.match (v))
@@ -3084 +3084 @@
 
 //-------------------------------------------------------------
-inline const bool& PathBuilder::get_path_strip () const
-{
-  return m_path_strip;
-}
-
-//-------------------------------------------------------------
-inline void PathBuilder::set_path_strip (const bool& path_strip)
-{
-  m_path_strip = path_strip;
+inline const bool& PathBuilder::get_strip_path () const
+{
+  return m_strip_path;
+}
+
+//-------------------------------------------------------------
+inline void PathBuilder::set_strip_path (const bool& strip_path)
+{
+  m_strip_path = strip_path;
 }
 
@@ -3712 +3712 @@
         if (!pb)
           pb = static_cast<PathBuilder*> (symbol.builder);
-        if (pb->get_path_strip ())
+        if (pb->get_strip_path ())
           {
             /*
@@ -3784 +3784 @@
               }
           }
-        else // (!pb->get_path_strip ())
+        else // (!pb->get_strip_path ())
           {
             if (CmtError::has_pending_error ())

CMT/HEAD/source/cmt_symbol.h

@@ -109 +109 @@
 
   static bool get_inhibit_display ();
-  static bool set_path_strip (const bool& path_strip);
+  static bool set_strip_path (const bool& strip_path);
 
 public: