Skip to content

refactor: change integer argument type from int32 to int64 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimbo4ka merged 1 commit into from
Aug 13, 2025
Merged

refactor: change integer argument type from int32 to int64 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ struct Options {

int main(int argc, char** argv) {
Options opt;
std::vector<int> values;
std::vector<int64_t> values;

ArgumentParser::ArgParser parser("Program");
parser.AddIntArgument("N").MultiValue(1).Positional().StoreValues(values);
parser.AddFlag("sum", "add args").StoreValue(opt.sum);
parser.AddFlag("mult", "multiply args").StoreValue(opt.mult);
parser.AddFlag('m', "mult", "multiply args").StoreValue(opt.mult);
parser.AddHelp('h', "help", "Program accumulate arguments");

if(!parser.Parse(argc, argv)) {
Expand Down
4 changes: 2 additions & 2 deletions include/ArgParser/ArgParser.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ArgParser {

IntArg& AddIntArgument(char, std::string, std::string = "");
IntArg& AddIntArgument(std::string, std::string = "");
int32_t GetIntValue(const std::string&, std::size_t = 0) const;
int64_t GetIntValue(const std::string&, std::size_t = 0) const;

FlagArg& AddFlag(char, std::string, std::string = "");
FlagArg& AddFlag(std::string, std::string = "");
Expand Down Expand Up @@ -110,7 +110,7 @@ class ArgParser {
bool IsCorrectMultiValue() const;
bool AllHaveValues() const;

bool ConvertToNumber(const char* str, int32_t& number);
bool ConvertToNumber(const char* str, int64_t& number);
};

template<typename T>
Expand Down
4 changes: 2 additions & 2 deletions include/Argument/Argument.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Argument : public BaseArgument {

using StringArg = Argument<std::string>;
using FlagArg = Argument<bool>;
using IntArg = Argument<int32_t>;
using IntArg = Argument<int64_t>;

template<typename T>
Argument<T>::Argument()
Expand Down Expand Up @@ -135,7 +135,7 @@ template<typename T>
ArgumentType Argument<T>::GetType() const {
if constexpr (std::is_same_v<T, std::string>) {
return ArgumentType::kString;
} else if constexpr (std::is_same_v<T, int32_t>) {
} else if constexpr (std::is_same_v<T, int64_t>) {
return ArgumentType::kInt;
} else if constexpr (std::is_same_v<T, bool>) {
return ArgumentType::kFlag;
Expand Down
10 changes: 5 additions & 5 deletions src/ArgParser/ArgParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ IntArg& ArgParser::AddIntArgument(std::string full_name, std::string description
return AddArgument<IntArg>();
}

int32_t ArgParser::GetIntValue(const std::string& full_name, std::size_t index) const {
int64_t ArgParser::GetIntValue(const std::string& full_name, std::size_t index) const {
return GetArgumentAs<IntArg>(full_name, ArgumentType::kInt).GetValue(index);
}

Expand Down Expand Up @@ -237,7 +237,7 @@ bool ArgParser::ParseIntArgument(ParseContext& ctx) {
ArgPtr& argument = GetArgument(ctx.full_name);
if (!NextValueExists(ctx))
return false;
int32_t number;
int64_t number;
const char* value_str = ctx.is_named
? ctx.args[ctx.index].c_str() + ctx.equal_pos + 1
: ctx.args[++ctx.index].c_str();
Expand Down Expand Up @@ -310,13 +310,13 @@ bool ArgParser::ParsePositionalStringArgument(ArgPtr& argument, const std::strin
}

bool ArgParser::ParsePositionalIntArgument(ArgPtr& argument, const std::string& str) {
int32_t number;
int64_t number;
if (!ConvertToNumber(str.c_str(), number)) {
std::cerr << "Invalid integer value for argument: "
<< positional_argument_name_ << std::endl;
return false;
}
dynamic_cast<Argument<int32_t>&>(*argument).AddValue(number);
dynamic_cast<Argument<int64_t>&>(*argument).AddValue(number);
return true;
}

Expand Down Expand Up @@ -372,7 +372,7 @@ bool ArgParser::ParseShortFlags(const std::string& arg) {
return true;
}

bool ArgParser::ConvertToNumber(const char* str, int32_t& number) {
bool ArgParser::ConvertToNumber(const char* str, int64_t& number) {
auto [_, ec] = std::from_chars(str, str + strlen(str), number);
return ec == std::errc{};
}
Expand Down
8 changes: 4 additions & 4 deletions tests/argparser_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ TEST(ArgParserTestSuite, IntTest) {

TEST(ArgParserTestSuite, MultiValueTest) {
ArgParser parser("My Parser");
std::vector<int> int_values;
std::vector<int64_t> int_values;
parser.AddIntArgument('p', "param1").MultiValue().StoreValues(int_values);

ASSERT_TRUE(parser.Parse(SplitString("app --param1=1 --param1=2 --param1=3")));
Expand All @@ -103,7 +103,7 @@ TEST(ArgParserTestSuite, MultiValueTest) {

TEST(ArgParserTestSuite, MinCountMultiValueTest) {
ArgParser parser("My Parser");
std::vector<int> int_values;
std::vector<int64_t> int_values;
size_t MinArgsCount = 10;
parser.AddIntArgument('p', "param1").MultiValue(MinArgsCount).StoreValues(int_values);

Expand Down Expand Up @@ -136,7 +136,7 @@ TEST(ArgParserTestSuite, FlagsTest) {

TEST(ArgParserTestSuite, PositionalArgTest) {
ArgParser parser("My Parser");
std::vector<int> values;
std::vector<int64_t> values;
parser.AddIntArgument("Param1").MultiValue(1).Positional().StoreValues(values);

ASSERT_TRUE(parser.Parse(SplitString("app 1 2 3 4 5")));
Expand All @@ -148,7 +148,7 @@ TEST(ArgParserTestSuite, PositionalArgTest) {

TEST(ArgParserTestSuite, PositionalAndNormalArgTest) {
ArgParser parser("My Parser");
std::vector<int> values;
std::vector<int64_t> values;
parser.AddFlag('f', "flag", "Flag");
parser.AddIntArgument('n', "number", "Some Number");
parser.AddIntArgument("Param1").MultiValue(1).Positional().StoreValues(values);
Expand Down