Loading src/CMakeLists.txt −1 Changes for src/CMakeLists.txt: 0 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,7 +3,6 @@ ################################################################################ add_library(parser inputs_file.cpp parser.cpp solver.cpp ) Loading src/inputs_file.cpp −73 File deleted. Show changes src/main.cpp +2 −2 Changes for src/main.cpp: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> #include "inputs.hpp" #include "solver.hpp" std::string read_file(std::string inputs_file) { std::ifstream in_stream; Loading @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) { } std::string fname(argv[1]); auto inputs_str = read_file(fname); auto maybe_success = parser::parse_inputs(inputs_str); auto maybe_success = solver::parse_inputs(inputs_str); if (maybe_success.has_value()) { return 0; } Loading src/meson.build −1 Changes for src/meson.build: 0 added lines, 1 removed line. Original line number Diff line number Diff line lib_parser = static_library('mfix-parser', 'inputs_file.cpp', 'parser.cpp', 'solver.cpp', include_directories: tao_inc, Loading src/parser.cpp +4 −4 Changes for src/parser.cpp: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ #include <tao/pegtl.hpp> // includes #include "inputs.hpp" #include "solver.hpp" using namespace tao::pegtl; Loading @@ -17,7 +17,7 @@ struct parser_state { std::variant<std::vector<double>, std::vector<std::string>> current_value; std::vector<double> current_num_vec; std::vector<std::string> current_str_vec; parser::InputInfo info; solver::InputInfo info; }; } // namespace Loading Loading @@ -144,9 +144,9 @@ std::optional<parser_state> do_parse(std::string str) { } // namespace namespace parser { namespace solver { std::optional<parser::InputInfo> parse_inputs(std::string str) { std::optional<solver::InputInfo> parse_inputs(std::string str) { auto maybe_state = do_parse(str); if (!maybe_state.has_value()) { return std::nullopt; Loading Loading
src/CMakeLists.txt −1 Changes for src/CMakeLists.txt: 0 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,7 +3,6 @@ ################################################################################ add_library(parser inputs_file.cpp parser.cpp solver.cpp ) Loading
src/main.cpp +2 −2 Changes for src/main.cpp: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -2,7 +2,7 @@ #include <iostream> #include <sstream> #include "inputs.hpp" #include "solver.hpp" std::string read_file(std::string inputs_file) { std::ifstream in_stream; Loading @@ -20,7 +20,7 @@ int main(int argc, char *argv[]) { } std::string fname(argv[1]); auto inputs_str = read_file(fname); auto maybe_success = parser::parse_inputs(inputs_str); auto maybe_success = solver::parse_inputs(inputs_str); if (maybe_success.has_value()) { return 0; } Loading
src/meson.build −1 Changes for src/meson.build: 0 added lines, 1 removed line. Original line number Diff line number Diff line lib_parser = static_library('mfix-parser', 'inputs_file.cpp', 'parser.cpp', 'solver.cpp', include_directories: tao_inc, Loading
src/parser.cpp +4 −4 Changes for src/parser.cpp: 4 added lines, 4 removed lines. Original line number Diff line number Diff line Loading @@ -6,7 +6,7 @@ #include <tao/pegtl.hpp> // includes #include "inputs.hpp" #include "solver.hpp" using namespace tao::pegtl; Loading @@ -17,7 +17,7 @@ struct parser_state { std::variant<std::vector<double>, std::vector<std::string>> current_value; std::vector<double> current_num_vec; std::vector<std::string> current_str_vec; parser::InputInfo info; solver::InputInfo info; }; } // namespace Loading Loading @@ -144,9 +144,9 @@ std::optional<parser_state> do_parse(std::string str) { } // namespace namespace parser { namespace solver { std::optional<parser::InputInfo> parse_inputs(std::string str) { std::optional<solver::InputInfo> parse_inputs(std::string str) { auto maybe_state = do_parse(str); if (!maybe_state.has_value()) { return std::nullopt; Loading