Improve the find_unused_types.sh script, remove some more unused types.

find_unused_types.sh

@@ -2,7 +2,23 @@
 
 # This script greps the source code trying to find unused types.
 
-for I in $(egrep -R '^ *(class|struct) ' include/ src/ | sed -e 's/.*class \([a-zA-Z0-9_]*\).*/\1/;s/.*struct \([a-zA-Z0-9_]*\).*/\1/' | sort | uniq)
+TYPES=($(egrep -R '^( *class| *struct|using) ' include/ src/ | sed -e 's/.*\(class\|struct\|using\) \([a-zA-Z0-9_]*\).*/\2/' | sort | uniq))
+
+echo Candidates:
+for I in ${TYPES[@]}
+do
+  N=$(fgrep -Rl "$I" include/ src/ | wc -l)
+  if [ $N == 1 ]
+  then
+    echo "$I"
+    grep -R "$I" include/ src/
+    echo
+  fi
+done
+
+
+echo Strong candidates:
+for I in ${TYPES[@]}
 do
   N=$(fgrep -R "$I" include/ src/ | egrep -v '.*: *(class|struct) '"$I" | wc -l)
   if [ $N == 0 ]

include/fruit/impl/component.utils.h

@@ -210,13 +210,6 @@ struct GetInjectAnnotation {
     using Args = typename std::enable_if<ok, A>::type;
 };
 
-template <typename Dep>
-struct DepRequirementsImpl {
-};
-
-template <typename Dep>
-using DepRequirements = typename DepRequirementsImpl<Dep>::type;
-
 template <typename C, typename Dep>
 using RemoveRequirementFromDep = ConstructSignature<SignatureType<Dep>, remove_from_list<C, SignatureArgs<Dep>>>;
 
@@ -239,10 +232,6 @@ using ConstructDep = ConstructSignature<P*, list_to_set<AddPointerToList<Rs>>>;
 template <typename Rs, typename... P>
 using ConstructDeps = List<ConstructDep<P, Rs>...>;
 
-// In Dep, replaces all requirements for R with the types in Rs
-template <typename Dep, typename R, typename Rs>
-using ReplaceRequirementsInDep = SignatureType<Dep>(replace_with_set<R, Rs, SignatureArgs<Dep>>);
-
 template <typename Dep>
 struct HasSelfLoop : is_in_list<SignatureType<Dep>, SignatureArgs<Dep>> {
 };

include/fruit/impl/metaprogramming.h

@@ -128,15 +128,6 @@ struct is_in_list {}; // Not used
 template <typename T, typename... Ts>
 struct is_in_list<T, List<Ts...>> : static_or<std::is_same<T, Ts>::value...> {};
 
-// ****************************
-// Implementation of list_count
-
-template <typename T, typename L>
-struct list_count {}; // Not used
-
-template <typename T, typename... Ts>
-struct list_count<T, List<Ts...>> : static_sum<std::is_same<T, Ts>::value...> {};
-
 // ****************************
 // Implementation of is_empty_list
 
@@ -165,15 +156,6 @@ struct add_to_set_impl<true, T, L> {
 template <typename T, typename L>
 using add_to_set = typename add_to_set_impl<is_in_list<T, L>::value, T, L>::type;
 
-// ***********************************
-// Implementation of are_sets_disjoint
-
-template <typename L1, typename L2>
-struct are_sets_disjoint {}; // Not used
-
-template <typename... Ts, typename... Us>
-struct are_sets_disjoint<List<Ts...>, List<Us...>> : static_and<is_in_list<Ts, List<Us...>>::value...> {};
-
 // ***********************************
 // Implementation of set_intersection
 
@@ -324,17 +306,6 @@ struct list_size<List<Types...>> {
   static constexpr int value = sizeof...(Types);
 };
 
-template <template<typename T> class Op, typename L>
-struct LiftHelper {};
-
-template <template<typename T> class Op, typename... Ts>
-struct LiftHelper<Op, List<Ts...>> {
-  using type = List<Op<Ts>...>;
-};
-
-template <template<typename T> class Op, typename L>
-using Lift = typename LiftHelper<Op, L>::type;
-
 template <typename L>
 struct AddPointerToListHelper {};