mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename synthesized -> superposed

Browse source
This commit is contained in:
bolero-MURAKAMI 2012-11-17 21:47:52 +09:00
parent ded2da84ea
commit 16306fed82
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sprout/compost/effects.hpp
View file

@ -14,7 +14,7 @@
#include <sprout/compost/effects/vibrato.hpp> #include <sprout/compost/effects/vibrato.hpp>
#include <sprout/compost/effects/chorus.hpp> #include <sprout/compost/effects/chorus.hpp>
#include <sprout/compost/effects/noise_gated.hpp> #include <sprout/compost/effects/noise_gated.hpp>
#include <sprout/compost/effects/synthesized.hpp> #include <sprout/compost/effects/superposed.hpp>
#include <sprout/compost/effects/jointed.hpp> #include <sprout/compost/effects/jointed.hpp>
#include <sprout/compost/effects/copied.hpp> #include <sprout/compost/effects/copied.hpp>

30
sprout/compost/effects/synthesized.hpp → sprout/compost/effects/superposed.hpp
View file

@ -1,5 +1,5 @@
#ifndef SPROUT_COMPOST_EFFECTS_SYNTHESIZED_HPP #ifndef SPROUT_COMPOST_EFFECTS_SUPERPOSED_HPP
#define SPROUT_COMPOST_EFFECTS_SYNTHESIZED_HPP #define SPROUT_COMPOST_EFFECTS_SUPERPOSED_HPP
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/functional/plus.hpp> #include <sprout/functional/plus.hpp>
@ -11,18 +11,18 @@ namespace sprout {
namespace compost { namespace compost {
namespace effects { namespace effects {
// //
// synthesize_holder // superpose_holder
// //
template<typename RRange> template<typename RRange>
class synthesize_holder { class superpose_holder {
public: public:
typedef RRange range2_type; typedef RRange range2_type;
private: private:
sprout::value_holder<range2_type&> range_; sprout::value_holder<range2_type&> range_;
public: public:
synthesize_holder() = default; superpose_holder() = default;
synthesize_holder(synthesize_holder const&) = default; superpose_holder(superpose_holder const&) = default;
explicit SPROUT_CONSTEXPR synthesize_holder(range2_type& range) explicit SPROUT_CONSTEXPR superpose_holder(range2_type& range)
: range_(range) : range_(range)
{} {}
SPROUT_CONSTEXPR range2_type& range() const { SPROUT_CONSTEXPR range2_type& range() const {
@ -31,16 +31,16 @@ namespace sprout {
}; };
// //
// synthesized_forwarder // superposed_forwarder
// //
class synthesized_forwarder { class superposed_forwarder {
public: public:
template<typename RRange> template<typename RRange>
SPROUT_CONSTEXPR sprout::compost::effects::synthesize_holder< SPROUT_CONSTEXPR sprout::compost::effects::superpose_holder<
typename std::remove_reference<typename sprout::lvalue_reference<RRange>::type>::type typename std::remove_reference<typename sprout::lvalue_reference<RRange>::type>::type
> >
operator()(RRange&& range) { operator()(RRange&& range) {
return sprout::compost::effects::synthesize_holder< return sprout::compost::effects::superpose_holder<
typename std::remove_reference<typename sprout::lvalue_reference<RRange>::type>::type typename std::remove_reference<typename sprout::lvalue_reference<RRange>::type>::type
>( >(
sprout::lvalue_forward<RRange>(range) sprout::lvalue_forward<RRange>(range)
@ -49,10 +49,10 @@ namespace sprout {
}; };
// //
// synthesized // superposed
// //
namespace { namespace {
SPROUT_STATIC_CONSTEXPR sprout::compost::effects::synthesized_forwarder synthesized{}; SPROUT_STATIC_CONSTEXPR sprout::compost::effects::superposed_forwarder superposed{};
} // anonymous-namespace } // anonymous-namespace
// //
@ -60,7 +60,7 @@ namespace sprout {
// //
template<typename Range, typename T> template<typename Range, typename T>
inline SPROUT_CONSTEXPR auto inline SPROUT_CONSTEXPR auto
operator|(Range&& lhs, sprout::compost::effects::synthesize_holder<T> const& rhs) operator|(Range&& lhs, sprout::compost::effects::superpose_holder<T> const& rhs)
-> decltype( -> decltype(
sprout::forward<Range>(lhs) sprout::forward<Range>(lhs)
| sprout::adaptors::transformed(rhs.range(), sprout::plus<>()) | sprout::adaptors::transformed(rhs.range(), sprout::plus<>())
@ -74,4 +74,4 @@ namespace sprout {
} // namespace compost } // namespace compost
} // namespace sprout } // namespace sprout
#endif // #ifndef SPROUT_COMPOST_EFFECTS_SYNTHESIZED_HPP #endif // #ifndef SPROUT_COMPOST_EFFECTS_SUPERPOSED_HPP