From 1b8c156314463a6a20a1099df34e5e152d1cf14d Mon Sep 17 00:00:00 2001 From: Leonetienne Date: Sun, 6 Jun 2021 15:24:29 +0200 Subject: [PATCH] Renamed 'ParamConstraint::wantedType' to 'ParamConstraint::requiredType' --- Hazelnupp.vpp | Bin 823296 -> 823296 bytes Hazelnupp/Hazelnupp.cpp | 30 +++++++++---------- Hazelnupp/ParamConstraint.h | 10 +++---- Test_Hazelnupp/Constraints.cpp | 52 ++++++++++++++++----------------- readme.md | 2 +- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Hazelnupp.vpp b/Hazelnupp.vpp index 60a5f6d6c26d6043ea0609cfc18b547e19b1a387..3b8d0268746ce13f3f0b2b600fb57bc855c854e0 100644 GIT binary patch delta 13646 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 Op|6{VI0_qZ=Kc@Afyu`J delta 13576 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 Mc+l_$ysOFo1+&RVm;e9( diff --git a/Hazelnupp/Hazelnupp.cpp b/Hazelnupp/Hazelnupp.cpp index 7d5d646..8d5d829 100644 --- a/Hazelnupp/Hazelnupp.cpp +++ b/Hazelnupp/Hazelnupp.cpp @@ -182,21 +182,21 @@ Value* Hazelnupp::ParseValue(const std::vector& values, const Param // Is a list forced via a constraint? If yes, return an empty list if ((constrainType) && - (constraint->wantedType == DATA_TYPE::LIST)) + (constraint->requiredType == DATA_TYPE::LIST)) return new ListValue(); // Is a string forced via a constraint? If yes, return an empty string else if ((constrainType) && - (constraint->wantedType == DATA_TYPE::STRING)) + (constraint->requiredType == DATA_TYPE::STRING)) return new StringValue(""); // Is an int or float forced via constraint? If yes, throw an exception else if ((constrainType) && - ((constraint->wantedType == DATA_TYPE::INT) || - (constraint->wantedType == DATA_TYPE::FLOAT))) + ((constraint->requiredType == DATA_TYPE::INT) || + (constraint->requiredType == DATA_TYPE::FLOAT))) throw HazelnuppConstraintTypeMissmatch( constraint->key, - constraint->wantedType, + constraint->requiredType, rawInputType, GetDescription(constraint->key) ); @@ -207,7 +207,7 @@ Value* Hazelnupp::ParseValue(const std::vector& values, const Param // Force void type by constraint else if ((constrainType) && - (constraint->wantedType == DATA_TYPE::VOID)) + (constraint->requiredType == DATA_TYPE::VOID)) { return new VoidValue; } @@ -219,11 +219,11 @@ Value* Hazelnupp::ParseValue(const std::vector& values, const Param // Should the type be something other than list? if ((constrainType) && - (constraint->wantedType != DATA_TYPE::LIST)) + (constraint->requiredType != DATA_TYPE::LIST)) { throw HazelnuppConstraintTypeMissmatch( constraint->key, - constraint->wantedType, + constraint->requiredType, rawInputType, GetDescription(constraint->key) ); @@ -250,10 +250,10 @@ Value* Hazelnupp::ParseValue(const std::vector& values, const Param // Is the type not supposed to be a string? // void and list are already sorted out if ((constrainType) && - (constraint->wantedType != DATA_TYPE::STRING)) + (constraint->requiredType != DATA_TYPE::STRING)) { // We can only force a list-value from here - if (constraint->wantedType == DATA_TYPE::LIST) + if (constraint->requiredType == DATA_TYPE::LIST) { ListValue* list = new ListValue(); Value* tmp = ParseValue({ val }); @@ -266,7 +266,7 @@ Value* Hazelnupp::ParseValue(const std::vector& values, const Param else throw HazelnuppConstraintTypeMissmatch( constraint->key, - constraint->wantedType, + constraint->requiredType, rawInputType, GetDescription(constraint->key) ); @@ -278,7 +278,7 @@ Value* Hazelnupp::ParseValue(const std::vector& values, const Param // In this case we have a numeric value. // We should still produce a string if requested if ((constrainType) && - (constraint->wantedType == DATA_TYPE::STRING)) + (constraint->requiredType == DATA_TYPE::STRING)) return new StringValue(val); // Numeric @@ -294,10 +294,10 @@ Value* Hazelnupp::ParseValue(const std::vector& values, const Param if (constrainType) { // Must it be an integer? - if (constraint->wantedType == DATA_TYPE::INT) + if (constraint->requiredType == DATA_TYPE::INT) return new IntValue((long long int)num); // Must it be a floating point? - else if (constraint->wantedType == DATA_TYPE::FLOAT) + else if (constraint->requiredType == DATA_TYPE::FLOAT) return new FloatValue(num); // Else it must be a List else @@ -442,7 +442,7 @@ std::string Hazelnupp::GenerateDocumentation() const ParamDocEntry& cached = paramInfos[it.first]; cached.required = it.second.required; cached.typeIsForced = it.second.constrainType; - cached.type = DataTypeToString(it.second.wantedType); + cached.type = DataTypeToString(it.second.requiredType); std::stringstream defaultValueSs; for (const std::string& s : it.second.defaultValue) diff --git a/Hazelnupp/ParamConstraint.h b/Hazelnupp/ParamConstraint.h index 32a3981..3d4ce7e 100644 --- a/Hazelnupp/ParamConstraint.h +++ b/Hazelnupp/ParamConstraint.h @@ -23,20 +23,20 @@ namespace Hazelnp } //! Constructs a type-safety constraint - static ParamConstraint TypeSafety(DATA_TYPE wantedType, bool constrainType = true) + static ParamConstraint TypeSafety(DATA_TYPE requiredType, bool constrainType = true) { ParamConstraint pc; pc.constrainType = constrainType; - pc.wantedType = wantedType; + pc.requiredType = requiredType; return pc; } //! Whole constructor - ParamConstraint(bool constrainType, DATA_TYPE wantedType, const std::vector& defaultValue, bool required) + ParamConstraint(bool constrainType, DATA_TYPE requiredType, const std::vector& defaultValue, bool required) : constrainType{ constrainType }, - wantedType{ wantedType }, + requiredType{ requiredType }, defaultValue{ defaultValue }, required{ required } { @@ -48,7 +48,7 @@ namespace Hazelnp bool constrainType = false; //! Constrain the parameter to this value. Requires `constrainType` to be set to true. - DATA_TYPE wantedType = DATA_TYPE::VOID; + DATA_TYPE requiredType = DATA_TYPE::VOID; //! The default value for this parameter. //! Gets applied if this parameter was not given. diff --git a/Test_Hazelnupp/Constraints.cpp b/Test_Hazelnupp/Constraints.cpp index 04055ac..31eca99 100644 --- a/Test_Hazelnupp/Constraints.cpp +++ b/Test_Hazelnupp/Constraints.cpp @@ -20,15 +20,15 @@ namespace TestHazelnupp "/my/fake/path/wahoo.out", "--dummy", "123" - }); + }); // Exercise Hazelnupp nupp; nupp.SetCrashOnFail(false); - nupp.RegisterConstraint("--elenor-int", ParamConstraint::Require({"5994"})); + nupp.RegisterConstraint("--elenor-int", ParamConstraint::Require({ "5994" })); nupp.RegisterConstraint("--federich-float", ParamConstraint::Require({ "420.69" })); - nupp.RegisterConstraint("--siegbert-string", ParamConstraint::Require({"banana"})); + nupp.RegisterConstraint("--siegbert-string", ParamConstraint::Require({ "banana" })); nupp.RegisterConstraint("--lieber-liste", ParamConstraint::Require({ "banana", "apple", "59" })); nupp.Parse(C_Ify(args)); @@ -72,16 +72,16 @@ namespace TestHazelnupp "banana", "apple", "59" - }); + }); // Exercise Hazelnupp nupp; nupp.SetCrashOnFail(false); nupp.RegisterConstraint("--elenor-int", ParamConstraint::Require({ "6871" })); - nupp.RegisterConstraint("--federich-float", ParamConstraint::Require({"-199.44"})); - nupp.RegisterConstraint("--siegbert-string", ParamConstraint::Require({"bornana"})); - nupp.RegisterConstraint("--lieber-liste", ParamConstraint::Require({"bornana", "ollpe", "5"})); + nupp.RegisterConstraint("--federich-float", ParamConstraint::Require({ "-199.44" })); + nupp.RegisterConstraint("--siegbert-string", ParamConstraint::Require({ "bornana" })); + nupp.RegisterConstraint("--lieber-liste", ParamConstraint::Require({ "bornana", "ollpe", "5" })); nupp.Parse(C_Ify(args)); @@ -126,7 +126,7 @@ namespace TestHazelnupp "9", "--force", "plsdontuseme" - }); + }); // Exercise Hazelnupp nupp; @@ -184,7 +184,7 @@ namespace TestHazelnupp "banana", "apple", "59" - }); + }); Assert::ExpectException( [args] @@ -199,7 +199,7 @@ namespace TestHazelnupp nupp.Parse(C_Ify(args)); } - ); + ); return; } @@ -222,7 +222,7 @@ namespace TestHazelnupp "banana", "apple", "59" - }); + }); Assert::ExpectException( [args] @@ -232,12 +232,12 @@ namespace TestHazelnupp nupp.RegisterConstraint( "--elenor-int", - ParamConstraint::TypeSafety( DATA_TYPE::INT) + ParamConstraint::TypeSafety(DATA_TYPE::INT) ); nupp.Parse(C_Ify(args)); } - ); + ); return; } @@ -259,7 +259,7 @@ namespace TestHazelnupp "--void5", "foo", "baz" - }); + }); Hazelnupp nupp; nupp.SetCrashOnFail(false); @@ -292,7 +292,7 @@ namespace TestHazelnupp "/my/fake/path/wahoo.out", "--dummy", "--empty-list", - }); + }); Hazelnupp nupp; nupp.SetCrashOnFail(false); @@ -321,7 +321,7 @@ namespace TestHazelnupp "/my/fake/path/wahoo.out", "--dummy", "--empty-string", - }); + }); Hazelnupp nupp; nupp.SetCrashOnFail(false); @@ -349,7 +349,7 @@ namespace TestHazelnupp ArgList args({ "/my/fake/path/wahoo.out", "--thisisvoid", - }); + }); // Test section: INT Assert::ExpectException([args] @@ -406,14 +406,14 @@ namespace TestHazelnupp "/my/fake/path/wahoo.out", "--dummy", "--empty-list", - }); + }); Hazelnupp nupp; nupp.SetCrashOnFail(false); nupp.RegisterConstraint( "--default-val", - ParamConstraint::Require({"32"}, true) + ParamConstraint::Require({ "32" }, true) ); nupp.RegisterConstraint( @@ -444,7 +444,7 @@ namespace TestHazelnupp "/my/fake/path/wahoo.out", "--dummy", "--empty-list", - }); + }); Hazelnupp nupp; nupp.SetCrashOnFail(false); @@ -471,7 +471,7 @@ namespace TestHazelnupp "/my/fake/path/wahoo.out", "--dummy", "--empty-list", - }); + }); Hazelnupp nupp; nupp.SetCrashOnFail(false); @@ -501,14 +501,14 @@ namespace TestHazelnupp "/my/fake/path/wahoo.out", "--dummy", "--empty-list", - }); + }); Hazelnupp nupp; nupp.SetCrashOnFail(false); - ParamConstraint dftvalConst_expected = - ParamConstraint::Require({"32"}, true); - + ParamConstraint dftvalConst_expected = + ParamConstraint::Require({ "32" }, true); + nupp.RegisterConstraint("--default-val", dftvalConst_expected); nupp.RegisterConstraint("--not-there", ParamConstraint::Require({}, true)); nupp.RegisterConstraint("--another-one", ParamConstraint::Require({ "bites" }, true)); @@ -519,7 +519,7 @@ namespace TestHazelnupp // Verify Assert::IsTrue(dftvalConst_expected.required == dftvalConst.required, L"required"); Assert::IsTrue(dftvalConst_expected.defaultValue == dftvalConst.defaultValue, L"defaultValue"); - Assert::IsTrue(dftvalConst_expected.wantedType == dftvalConst.wantedType, L"wantedType"); + Assert::IsTrue(dftvalConst_expected.requiredType == dftvalConst.requiredType, L"requiredType"); Assert::IsTrue(dftvalConst_expected.constrainType == dftvalConst.constrainType, L"constrainType"); return; diff --git a/readme.md b/readme.md index d139063..252abf5 100644 --- a/readme.md +++ b/readme.md @@ -244,7 +244,7 @@ Note that you can also combine these two constraint-types by populating the stru ```cpp ParamConstraint pc; pc.constrainType = true; -pc.wantedType = DATA_TYPE::STRING; +pc.requiredType = DATA_TYPE::STRING; pc.defaultValue = {}; // no default value pc.required = true;