Merge pull request #17 from LoopPerfect/p15

P15

BUCK

@@ -1,11 +1,15 @@
-cxx_library(
+prebuilt_cxx_library(
   name = 'neither',
+  header_only = True,
   header_namespace = 'neither',
   exported_headers = subdir_glob([
     ('neither/include', '**/*.hpp'),
   ]),
+  licenses = [
+    'LICENSE.txt',
+  ],
   visibility = [
-    'PUBLIC',
+    'PUBLIC'
   ],
 )
 
@@ -14,9 +18,10 @@ cxx_test(
   srcs = glob([
     'neither/tests/**/*.cpp',
   ]),
-  platform_compiler_flags = [
-    ('^linux.*', [ '-lpthread' ]),
+  platform_linker_flags = [
+    ('^linux.*', [ '-lpthread', ]),
   ],
+  link_style = 'shared',
   deps = [
     ':neither',
   ],

neither/include/maybe.hpp

@@ -2,6 +2,7 @@
 #define NEITHER_MAYBE_HPP
 
 #include <memory>
+#include <cassert>
 #include <neither/traits.hpp>
 
 namespace neither {
@@ -38,9 +39,12 @@ template <class T> struct Maybe {
   }
 
   constexpr T get(T defaultValue) {
-    if (hasValue)
-      return value;
-    return defaultValue;
+    return hasValue ? value : defaultValue;
+  }
+
+  constexpr T unsafeGet() {
+    assert(hasValue && "unsafeGet must not be called on an empty Maybe");
+    return value;
   }
 
   template<class F>

neither/tests/maybe.cpp

@@ -28,6 +28,11 @@ TEST(neither, maybe_flatMap_no_value) {
   ASSERT_TRUE(x.flatMap([](auto x) { return maybe<int>(); }).get(1) == 1);
 }
 
+TEST(neither, maybe_unsafe_get_with_value) {
+  auto x = maybe<int>(42);
+  ASSERT_TRUE(x.unsafeGet() == 42);
+}
+
 TEST(neither, maybe_comparison) {
 
   auto a = maybe<int>(42);