Changeset 664 for CMT/v1r25-branch/source/cmt_syntax.cxx

Timestamp:

Jan 13, 2014, 4:09:37 PM (10 years ago)

Author:

rybkin

Message:

merge -r 646:663 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• source/cmt_syntax.cxx (modified) (12 diffs)

CMT/v1r25-branch/source/cmt_syntax.cxx

@@ -3 +3 @@
 // arnault@lal.in2p3.fr
 // Modified by garonne@lal.in2p3.fr
+// Modified by Grigory Rybkin
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -212 +213 @@
                int line_number)
   {
-        
+    /*        
     cmt_string cmtpath;
     cmt_string offset;
@@ -219 +220 @@
 
     Project* p = Project::find_by_cmtpath (cmtpath);
+    */
+    Project* p = const_cast<Project*>(use->get_project ());
+    //    const Project* p = use->get_project ();
 
     for (int i = 1; i < words.size (); i++)
@@ -287 +291 @@
           {
             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");
           }
       }
@@ -1060 +1069 @@
                int line_number)
   {
+    /*
     cmt_string cmtpath;
     cmt_string offset;
@@ -1066 +1076 @@
 
     Project* p = Project::find_by_cmtpath (cmtpath);
+    */
+    Project* p = const_cast<Project*>(use->get_project ());
+    //    const Project* p = use->get_project ();
 
     for (int i = 1; i < words.size (); i++)
@@ -1126 +1139 @@
           {
             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");
           }
       }
@@ -1164 +1182 @@
                int line_number)
   {
+    /*
     cmt_string cmtpath;
     cmt_string offset;
@@ -1170 +1189 @@
 
     Project* p = Project::find_by_cmtpath (cmtpath);
+    */
+    Project* p = const_cast<Project*>(use->get_project ());
+    //    const Project* p = use->get_project ();
 
     for (int i = 1; i < words.size (); i++)
@@ -1231 +1253 @@
           {
             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");
           }
       }
@@ -1403 +1430 @@
       //
       
-      Project* p = use->get_project ();
+      const Project* p = use->get_project ();
       if (p != 0)
         {      
@@ -2054 +2081 @@
 
   keyword->action (words, project, file_name, line_number);
+
+  if (CmtError::get_last_error_code () == CmtError::syntax_error)
+    CmtError::print ();
 }