From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Wed, 7 Feb 2018 12:34:18 +0000 (+0200)
Subject: Merge "(refs #7751) Added orElseM"
X-Git-Tag: v1.43.0~136^2~600
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=52e4de12339bc824f878f1086adf8580b5c7adf1;hp=9ad7e1083f6c05bc19febf7b40bfe41db26c3877

Merge "(refs #7751) Added orElseM"
---

diff --git a/bundles/org.simantics.scl.runtime/scl/Prelude.scl b/bundles/org.simantics.scl.runtime/scl/Prelude.scl
index 7e558bdc4..2be6ed745 100644
--- a/bundles/org.simantics.scl.runtime/scl/Prelude.scl
+++ b/bundles/org.simantics.scl.runtime/scl/Prelude.scl
@@ -1305,6 +1305,11 @@ orElse :: Maybe a -> (<e> a) -> <e> a
 orElse (Just x) _   = x
 orElse Nothing  def = def
 
+@inline
+orElseM :: Maybe a -> (<e> Maybe a) -> <e> Maybe a
+orElseM mx@(Just x) _   = mx
+orElseM Nothing     def = def
+
 /// Either ///
 
 """