call dumping code of dump_toc_maker explicitly instead of using the d…

…estructor (reason: errors thrown in the destructor may interfere with errors of the same type)

git-svn-id: https://pet.opendfki.de/repos/pet/main@582 4200e16c-5112-0410-ac55-d7fb557a720a

cheap/cheap.cpp

@@ -167,6 +167,8 @@ void dump_jxchg(string &surface, chart *ch) {
       dmp.dump_int(0);
       dmp.dump_int(0);
       dmp.dump_int(0);
+
+      toc.dump();
     }
     catch (tError err) {
       LOG(logAppl, WARN, "Can not open file " << yieldname);

common/grammar-dump.cpp

@@ -139,7 +139,8 @@ dump_toc_maker::start_section(sectiontype s)
     _dump -> dump_int(s);
 }
 
-dump_toc_maker::~dump_toc_maker()
+void
+dump_toc_maker::dump()
 {
     if(_open)
         throw tError("TOC still open");

common/grammar-dump.h

@@ -102,7 +102,6 @@ class dump_toc_maker
  public:
   /** establish a table of contents for dumper \a dump */
   dump_toc_maker(dumper *dump);
-  ~dump_toc_maker();
 
   /** \brief Add the section with type \a s to the table of contents. All
    *  sections have to be added before dumping of the data starts, because the
@@ -118,6 +117,9 @@ class dump_toc_maker
    *  dumper, and write this position to the table of contents.
    */
   void start_section(sectiontype s);
+
+  /** Dump the toc. To be executed after all sections have been dumped. */
+  void dump();
 
  private:
   dumper *_dump;

flop/dump.cpp

@@ -285,4 +285,6 @@ dump_grammar(dumper *f, const char *desc)
     dag_dump(f, types[rleaftype_order[i]]->thedag);
   logkb(", types", f);
 
+  toc.dump();
+
 }