Move to libtempl

CMakeLists.txt

@@ -41,10 +41,15 @@ include_directories(${source_dir})
 
 find_program(LEXESIS_EXE Lexesis)
 if (NOT LEXESIS_EXE_FOUND)
+    #Lexesis
     ExternalProject_Add(ext-lexesis
         GIT_REPOSITORY git@gitlab.com:Robin_Jadoul/Lexesis.git
         )
-    ExternalProject_Get_Property(ext-lexesis binary_dir)
+    add_library(templ IMPORTED STATIC GLOBAL)
+    add_dependencies(templ ext-lexesis)
+    ExternalProject_Get_Property(ext-lexesis binary_dir source_dir)
+    set_target_properties(templ PROPERTIES "IMPORTED_LOCATION" "${binary_dir}/src/${CMAKE_STATIC_LIBRARY_PREFIX}templ${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    include_directories(${source_dir}/include)
     set(LEXESIS_EXE "${binary_dir}/bin/Lexesis")
 endif()
 

include/Parsodus/backend.h

@@ -3,7 +3,7 @@
 #define PARSODUS_BACKEND_H
 
 #include "Parsodus/config.h"
-#include "Parsodus/template.h"
+#include "Lexesis/template.h"
 #include "Parsodus/util/parserType.h"
 
 #include <functional>

include/Parsodus/backends/cppLR.h

@@ -4,7 +4,7 @@
 
 #include "Parsodus/backend.h"
 #include "Parsodus/lrtables/table.h"
-#include "Parsodus/template.h"
+#include "Lexesis/template.h"
 #include "Parsodus/util/symbols.h"
 
 #include <cassert>

include/Parsodus/template.h

@@ -1,65 +0,0 @@
-#pragma once
-#ifndef PARSODUS_TEMPLATE_H
-#define PARSODUS_TEMPLATE_H
-
-#include <map>
-#include <string>
-#include <vector>
-#include <mstch/mstch.hpp>
-    
-namespace pds {
-namespace templ {
-
-    
-    /**
-     * A changeable information structure for templates
-     */
-    using TemplateContext = mstch::node;
-
-    /**
-     * Make a TemplateContext string
-     */
-    TemplateContext make_string(std::string);
-
-    /**
-     * Make a TemplateContext map/dictionary
-     */
-    TemplateContext make_map(std::map<const std::string, TemplateContext>);
-
-    /**
-     * Make a TemplateContext array/vector
-     */
-    TemplateContext make_array(std::vector<TemplateContext>);
-
-    /**
-     * A generic wrapper around whichever templating system gets used
-     */
-    class Template {
-        public:
-            /**
-             * Construct a Template from given filename
-             *
-             * @param filename The name of the file which contains the template rules
-             */
-            Template(std::string filename);
-
-            /**
-             * Destructor
-             */
-            ~Template();
-
-            /**
-             * Render this template to `out` using the information in `context`
-             *
-             * @param out The ostream to render to
-             * @param context The information to provide the template rules while rendering
-             */
-            void render(std::ostream& out, TemplateContext& context);
-        private:
-            std::string m_filename;
-    };
-
-} //namespace templ
-} //namespace pds
-
-#endif //PARSODUS_TEMPLATE_H

src/CMakeLists.txt

@@ -34,7 +34,6 @@ add_library(Parsodus-tables
 add_library(pds
     backend.cpp
     driver.cpp
-    template.cpp
     inputparser.cpp
     backendmanager.cpp
     "${CMAKE_CURRENT_BINARY_DIR}/ParsodusLexer.cpp"
@@ -48,8 +47,10 @@ target_link_libraries(Parsodus
     Parsodus-util
     Parsodus-tables
     # Parsodus-backends
+    templ
     pds
-    mstch::mstch)
+    mstch::mstch
+    )
 
 install(TARGETS Parsodus
     RUNTIME DESTINATION bin

src/template.cpp

@@ -1,42 +0,0 @@
-#include "Parsodus/template.h"
-#include "mstch/mstch.hpp"
-
-#include <fstream>  
-#include <string>
-#include <sstream> 
-
-namespace pds {
-namespace templ {
-
-    TemplateContext make_string(std::string _string) {
-        return mstch::node(_string);
-    }
-    
-    TemplateContext make_map(std::map<const std::string, TemplateContext> _map) {
-        return mstch::map(_map);
-    }
-    
-    TemplateContext make_array(std::vector<TemplateContext> _array) {
-       return mstch::array(_array);
-    }
-
-
-    Template::Template(std::string filename) : m_filename(filename)
-    {}
-
-    Template::~Template()
-    {}
-
-    void Template::render(std::ostream& out, TemplateContext& context) {
-        std::ifstream file;
-        file.open (m_filename);
-        std::stringstream tmplt;
-        tmplt << file.rdbuf();
-        file.close();
-        mstch::config::escape = [](const std::string& str) -> std::string {
-              return str;
-        };
-        out << mstch::render(tmplt.str(),context);
-    }
-}
-}

tests/CMakeLists.txt

@@ -7,7 +7,6 @@ target_link_libraries(Parsodus-test
     Parsodus-tables
     Parsodus-util    
     pds
-    mstch::mstch
     ${GTEST_BOTH_LIBRARIES}
     )
 include(FindGTest)