Changeset 595 for CMT/HEAD/source/cmt_generator.cxx

Timestamp:

Dec 9, 2011, 1:45:45 PM (12 years ago)

Author:

rybkin

Message:

See C.L. 472

File:

• CMT/HEAD/source/cmt_generator.cxx (modified) (12 diffs)

CMT/HEAD/source/cmt_generator.cxx

@@ -763 +763 @@
     }
 
-  static InGenerator InGen (usecmt);
+  int retval (0);
+  static InGenerator InGen (usecmt, false);
 
   bool gen (true);
@@ -772 +773 @@
   if (s) // file already exists
     {
-      InGen.build (constituent, os);
+      retval = InGen.build (constituent, os);
       ostringstream osn;
       osn << s.rdbuf ();
@@ -784 +785 @@
   s.close ();
   s.clear ();
+  if (0 != retval) return retval;
   if (gen)
     {
@@ -802 +804 @@
           else
             {
-              InGen.build (constituent, s);
+              retval = InGen.build (constituent, s);
             }
           s.close (); // ios_base::failbit
@@ -817 +819 @@
   //  s.close (); // ios_base::failbit
 
-  return 0;
+  return retval;
 }
 
@@ -1530 +1532 @@
 int InGenerator::Buffer::print (ostream& s)
 {
-  initialize ();
+  int retval (0);
+  retval = initialize ();
+  if (0 > retval) return retval;
   s << m_buffer.str ();
   return 0;
@@ -1539 +1543 @@
 {
   m_usecmt = usecmt;
+}
+
+//------------------------------------------------------------------------
+void InGenerator::Buffer::set_pedantic (bool pedantic)
+{
+  m_pedantic = pedantic;
 }
 
@@ -1551 +1561 @@
       const cmt_string& name = m_names[i];
       Language& p (Language::find (name));
-      if (Language::null () == p) { errors += 1; continue; }
+      if (Language::null () == p)
+        {
+          CmtError::set (CmtError::language_not_found, name);
+          errors += 1;
+          continue;
+        }
       p.show (Requirements, m_buffer);
       /*
@@ -1571 +1586 @@
     {
       const cmt_string& name = m_names[i];
+      if (Cmt::get_debug ())
+        {
+          cout << "InGenerator::Fragments::initialize> " << name << endl;
+        }
       Fragment* fragment (Fragment::find (name));
-      if (0 == fragment) { errors += 1; continue; }
+      if (0 == fragment)
+        {
+          if (m_pedantic)
+            {
+              CmtError::set (CmtError::fragment_not_found, name + " (standard)");
+              errors += 1;
+            }
+          else
+            {
+              CmtMessage::warning
+                (CmtError::get_error_name (CmtError::fragment_not_found)
+                 + ": " + name + " (standard)");
+            }
+          continue;
+        }
       if (m_usecmt || !fragment->use->get_package ()->is_cmt ())
-        fragment->print (Requirements, m_buffer);
+        if (1 != fragment->print (Requirements, m_buffer))
+          {
+            if (m_pedantic)
+              {
+                CmtError::set (CmtError::fragment_not_found, name + " (standard)");
+                errors += 1;
+              }
+            else
+              {
+                CmtMessage::warning
+                  (CmtError::get_error_name (CmtError::fragment_not_found)
+                   + ": " + name + " (standard)");
+              }
+            continue;
+          }
     }
   //  cerr << "initialize: " << m_buffer.str ();
@@ -1581 +1628 @@
 
 //------------------------------------------------------------------------
-InGenerator::InGenerator (bool usecmt)
-  : m_usecmt (usecmt)
-{
+InGenerator::InGenerator (bool usecmt, bool pedantic)
+  : m_usecmt (usecmt), m_pedantic (pedantic)
+{
+  m_pedantic = (0 != CmtSystem::getenv ("CMTPEDANTIC").size () ||
+                0 != CmtSystem::getenv ("PEDANTIC").size ());
+
+  m_common.set_pedantic (m_pedantic);
+  m_application.set_pedantic (m_pedantic);
+  m_application_library.set_pedantic (m_pedantic);
+  m_library.set_pedantic (m_pedantic);
+  m_document.set_pedantic (m_pedantic);
+  m_languages.set_pedantic (m_pedantic);
+
   CmtSystem::cmt_string_vector common;
   common.push_back ("make_header");
@@ -1627 +1684 @@
       //language.setup_fragments ();
       application.push_back (language.fragment_name); //application.name ();
-      library.push_back (language.fragment_name + "_library"); //library.name ();
+      if (!(language == "java"))
+        library.push_back (language.fragment_name + "_library"); //library.name ();
       if (m_usecmt || !language.m_use->get_package ()->is_cmt ())
 //       if (!language.m_use->get_package ()->is_cmt ())
@@ -1656 +1714 @@
 int InGenerator::build (const Constituent& constituent, ostream& s)
 {
+  int retval (0);
+
   constituent.show (s);
-  m_common.print (s);
+  retval += m_common.print (s);
 
   switch (constituent.type)
     {
     case Application:
-      m_application.print (s);
-      m_application_library.print (s);
-      m_languages.print (s);
+      retval += m_application.print (s);
+      retval += m_application_library.print (s);
+      retval += m_languages.print (s);
       break;
     case Library:
-      m_application_library.print (s);
-      m_library.print (s);
-      m_languages.print (s);
+      retval += m_application_library.print (s);
+      retval += m_library.print (s);
+      retval += m_languages.print (s);
       break;
     case Document:
       Fragment* fragment (Fragment::find (constituent.generator));
-      if (0 == fragment) return -1;
+      if (Cmt::get_debug ())
+        {
+          cout << "InGenerator::build> " << constituent.generator
+               << " |name> " << constituent.name << endl;
+        }
+      if (0 == fragment)
+        {
+          CmtError::set (CmtError::fragment_not_found, constituent.generator
+                         + " (document " + constituent.name + ")");
+          return retval -= 1;
+        }
       if (m_usecmt || !fragment->use->get_package ()->is_cmt ())
-        fragment->print (Requirements, s);
-      if ("" != fragment->header)
-        {
+        if (1 != fragment->print (Requirements, s))
+          {
+            CmtError::set (CmtError::fragment_not_found, constituent.generator
+                           + " (document " + constituent.name + ")");
+            return retval -= 1;
+          }
+      if (0 != fragment->header.size ())
+        {
+          if (Cmt::get_debug ())
+            {
+              cout << "InGenerator::build> " << fragment->header
+                   << " |name> " << constituent.name << endl;
+            }
           Fragment* header (Fragment::find (fragment->header));
-          if (0 == header) return -1;
+          if (0 == header)
+            {
+              CmtError::set (CmtError::fragment_not_found, fragment->header
+                             + " (document " + constituent.name + ")");
+              return retval -= 1;
+            }
           //      if (header->use != fragment->use &&
           if (m_usecmt || !header->use->get_package ()->is_cmt ())
-            header->print (Requirements, s);
-        }
-      if ("" != fragment->trailer)
-        {
+            if (1 != header->print (Requirements, s))
+              {
+                CmtError::set (CmtError::fragment_not_found, fragment->header
+                               + " (document " + constituent.name + ")");
+                return retval -= 1;
+              }
+        }
+      if (0 != fragment->trailer.size ())
+        {
+          if (Cmt::get_debug ())
+            {
+              cout << "InGenerator::build> " << fragment->trailer
+                   << " |name> " << constituent.name << endl;
+            }
           Fragment* trailer (Fragment::find (fragment->trailer));
-          if (0 == trailer) return -1;
+          if (0 == trailer)
+            {
+              CmtError::set (CmtError::fragment_not_found, fragment->trailer
+                             + " (document " + constituent.name + ")");
+              return retval -= 1;
+            }
           //      if (trailer->use != fragment->use &&
           if (m_usecmt || !trailer->use->get_package ()->is_cmt ())
-            trailer->print (Requirements, s);
-        }
-      m_document.print (s);
+            if (1 != trailer->print (Requirements, s))
+              {
+                CmtError::set (CmtError::fragment_not_found, fragment->trailer
+                               + " (document " + constituent.name + ")");
+                return retval -= 1;
+              }
+        }
+      retval += m_document.print (s);
       break;
     }
 
-  return 0;
+  if (m_pedantic)
+    return retval;
+  else
+    return 0;
 }
 //------------------------------------------------------------------------