Skip to content

Accept Maybe<T>&& in maybe_if. (still bound as lvalues in MaybeIfImpl) #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Accept Maybe<T>&& in maybe_if. (still bound as lvalues in MaybeIfImpl) #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions base/maybe.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,14 @@ struct MaybeIfImpl {


template <typename M, typename Functor>
auto maybe_if(M& m, Functor function)
auto maybe_if(M&& m, Functor function)
-> typename MaybeIfImpl<M, decltype(function(m.infer_value_type()))>::ResultType
{
return MaybeIfImpl<M, decltype(function(m.infer_value_type()))>::maybe_if(m, function);
}

template <typename M, typename Functor>
auto maybe_if(M& m, Functor function)
auto maybe_if(M&& m, Functor function)
-> typename MaybeIfImpl<M, decltype(function(*m))>::ResultType
{
return MaybeIfImpl<M, decltype(function(*m))>::maybe_if(m, function);
Expand Down
6 changes: 3 additions & 3 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ CXXFLAGS = -O0 -g -I.. -std=c++11 -stdlib=libc++ -Wall -Werror -Wno-unused
CXX = clang++
COMPILE = $(CXX) $(CXXFLAGS)

maybe_test: maybe_test.cpp ../maybe.hpp
maybe_test: maybe_test.cpp ../base/maybe.hpp
$(COMPILE) -o maybe_test maybe_test.cpp

test:
test: maybe_test
./maybe_test

clean:
rm -f maybe_test

all: maybe_test
all: maybe_test
14 changes: 12 additions & 2 deletions test/maybe_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "maybe.hpp"
#include "../base/maybe.hpp"

#if defined(__has_feature) && __has_feature(cxx_lambdas)
#define HAS_LAMBDAS 1
Expand Down Expand Up @@ -271,6 +271,15 @@ void test_maybe_if() {
m = maybe_if(p, [](int it) { return it; });
ASSERT(!m);
}

// Test rvalue Maybe<>
{
int n = 123;
int observed = 0;
auto m = maybe_if(Maybe<int>(123), [&](int it) { observed = it; });
ASSERT(m);
ASSERT(observed == 123);
}
}

int main (int argc, char const *argv[])
Expand Down Expand Up @@ -375,5 +384,6 @@ int main (int argc, char const *argv[])

test_maybe_if();

printf("All tests passed\n");
return 0;
}
}