Merge pull request #1141 from monarchdodra/Fun

Improve XnaryFun argument passing
dlang · Jan 25, 2014 · 19b4deb · 19b4deb
2 parents bcf2be7 + 6ceda93
commit 19b4deb
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/std/functional.d b/std/functional.d
@@ -36,25 +36,14 @@ assert(isEven(2) && !isEven(1));
 ----
 */
 
-template unaryFun(alias fun, bool byRef = false, string parmName = "a")
+template unaryFun(alias fun, string parmName = "a")
 {
     static if (is(typeof(fun) : string))
     {
-        static if (byRef)
+        auto unaryFun(ElementType)(auto ref ElementType __a)
         {
-            auto unaryFun(ElementType)(ref ElementType __a)
-            {
-                mixin("alias __a "~parmName~";");
-                mixin("return (" ~ fun ~ ");");
-            }
-        }
-        else
-        {
-            auto unaryFun(ElementType)(ElementType __a)
-            {
-                mixin("alias __a "~parmName~";");
-                mixin("return (" ~ fun ~ ");");
-            }
+            mixin("alias " ~ parmName ~ " = __a ;");
+            return mixin(fun);
         }
     }
     else
@@ -63,6 +52,13 @@ template unaryFun(alias fun, bool byRef = false, string parmName = "a")
     }
 }
 
+/+ Undocumented, will be removed December 2014+/
+deprecated("Parameter byRef is obsolete. Please call unaryFun!(fun, parmName) directly.")
+template unaryFun(alias fun, bool byRef, string parmName = "a")
+{
+    alias unaryFun = unaryFun!(fun, parmName);
+}
+
 unittest
 {
     static int f1(int a) { return a + 1; }
@@ -99,11 +95,11 @@ template binaryFun(alias fun, string parm1Name = "a",
     static if (is(typeof(fun) : string))
     {
         auto binaryFun(ElementType1, ElementType2)
-            (ElementType1 __a, ElementType2 __b)
+            (auto ref ElementType1 __a, auto ref ElementType2 __b)
         {
-            mixin("alias __a "~parm1Name~";");
-            mixin("alias __b "~parm2Name~";");
-            mixin("return (" ~ fun ~ ");");
+            mixin("alias "~parm1Name~" = __a ;");
+            mixin("alias "~parm2Name~" = __b ;");
+            return mixin(fun);
         }
     }
     else