Changeset 535 for CMT/HEAD/source/cmt_syntax.cxx

Timestamp:

Mar 26, 2010, 11:56:50 AM (15 years ago)

Author:

rybkin

Message:

See C.L. 422

File:

• CMT/HEAD/source/cmt_syntax.cxx (modified) (5 diffs)

CMT/HEAD/source/cmt_syntax.cxx

@@ -1656 +1656 @@
   cmt_string text;
 
-  CmtError::clear ();
+  if (CmtError::get_last_error_code () == CmtError::syntax_error)
+    CmtError::clear ();
 
   if (!CmtSystem::test_file (actual_file_name))
@@ -1888 +1889 @@
                                    Use* use)
 {
-  CmtError::clear ();
+  if (CmtError::get_last_error_code () == CmtError::syntax_error)
+        CmtError::clear ();
 
   if (words.size () == 0) return;
@@ -1921 +1923 @@
     }
 
-  if (CmtError::has_pending_error ())
+  if (CmtError::get_last_error_code () == CmtError::syntax_error)
+    //  if (CmtError::has_pending_error ())
     {
+      CmtError::print ();
+
       char num[32]; sprintf (num, "%d", line_number);
       CmtMessage::error ("bad syntax in requirements of " + use->get_package_name ()
@@ -1955 +1960 @@
                                    Project* project)
 {
-  CmtError::clear ();
+  if (CmtError::get_last_error_code () == CmtError::syntax_error)
+    CmtError::clear ();
 
   if (words.size () == 0) return;
@@ -1973 +1979 @@
     }
 
-  if (CmtError::has_pending_error ())
+  if (CmtError::get_last_error_code () == CmtError::syntax_error)
+    //  if (CmtError::has_pending_error ())
     {
+      CmtError::print ();
+
       char num[32]; sprintf (num, "%d", line_number);
       CmtMessage::error ("bad syntax in project file of " + project->get_name ()