Merge pull request #204 from Andersama/patch-negated-sets

hanickadot · web-flow · commit 95afdd80f3a9 · 2021-07-17T07:26:52.000+02:00
diff --git a/include/ctre/first.hpp b/include/ctre/first.hpp
@@ -282,7 +282,7 @@ template <typename... Content> constexpr auto calculate_first(Content...) noexce
 
 // calculate mutual exclusivity
 template <typename... Content> constexpr size_t calculate_size_of_first(ctre::negative_set<Content...>) {
-	return 1 + 1 * sizeof...(Content);
+	return 1 + calculate_size_of_first(ctre::set<Content...>{});
 }
 
 template <auto... V> constexpr size_t calculate_size_of_first(ctre::enumeration<V...>) {
diff --git a/single-header/ctre-unicode.hpp b/single-header/ctre-unicode.hpp
@@ -3722,7 +3722,7 @@ template <typename... Content> constexpr auto calculate_first(Content...) noexce
 
 // calculate mutual exclusivity
 template <typename... Content> constexpr size_t calculate_size_of_first(ctre::negative_set<Content...>) {
-	return 1 + 1 * sizeof...(Content);
+	return 1 + calculate_size_of_first(ctre::set<Content...>{});
 }
 
 template <auto... V> constexpr size_t calculate_size_of_first(ctre::enumeration<V...>) {
diff --git a/single-header/ctre.hpp b/single-header/ctre.hpp
@@ -3719,7 +3719,7 @@ template <typename... Content> constexpr auto calculate_first(Content...) noexce
 
 // calculate mutual exclusivity
 template <typename... Content> constexpr size_t calculate_size_of_first(ctre::negative_set<Content...>) {
-	return 1 + 1 * sizeof...(Content);
+	return 1 + calculate_size_of_first(ctre::set<Content...>{});
 }
 
 template <auto... V> constexpr size_t calculate_size_of_first(ctre::enumeration<V...>) {

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ template <typename... Content> constexpr auto calculate_first(Content...) noexce`
`282`	`282`
`283`	`283`	`// calculate mutual exclusivity`
`284`	`284`	`template <typename... Content> constexpr size_t calculate_size_of_first(ctre::negative_set<Content...>) {`
`285`		`- return 1 + 1 * sizeof...(Content);`
	`285`	`+ return 1 + calculate_size_of_first(ctre::set<Content...>{});`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`template <auto... V> constexpr size_t calculate_size_of_first(ctre::enumeration<V...>) {`
Original file line number	Diff line number	Diff line change
`@@ -3722,7 +3722,7 @@ template <typename... Content> constexpr auto calculate_first(Content...) noexce`
`3722`	`3722`
`3723`	`3723`	`// calculate mutual exclusivity`
`3724`	`3724`	`template <typename... Content> constexpr size_t calculate_size_of_first(ctre::negative_set<Content...>) {`
`3725`		`- return 1 + 1 * sizeof...(Content);`
	`3725`	`+ return 1 + calculate_size_of_first(ctre::set<Content...>{});`
`3726`	`3726`	`}`
`3727`	`3727`
`3728`	`3728`	`template <auto... V> constexpr size_t calculate_size_of_first(ctre::enumeration<V...>) {`
Original file line number	Diff line number	Diff line change
`@@ -3719,7 +3719,7 @@ template <typename... Content> constexpr auto calculate_first(Content...) noexce`
`3719`	`3719`
`3720`	`3720`	`// calculate mutual exclusivity`
`3721`	`3721`	`template <typename... Content> constexpr size_t calculate_size_of_first(ctre::negative_set<Content...>) {`
`3722`		`- return 1 + 1 * sizeof...(Content);`
	`3722`	`+ return 1 + calculate_size_of_first(ctre::set<Content...>{});`
`3723`	`3723`	`}`
`3724`	`3724`
`3725`	`3725`	`template <auto... V> constexpr size_t calculate_size_of_first(ctre::enumeration<V...>) {`