diff --git a/Hazelnupp/ParamConstraint.h b/Hazelnupp/ParamConstraint.h index 3870555..f8c926f 100644 --- a/Hazelnupp/ParamConstraint.h +++ b/Hazelnupp/ParamConstraint.h @@ -78,7 +78,7 @@ namespace Hazelnp //! Daisychain-method. Will add a the "incompatiblity" aspect. //! This means, that the following parameters are NOT compatible with this one and will throw an error if passed together. //! Syntactical-sugar proxy method that will convert the lonely string to an initializer list for you :3 - ParamConstraint AddIncompatibility(const std::string& incompatibleParameters) + ParamConstraint AddIncompatibilities(const std::string& incompatibleParameters) { ParamConstraint pc = *this; pc.incompatibleParameters = { incompatibleParameters }; @@ -86,6 +86,16 @@ namespace Hazelnp return pc; } + //! Daisychain-method. Will add a the "incompatiblity" aspect. + //! This means, that the following parameters are NOT compatible with this one and will throw an error if passed together. + ParamConstraint AddIncompatibilities(const std::initializer_list& incompatibleParameters) + { + ParamConstraint pc = *this; + pc.incompatibleParameters = incompatibleParameters; + + return pc; + } + //! Whole constructor ParamConstraint(bool constrainType, DATA_TYPE requiredType, const std::initializer_list& defaultValue, bool required, const std::initializer_list& incompatibleParameters) : diff --git a/Hazelnupp/Version.h b/Hazelnupp/Version.h index 7627cda..1fd5693 100644 --- a/Hazelnupp/Version.h +++ b/Hazelnupp/Version.h @@ -1,2 +1,2 @@ #pragma once -#define HAZELNUPP_VERSION (1.12) +#define HAZELNUPP_VERSION (1.121) diff --git a/Test_Hazelnupp/Constraints.cpp b/Test_Hazelnupp/Constraints.cpp index aa07d93..9518911 100644 --- a/Test_Hazelnupp/Constraints.cpp +++ b/Test_Hazelnupp/Constraints.cpp @@ -695,7 +695,7 @@ namespace TestHazelnupp "--width", ParamConstraint::Require() .AddTypeSafety(DATA_TYPE::FLOAT) - .AddIncompatibility({ "--antiwidth" }) + .AddIncompatibilities({ "--antiwidth" }) ); cmdArgsI.Parse(C_Ify(args)); @@ -725,7 +725,7 @@ namespace TestHazelnupp "--width", ParamConstraint::TypeSafety(DATA_TYPE::FLOAT) .AddRequire() - .AddIncompatibility({ "--antiwidth" }) + .AddIncompatibilities({ "--antiwidth" }) ); cmdArgsI.Parse(C_Ify(args)); @@ -784,7 +784,7 @@ namespace TestHazelnupp "--width", ParamConstraint::Require() .AddTypeSafety(DATA_TYPE::FLOAT) - .AddIncompatibility({ "--antiwidth" }) + .AddIncompatibilities({ "--antiwidth" }) ); cmdArgsI.Parse(C_Ify(args)); diff --git a/readme.md b/readme.md index 5769881..8f260ef 100644 --- a/readme.md +++ b/readme.md @@ -283,7 +283,7 @@ args.RegisterConstraint( "--width", ParamConstraint::Require() // Make this parameter mandatory .AddTypeSafety(DATA_TYPE::FLOAT) // Force this param to be a float - .AddIncompatibility({ "--antiwidth" }) // Make this param incompatible with '--antiwidth' + .AddIncompatibilities({ "--antiwidth" }) // Make this param incompatible with '--antiwidth' ); ```