Changeset 653 for CMT

Timestamp:

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

Author:

rybkin

Message:

See C.L. 512

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• source/cmt.h (modified) (2 diffs)
• source/cmt_parser.cxx (modified) (7 diffs)
• source/cmt_syntax.cxx (modified) (4 diffs)
• source/cmt_tag.cxx (modified) (1 diff)

CMT/HEAD/ChangeLog

@@ +1 @@
+2013-11-07    <rybkin@lal.in2p3.fr> 512
+
+        * source/cmt_tag.cxx: In class Tag mark function, do not activate tag if
+        in list of tags to remove, making -tag_remove=<tag-list> option functional
+        on any tags (rather than only those specified on the command line or in
+        CMTEXTRATAGS environment variable)
+        * source/cmt_syntax.cxx: In classes KwdBuildStrategy, KwdSetupStrategy,
+        KwdStructureStrategy action project function, make error description
+        detailed, in class SyntaxParser do_parse_words project function, print
+        error message in case of syntax error encountered in value
+        * source/cmt_parser.cxx: In class CmtContext, factor out processing of
+        CMTEXTRATAGS environment variable value into separate initialize function,
+        in class Cmt, move restore_all_tags call into configure function before all
+        system tags handling to make all initially known tags available while
+        reading project files, implement get_tags_remove function, in parser
+        function initialise static xCmtContext instance at very beginning
+        * source/cmt.h: In class Cmt, declare get_tags_remove function
+        
 2013-11-05    <rybkin@lal.in2p3.fr> 511
 

CMT/HEAD/source/cmt.h

@@ -24 +24 @@
 
   void clear ();
+  int initialize ();
 
   ActionType m_action;
@@ -233 +234 @@
   static const cmt_string& get_current_version ();
   static const cmt_string& get_current_target ();
+  static const CmtSystem::cmt_string_vector& get_tags_remove ();
   static bool get_debug ();
   static bool get_disable_warnings ();  

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;
     }

CMT/HEAD/source/cmt_syntax.cxx

@@ -290 +290 @@
           {
             in_error = true;
-
-            CmtError::set (CmtError::syntax_error, "ParseRequirements> bad strategy keyword");
+            char num[32]; sprintf (num, "%d", line_number);
+            CmtError::set (CmtError::syntax_error,
+                           project->get_name ()
+                           + " project file: " + file_name
+                           + ": line: " + num
+                           + ": " + value + ": Bad strategy value");
+            //CmtError::set (CmtError::syntax_error, "ParseRequirements> bad strategy keyword");
           }
       }
@@ -1133 +1138 @@
           {
             in_error = true;
-
-            CmtError::set (CmtError::syntax_error, "ParseRequirements> bad strategy keyword");
+            char num[32]; sprintf (num, "%d", line_number);
+            CmtError::set (CmtError::syntax_error,
+                           project->get_name ()
+                           + " project file: " + file_name
+                           + ": line: " + num
+                           + ": " + value + ": Bad strategy value");
+            //CmtError::set (CmtError::syntax_error, "ParseRequirements> bad strategy keyword");
           }
       }
@@ -1242 +1252 @@
           {
             in_error = true;
-
-            CmtError::set (CmtError::syntax_error, "ParseRequirements> bad strategy keyword");
+            char num[32]; sprintf (num, "%d", line_number);
+            CmtError::set (CmtError::syntax_error,
+                           project->get_name ()
+                           + " project file: " + file_name
+                           + ": line: " + num
+                           + ": " + value + ": Bad strategy value");
+            //CmtError::set (CmtError::syntax_error, "ParseRequirements> bad strategy keyword");
           }
       }
@@ -2065 +2080 @@
 
   keyword->action (words, project, file_name, line_number);
+
+  if (CmtError::get_last_error_code () == CmtError::syntax_error)
+    CmtError::print ();
 }

CMT/HEAD/source/cmt_tag.cxx

@@ -99 +99 @@
 
   Log;
+
+  const CmtSystem::cmt_string_vector& tags_remove = Cmt::get_tags_remove ();
+  for (int i = tags_remove.size () - 1; i >= 0; i--)
+    if (tags_remove[i] == m_name) return;
 
   if (m_tag_excludes.size () > 0)