From f0a4f34da1418cf299cf9f41a772f513b180e2cf Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 14 Oct 2010 12:27:37 +0200 Subject: Move prologue/epilogue inside pre/post includes --- xsd/cxx/parser/generator.cxx | 30 +++++++++--------- xsd/cxx/tree/generator.cxx | 72 ++++++++++++++++++++++---------------------- 2 files changed, 51 insertions(+), 51 deletions(-) (limited to 'xsd') diff --git a/xsd/cxx/parser/generator.cxx b/xsd/cxx/parser/generator.cxx index 617ff4f..2ce958f 100644 --- a/xsd/cxx/parser/generator.cxx +++ b/xsd/cxx/parser/generator.cxx @@ -1195,6 +1195,18 @@ namespace CXX << "#define " << guard << endl << endl; + // Version check. + // + hxx << "#include " << endl + << endl + << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl + << "#error XSD runtime version mismatch" << endl + << "#endif" << endl + << endl; + + hxx << "#include " << endl + << endl; + // Copy prologue. // hxx << "// Begin prologue." << endl @@ -1208,19 +1220,7 @@ namespace CXX << "// End prologue." << endl << endl; - // Version check. - // - hxx << "#include " << endl - << endl - << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl - << "#error XSD runtime version mismatch" << endl - << "#endif" << endl - << endl; - { - hxx << "#include " << endl - << endl; - // Set auto-indentation. // Indentation::Clip hxx_clip (hxx); @@ -1236,9 +1236,6 @@ namespace CXX if (inline_) hxx << "#include " << ctx.process_include_path (ixx_name) << endl; - - hxx << "#include " << endl - << endl; } // Copy epilogue. @@ -1254,6 +1251,9 @@ namespace CXX << "// End epilogue." << endl << endl; + hxx << "#include " << endl + << endl; + hxx << "#endif // " << guard << endl; if (show_sloc) diff --git a/xsd/cxx/tree/generator.cxx b/xsd/cxx/tree/generator.cxx index 3b0e6cd..342d5c0 100644 --- a/xsd/cxx/tree/generator.cxx +++ b/xsd/cxx/tree/generator.cxx @@ -1268,6 +1268,18 @@ namespace CXX << "#define " << guard << endl << endl; + // Version check. + // + fwd << "#include " << endl + << endl + << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl + << "#error XSD runtime version mismatch" << endl + << "#endif" << endl + << endl; + + fwd << "#include " << endl + << endl; + // Copy prologue. // fwd << "// Begin prologue." << endl @@ -1282,19 +1294,7 @@ namespace CXX << "// End prologue." << endl << endl; - // Version check. - // - fwd << "#include " << endl - << endl - << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl - << "#error XSD runtime version mismatch" << endl - << "#endif" << endl - - << endl; { - fwd << "#include " << endl - << endl; - if (ctx.char_type == L"char") { fwd << "#ifndef XSD_USE_CHAR" << endl @@ -1328,9 +1328,6 @@ namespace CXX // Generate. // generate_forward (ctx); - - fwd << "#include " << endl - << endl; } // Copy epilogue. @@ -1347,6 +1344,9 @@ namespace CXX << "// End epilogue." << endl << endl; + fwd << "#include " << endl + << endl; + fwd << "#endif // " << guard << endl; if (show_sloc) @@ -1384,6 +1384,18 @@ namespace CXX << "#define " << guard << endl << endl; + // Version check. + // + hxx << "#include " << endl + << endl + << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl + << "#error XSD runtime version mismatch" << endl + << "#endif" << endl + << endl; + + hxx << "#include " << endl + << endl; + // Copy prologue. // hxx << "// Begin prologue." << endl @@ -1397,19 +1409,7 @@ namespace CXX << "// End prologue." << endl << endl; - // Version check. - // - hxx << "#include " << endl - << endl - << "#if (XSD_INT_VERSION != " << XSD_INT_VERSION << "L)" << endl - << "#error XSD runtime version mismatch" << endl - << "#endif" << endl - << endl; - { - hxx << "#include " << endl - << endl; - // Generate character selection defines. // if (!forward) @@ -1482,9 +1482,6 @@ namespace CXX << "#endif // XSD_DONT_INCLUDE_INLINE" << endl << endl; } - - hxx << "#include " << endl - << endl; } // Copy epilogue. @@ -1500,6 +1497,9 @@ namespace CXX << "// End epilogue." << endl << endl; + hxx << "#include " << endl + << endl; + hxx << "#endif // " << guard << endl; if (show_sloc) @@ -1663,6 +1663,9 @@ namespace CXX Indentation::Clip cxx_sloc (os); + os << "#include " << endl + << endl; + // Copy prologue. // os << "// Begin prologue." << endl @@ -1678,9 +1681,6 @@ namespace CXX << endl; { - os << "#include " << endl - << endl; - // Set auto-indentation. // Indentation::Clip cxx_clip (os); @@ -1711,9 +1711,6 @@ namespace CXX if (!ops.value ().empty ()) generate_stream_insertion_source (ctx); - - os << "#include " << endl - << endl; } // Copy epilogue. @@ -1730,6 +1727,9 @@ namespace CXX << "// End epilogue." << endl << endl; + os << "#include " << endl + << endl; + if (show_sloc) { wcerr << cxx_paths[part] << ": " -- cgit v1.1