tidy xml and test folders

Author: vinniefalco

.gitattributes

@@ -0,0 +1,3 @@
+temp/**.xml  text eol=lf
+test/**.xml  text eol=lf
+tests/**.xml text eol=lf

source/lib/ast/ParseJavadoc.cpp

@@ -177,8 +177,8 @@ class JavadocVisitor
         if(para_->list.empty())
             s = C->getText().ltrim().rtrim();
         else
-            s = C->getText().ltrim().rtrim();
-            //s = C->getText().rtrim();
+            s = C->getText().rtrim();
+            //s = C->getText().ltrim().rtrim();
         para_->list.emplace_back(Javadoc::Text(
             ensureUTF8(s.str())));
     }

source/lib/format/Asciidoc.cpp

@@ -523,7 +523,7 @@ writeNodes(
 {
     if(list.empty())
         return;
-    for(auto const& node : list)
+    for(Javadoc::Node const& node : list)
         writeNode(node);
 }
 
@@ -588,16 +588,16 @@ writeNode(
     switch(node.style)
     {
     case Javadoc::Style::bold:
-        os_ << '*' << node.text << '*';
+        os_ << '*' << node.text << "*\n";
         break;
     case Javadoc::Style::mono:
-        os_ << '`' << node.text << '`';
+        os_ << '`' << node.text << "`\n";
         break;
     case Javadoc::Style::italic:
-        os_ << '_' << node.text << '_';
+        os_ << '_' << node.text << "_\n";
         break;
     default:
-        os_ << node.text;
+        os_ << node.text << '\n';
         break;
     }
 }

source/lib/format/Asciidoc.hpp

@@ -118,6 +118,8 @@ class AsciidocGenerator::Writer
 
     template<class T>
     void writeNodes(List<T> const& list);
+    //void writeNodes(List<Javadoc::Text> const& list);
+
     void writeNode(Javadoc::Node const& node);
     void writeNode(Javadoc::Text const& node);
     void writeNode(Javadoc::StyledText const& node);

source/lib/format/XML.cpp

@@ -69,13 +69,14 @@ buildString(
 
 //------------------------------------------------
 //
-// RecursiveWriter
+// Writer
 //
 //------------------------------------------------
 
 /** Manipulator to apply XML escaping to output.
 */
-struct XMLGenerator::Writer::escape
+struct XMLGenerator::Writer::
+    escape
 {
     explicit
     escape(
@@ -522,15 +523,16 @@ writeNode(
     case Javadoc::Kind::code:
         writeCode(static_cast<Javadoc::Code const&>(node));
         break;
-    case Javadoc::Kind::returns:
-        writeReturns(static_cast<Javadoc::Returns const&>(node));
-        break;
     case Javadoc::Kind::param:
         writeParam(static_cast<Javadoc::Param const&>(node));
         break;
     case Javadoc::Kind::tparam:
         writeTParam(static_cast<Javadoc::TParam const&>(node));
         break;
+    case Javadoc::Kind::returns:
+        // VFALCO Should never go through here
+        //writeReturns(static_cast<Javadoc::Returns const&>(node));
+        //break;
     default:
         llvm_unreachable("unknown kind");
     }
@@ -558,7 +560,7 @@ writeText(
         "<text";
     writeAttrs({
         { "class", tag, ! tag.empty() } });
-    os_ << '>' << text.text << "</text>\n";
+    os_ << '>' << escape(text.text) << "</text>\n";
 }
 
 void

source/tests/Tester.cpp

@@ -12,6 +12,8 @@
 #include "SingleFile.hpp"
 #include <clang/Tooling/StandaloneExecution.h>
 
+#define NO_ASYNC
+
 namespace clang {
 namespace mrdox {
 
@@ -55,18 +57,27 @@ checkDirRecursively(
         {
             outputPath = iter->path();
             path::replace_extension(outputPath, "xml");
-            threadPool.async([
+#ifndef NO_ASYNC
+            threadPool.async(
+#endif
+                [
                 this,
                 dirPath,
                 inputPath = llvm::SmallString<0>(iter->path()),
-                outputPath = llvm::SmallString<340>(outputPath)]() mutable
+                outputPath = llvm::SmallString<340>(outputPath)
+                    ]() mutable
                 {
                     SingleFile db(dirPath, inputPath, outputPath);
                     tooling::StandaloneToolExecutor ex(db, { std::string(inputPath) });
                     auto corpus = Corpus::build(ex, config_, R_);
                     if(! R_.error(corpus, "build corpus for '", inputPath, "'"))
                         checkOneFile(**corpus, inputPath, outputPath);
-                });
+                }
+#ifndef NO_ASYNC
+            );
+#else
+            ();
+#endif
         }
         else
         {