aboutsummaryrefslogtreecommitdiff
path: root/src/headless/main.cpp
diff options
context:
space:
mode:
author Spartan322 <Megacake1234@gmail.com>2024-05-09 16:06:02 +0200
committer Spartan322 <Megacake1234@gmail.com>2024-06-18 01:31:12 +0200
commitb0c3ba3f91926b0c95625bdbf4aab69269130b13 (patch)
treef15ebc47d6bf370031af28e4bb4814ae30ef46e1 /src/headless/main.cpp
parent7b521d6023113372cf6b02e562828273c4040f0e (diff)
Add runtime encoding detection and conversionfix/char-detection
Win-1251/1252 detection is a reduced C++ version of https://github.com/hsivonen/chardetng Add manually-specified encoding fallback Add default system encoding fallback Add error recovery to v2script Add unknown encoding detection warning Remove csv::Parser templating Fix lua files dropping data Update lexy to foonathan/lexy@1e5d99fa3826b1c3c8628d3a11117fb4fb4cc0d0 Remove exclusive reliance on lexy::default_encoding for v2script Move internal concepts to src/openvic-detail/InternalConcepts.hpp Move contents of DetectUtf8.hpp to src/detail/Detect.hpp Move openvic-dataloader/AbstractSyntaxTree.hpp to src Move DiagnosticLogger.hpp to src Move File.hpp to src Move openvic-dataloader/detail/utlity files to openvic-dataloader/detail Add ovdl::utility::type_concat Add ovdl::utility::type_prepend Add ovdl::utility::is_instance_of Overhaul parse error messages
Diffstat (limited to 'src/headless/main.cpp')
-rw-r--r--src/headless/main.cpp24
1 files changed, 8 insertions, 16 deletions
diff --git a/src/headless/main.cpp b/src/headless/main.cpp
index 7279a6e..0ad6115 100644
--- a/src/headless/main.cpp
+++ b/src/headless/main.cpp
@@ -6,7 +6,7 @@
#include <iterator>
#include <string_view>
-#include <openvic-dataloader/ParseWarning.hpp>
+#include <openvic-dataloader/NodeLocation.hpp>
#include <openvic-dataloader/csv/LineObject.hpp>
#include <openvic-dataloader/csv/Parser.hpp>
#include <openvic-dataloader/v2script/AbstractSyntaxTree.hpp>
@@ -41,9 +41,8 @@ bool insenitive_trim_eq(std::string_view lhs, std::string_view rhs) {
[](char a, char b) { return std::tolower(a) == std::tolower(b); });
}
-template<ovdl::csv::EncodingType Encoding>
int print_csv(const std::string_view path) {
- auto parser = ovdl::csv::Parser<Encoding>(std::cerr);
+ auto parser = ovdl::csv::Parser(std::cerr);
parser.load_from_file(path);
if (parser.has_error()) {
return 1;
@@ -73,12 +72,11 @@ int print_lua(const std::string_view path, VisualizationType visual_type) {
return 1;
}
- parser.lua_defines_parse();
- if (parser.has_error()) {
+ if (!parser.lua_defines_parse()) {
return 2;
}
- if (parser.has_warning()) {
+ if (parser.has_error() || parser.has_warning()) {
parser.print_errors_to(std::cerr);
}
@@ -97,12 +95,11 @@ int print_v2script_simple(const std::string_view path, VisualizationType visual_
return 1;
}
- parser.simple_parse();
- if (parser.has_error()) {
+ if (!parser.simple_parse()) {
return 2;
}
- if (parser.has_warning()) {
+ if (parser.has_error() || parser.has_warning()) {
parser.print_errors_to(std::cerr);
}
@@ -139,23 +136,18 @@ int main(int argc, char** argv) {
return print_lua(args[1], type);
}
return print_v2script_simple(args[1], type);
- case 4:
- if (insenitive_trim_eq(args[1], "csv") && insenitive_trim_eq(args[2], "utf"))
- return print_csv<ovdl::csv::EncodingType::Utf8>(args[3]);
- goto default_jump;
case 3:
if (insenitive_trim_eq(args[1], "csv"))
- return print_csv<ovdl::csv::EncodingType::Windows1252>(args[2]);
+ return print_csv(args[2]);
if (insenitive_trim_eq(args[1], "lua"))
return print_lua(args[2], type);
[[fallthrough]];
default:
- default_jump:
std::fprintf(stderr, "usage: %s <filename>\n", args[0].c_str());
std::fprintf(stderr, "usage: %s list <options> <filename>\n", args[0].c_str());
std::fprintf(stderr, "usage: %s native <options> <filename>\n", args[0].c_str());
std::fprintf(stderr, "usage: %s lua <filename>\n", args[0].c_str());
- std::fprintf(stderr, "usage: %s csv [utf] <filename>\n", args[0].c_str());
+ std::fprintf(stderr, "usage: %s csv <filename>\n", args[0].c_str());
return EXIT_FAILURE;
}