Changeset 653 for CMT/HEAD/source/cmt_parser.cxx

Timestamp:

Nov 7, 2013, 4:04:42 PM (11 years ago)

Author:

rybkin

Message:

See C.L. 512

File:

• CMT/HEAD/source/cmt_parser.cxx (modified) (7 diffs)

CMT/HEAD/source/cmt_parser.cxx

@@ -49 +49 @@
 {
   clear ();
-
-  cmt_string tags = CmtSystem::getenv ("CMTEXTRATAGS");
-  CmtSystem::cmt_string_vector words;
-  CmtSystem::split (tags, " \t,", words);
-  for (int i = 0; i < words.size (); i++)
-    {
-      bool has (false);
-      for (int j = 0; j < m_extra_tags.size (); j++)
-        {
-          if (m_extra_tags[j] == words[i])
-            {
-              has = true;
-              break;
-            }
-        }
-      if (!has)
-        m_extra_tags.push_back (words[i]);
-    }
-}
-
+}
+
+//----------------------------------------------------------
 CmtContext::~CmtContext ()
 {
 }
 
+//----------------------------------------------------------
 void CmtContext::clear ()
 {
@@ -126 +110 @@
   m_autoconfigure_cmtpath = false;
 }
-
+//----------------------------------------------------------
+
+int CmtContext::initialize ()
+{
+  int errors (0);
+
+  cmt_string tags = CmtSystem::getenv ("CMTEXTRATAGS");
+  CmtSystem::cmt_string_vector words;
+  CmtSystem::split (tags, " \t,", words);
+  for (int i = 0; i < words.size (); i++)
+    {
+      bool has (false);
+      for (int j = 0; j < m_extra_tags.size (); j++)
+        {
+          if (m_extra_tags[j] == words[i])
+            {
+              has = true;
+              break;
+            }
+        }
+      if (!has)
+        m_extra_tags.push_back (words[i]);
+    }
+
+  return - errors;
+}
 //----------------------------------------------------------
 
@@ -550 +559 @@
   log << "configure_default_path" << log_endl;
   configure_default_path ();
+
+  log << "restore_all_tags" << log_endl;
+  restore_all_tags (0);
   log << "configure_version_tag" << log_endl;
   configure_version_tag ();
@@ -5486 +5498 @@
 {
   return (Me.m_current_target);
+}
+
+const CmtSystem::cmt_string_vector& Cmt::get_tags_remove ()
+{
+  return (Me.m_tags_remove);
 }
 
@@ -6747 +6764 @@
 int Cmt::parser (int argc, char* argv[])
 {
+  // save CMTFLAGS
+  cmt_string cmtflags (get_cmt_flags ());
+
+  clear ();
+  Me.initialize ();
+
   ArgParser ap (Me);
   
@@ -6759 +6782 @@
     }
 
-  // save CMTFLAGS
-  cmt_string cmtflags (get_cmt_flags ());
-
-  clear ();
+  //  clear ();
 
   //  Me.clear ();
@@ -6777 +6797 @@
     default:
       configure (ap);
-      restore_all_tags (0);
+      //restore_all_tags (0);
       break;
     }