tri11paragon
/
BLT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i made some changes

v2
Brett 2025-02-18 01:32:26 -05:00
parent 96e5343d02
commit e0d36269bf
3 changed files with 129 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
include(cmake/color.cmake) include(cmake/color.cmake)
set(BLT_VERSION 4.0.13) set(BLT_VERSION 4.0.14)
set(BLT_TARGET BLT) set(BLT_TARGET BLT)

2
include/blt/parse/argparse_v2.h
View File

@ -150,7 +150,7 @@ namespace blt::argparse
} }
}; };
using arg_meta_type_helper_t = arg_data_helper_t<i8, i16, i32, i64, u8, u16, u32, u64, float, double, std::string_view>; using arg_meta_type_helper_t = arg_data_helper_t<bool, i8, i16, i32, i64, u8, u16, u32, u64, float, double, std::string_view>;
using arg_data_t = arg_meta_type_helper_t::variant_t; using arg_data_t = arg_meta_type_helper_t::variant_t;
template <typename T> template <typename T>

51
src/blt/parse/argparse_v2.cpp
View File

@ -311,22 +311,42 @@ namespace blt::argparse
<< std::endl; << std::endl;
std::exit(1); std::exit(1);
} }
if (argc == 0)
{
}
else if (argc == 1)
{
switch (flag->m_action) switch (flag->m_action)
{ {
case action_t::STORE: case action_t::STORE:
if (argc == 0)
{
std::cerr << "Error: argument '" << arg <<
"' action is store but takes in no arguments. This condition is invalid!" << std::endl;
std::exit(1);
}
if (argc == 1)
flag->m_dest_func(dest, parsed_args, args.front()); flag->m_dest_func(dest, parsed_args, args.front());
else
{
std::cerr << "Error: argument '" << arg << "' action is store but takes in more than one argument. " <<
"This condition is invalid, did you mean to use action_t::APPEND or action_t::EXTEND?" << std::endl;
std::exit(1);
}
break; break;
case action_t::APPEND: case action_t::APPEND:
case action_t::EXTEND: case action_t::EXTEND:
if (argc == 0)
{
std::cerr << "Error: argument '" << arg <<
"' action is append or extend but takes in no arguments. This condition is invalid!" << std::endl;
std::exit(1);
}
flag->m_dest_vec_func(dest, parsed_args, args); flag->m_dest_vec_func(dest, parsed_args, args);
break; break;
case action_t::APPEND_CONST: case action_t::APPEND_CONST:
if (argc != 0)
{
std::cerr << "Error: argument '" << arg << "' action is append const but takes in arguments. "
"This condition is invalid!" << std::endl;
std::exit(1);
}
if (flag->m_const_value) if (flag->m_const_value)
{ {
std::cerr << "Append const chosen as an action but const value not provided for argument '" << arg << '\'' << std::cerr << "Append const chosen as an action but const value not provided for argument '" << arg << '\'' <<
@ -375,17 +395,34 @@ namespace blt::argparse
} }
break; break;
case action_t::STORE_CONST: case action_t::STORE_CONST:
if (argc != 0)
{
std::cerr << "Store const flag called with an argument. This condition doesn't make sense." << std::endl; std::cerr << "Store const flag called with an argument. This condition doesn't make sense." << std::endl;
print_usage(); print_usage();
std::exit(1); std::exit(1);
}
if (!flag->m_const_value)
{
std::cerr << "Store const flag called with no value. This condition doesn't make sense." << std::endl;
std::exit(1);
}
parsed_args.m_data.insert({dest, *flag->m_const_value});
case action_t::STORE_TRUE: case action_t::STORE_TRUE:
if (argc != 0)
{
std::cerr << "Store true flag called with an argument. This condition doesn't make sense." << std::endl; std::cerr << "Store true flag called with an argument. This condition doesn't make sense." << std::endl;
print_usage(); print_usage();
std::exit(1); std::exit(1);
}
parsed_args.m_data.insert({dest, true});
case action_t::STORE_FALSE: case action_t::STORE_FALSE:
if (argc != 0)
{
std::cerr << "Store false flag called with an argument. This condition doesn't make sense." << std::endl; std::cerr << "Store false flag called with an argument. This condition doesn't make sense." << std::endl;
print_usage(); print_usage();
std::exit(1); std::exit(1);
}
parsed_args.m_data.insert({dest, false});
case action_t::COUNT: case action_t::COUNT:
if (parsed_args.m_data.contains(dest)) if (parsed_args.m_data.contains(dest))
{ {
@ -422,10 +459,6 @@ namespace blt::argparse
print_version(); print_version();
break; break;
} }
flag->m_dest_func(dest, parsed_args, args.front());
}
else
flag->m_dest_vec_func(dest, parsed_args, args);
} }
}, flag->m_nargs); }, flag->m_nargs);
} }