Merge pull request #11 from iamtheburd/modify-json-output

Modify json output

Author: Tyler Burdsall

src/cli_functions.cpp

@@ -89,12 +89,24 @@ const void output_result(const vector<string> &result, const generation_args &ar
         {
             cout << "[\n";
         }
-        json entry;
-        for (unsigned long long j = 0; j < key_size; ++j)
+        if (key_size == 0)
         {
-            entry[args.pc.keys[j]] = result[j];
+            json entry = json::array();
+            for (const string& s : result)
+            {
+                entry.push_back(s);
+            }
+            cout << entry.dump(4);
+        }
+        else
+        {
+            json entry;
+            for (unsigned long long j = 0; j < key_size; ++j)
+            {
+                entry[args.pc.keys[j]] = result[j];
+            }
+            cout << entry.dump(4);
         }
-        cout << entry.dump(4);
         if (!for_optimization)
         {
             cout << "]\n";

src/main.cpp

@@ -21,7 +21,7 @@
 
 #define COMBIGEN_MAJOR_VERSION 1
 #define COMBIGEN_MINOR_VERSION 3
-#define COMBIGEN_REVISION_VERSION 1
+#define COMBIGEN_REVISION_VERSION 2
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
 #include "lib/win-getopt/getopt.h"