fixed exception type, added conversion app

Author: danielepanozzo

CMakeLists.txt

@@ -34,6 +34,7 @@ project(JSE
 option(JSE_WITH_SANITIZERS    "Enable sanitizers in compilation targets"   OFF)
 # Misc.
 option(JSE_WITH_TESTS         "Build unit-tests" ${JSE_TOPLEVEL_PROJECT})
+option(JSE_WITH_APP           "Compiles applications" ${JSE_TOPLEVEL_PROJECT})
 
 include(CMakeDependentOption)
 
@@ -121,3 +122,18 @@ if(JSE_WITH_TESTS)
 
     add_subdirectory(tests)
 endif()
+
+################################################################################
+# Applications
+################################################################################
+
+if(JSE_WITH_APP)
+
+add_executable(jse_app src/main.cpp)
+
+target_compile_options(jse_app PRIVATE "-rdynamic")
+target_link_libraries(jse_app PUBLIC
+    jse::jse
+)
+
+endif()

data/rules_04.json

@@ -0,0 +1,12 @@
+[
+{
+    "pointer": "/",
+    "type": "include",
+    "spec_file": "rules_02.json"
+},
+{
+    "pointer": "/object1",
+    "type": "include",
+    "spec_file": "rules_02.json"
+}
+]

src/jse/jse.cpp

@@ -138,7 +138,7 @@ namespace jse
                     if (!replaced)
                     {
                         string pointer = rule.at("pointer");
-                        throw("Failed to replace the include rule: " + pointer);
+                        throw std::runtime_error("Failed to replace the include rule: " + pointer);
                         assert(replaced == true);
                     }
                 }
@@ -148,7 +148,7 @@ namespace jse
             current = enriched;
         }
 
-        throw("Reached maximal 10 levels of include recursion.");
+        throw std::runtime_error("Reached maximal 10 levels of include recursion.");
 
     }
 

src/main.cpp

@@ -0,0 +1,57 @@
+#include <iostream>
+#include <cstdlib>
+#include <jse/jse.h>
+#include <string>
+#include <vector>
+#include <fstream>
+
+
+using namespace std;
+using namespace jse;
+
+int main(int argc, char *argv[]) {
+    try
+    {
+
+        if (argc < 3) {
+            cerr << "This utility recursively replaces the include rules with their corresponding rule files." << endl;
+            cerr << "Usage: " << argv[0] << " input.json output.json folder1 folder2 ..." << endl;
+            return EXIT_FAILURE;
+        }
+
+        // First parameter is the input json
+        string sinput = argv[1];
+
+        // Second parameter is the output json
+        string soutput = argv[2];
+
+        // Other parameters are optional include directories
+        // where the parser will look for rule files
+        vector<std::string> arg;
+        for (size_t i=3;i<argc;++i)
+            arg.push_back(string(argv[i]));
+
+        // Initialize JSE
+        JSE jse;
+        jse.include_directories = arg;
+
+        // Load the input json
+        std::ifstream input_f(sinput);
+        json rules = json::parse(input_f);
+
+        // Try to replace the includes, might throw exceptions
+        json new_rules = jse.inject_include(rules);
+
+        // Write the new rule file
+        std::ofstream file(soutput);
+        file << new_rules;
+
+        return EXIT_SUCCESS;
+    }
+    catch(const std::exception &exc)
+    {
+        std::cout << exc.what() << std::endl;
+        return EXIT_FAILURE;
+    }
+
+}