Port tools to cxxopts (#904)

* Port tools to cxxopts

* Fix minify tool architecture argument

* Fix wrong return code in json2json

* Change return codes

* Better handling of the errors.

* Updating to latest version.

* cxxopts outside of SIMDJSON_COMPETITION

Co-authored-by: Daniel Lemire <lemire@gmail.com>
This commit is contained in:
yoannlr
2020-05-29 21:39:23 +02:00
committed by GitHub
parent ac0c3093f4
commit f772bf4fbc
7 changed files with 171 additions and 126 deletions
+46 -27
View File
@@ -1,40 +1,53 @@
#include <iostream>
#include <unistd.h>
#include "simdjson.h"
#ifndef __cpp_exceptions
#define CXXOPTS_NO_EXCEPTIONS
#endif
#include "cxxopts.hpp"
void usage(const char *exe) {
std::cerr << exe << " v" << STRINGIFY(SIMDJSON_VERSION) << " (" << simdjson::active_implementation->name() << ")" << std::endl;
std::cerr << std::endl;
std::cerr << "Reads json in, out the result of the parsing. " << std::endl;
std::cerr << "Usage: " << exe << " <jsonfile>" << std::endl;
std::cerr << "The -d flag dumps the raw content of the tape." << std::endl;
}
int main(int argc, char *argv[]) {
bool rawdump = false;
#ifdef __cpp_exceptions
try {
#endif
std::string progName = "json2json";
int c;
std::string progUsage = "json2json version ";
progUsage += STRINGIFY(SIMDJSON_VERSION);
progUsage += " (";
progUsage += simdjson::active_implementation->name();
progUsage += ")\n";
progUsage += "Reads json in, out the result of the parsing.\n";
progUsage += argv[0];
progUsage += " <jsonfile>\n";
while ((c = getopt(argc, argv, "dh")) != -1) {
switch (c) {
case 'd':
rawdump = true;
break;
case 'h':
usage(argv[0]);
return EXIT_SUCCESS;
default:
abort();
}
cxxopts::Options options(progName, progUsage);
options.add_options()
("d,rawdump", "Dumps the raw content of the tape.", cxxopts::value<bool>()->default_value("false"))
("f,file", "File name.", cxxopts::value<std::string>())
("h,help", "Print usage.")
;
// the first argument without an option name will be parsed into file
options.parse_positional({"file"});
auto result = options.parse(argc, argv);
if(result.count("help")) {
std::cerr << options.help() << std::endl;
return EXIT_SUCCESS;
}
if (optind >= argc) {
usage(argv[0]);
bool rawdump = result["rawdump"].as<bool>();
if(!result.count("file")) {
std::cerr << "No filename specified." << std::endl;
std::cerr << options.help() << std::endl;
return EXIT_FAILURE;
}
const char *filename = argv[optind];
if (optind + 1 < argc) {
std::cerr << "warning: ignoring everything after " << argv[optind + 1]
<< std::endl;
}
const char *filename = result["file"].as<std::string>().c_str();
simdjson::dom::parser parser;
auto [doc, error] = parser.load(filename); // do the parsing, return false on error
if (error != simdjson::SUCCESS) {
@@ -48,4 +61,10 @@ int main(int argc, char *argv[]) {
std::cout << doc;
}
return EXIT_SUCCESS;
#ifdef __cpp_exceptions
} catch (const cxxopts::OptionException& e) {
std::cout << "error parsing options: " << e.what() << std::endl;
return EXIT_FAILURE;
}
#endif
}