is_subconstraint(): fix the rational case

N-Nagorny · N-Nagorny · commit 64f27ec2b640 · 2022-07-21T01:13:30.000+03:00
diff --git a/Development/nmos/constraints.cpp b/Development/nmos/constraints.cpp
@@ -117,6 +117,10 @@ namespace nmos
                 const auto& subconstraint_enum_values = nmos::fields::constraint_enum(subconstraint).as_array();
                 if (subconstraint_enum_values.end() == std::find_if(subconstraint_enum_values.begin(), subconstraint_enum_values.end(), [&constraint](const web::json::value& enum_value)
                 {
+                    if (enum_value.has_field(nmos::fields::numerator))
+                    {
+                        return details::match_constraint(nmos::parse_rational(enum_value), constraint, [](const web::json::value& v) { return nmos::parse_rational(v); });
+                    }
                     return details::match_constraint(enum_value, constraint, [](const web::json::value& v) { return v; });
                 }))
                 {

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,10 @@ namespace nmos`
`117`	`117`	`const auto& subconstraint_enum_values = nmos::fields::constraint_enum(subconstraint).as_array();`
`118`	`118`	`if (subconstraint_enum_values.end() == std::find_if(subconstraint_enum_values.begin(), subconstraint_enum_values.end(), [&constraint](const web::json::value& enum_value)`
`119`	`119`	`{`
	`120`	`+ if (enum_value.has_field(nmos::fields::numerator))`
	`121`	`+ {`
	`122`	`+ return details::match_constraint(nmos::parse_rational(enum_value), constraint, [](const web::json::value& v) { return nmos::parse_rational(v); });`
	`123`	`+ }`
`120`	`124`	`return details::match_constraint(enum_value, constraint, [](const web::json::value& v) { return v; });`
`121`	`125`	`}))`
`122`	`126`	`{`