From 52517675a599825fdd3bf463af8b5c7943e8b784 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Sun, 4 Jun 2023 17:31:47 +0200
Subject: [PATCH] EFor: F argument

---
 src/include/ranges/eindex.cc.h |  3 +--
 src/include/xpr/for.cc.h       | 47 ++++++++++++++++++++++++----------
 src/include/xpr/for.h          |  5 ++--
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/src/include/ranges/eindex.cc.h b/src/include/ranges/eindex.cc.h
index a566125..f4d1dad 100644
--- a/src/include/ranges/eindex.cc.h
+++ b/src/include/ranges/eindex.cc.h
@@ -19,8 +19,7 @@ namespace CNORXZ
     template <class Xpr, class F>
     decltype(auto) EIndex<MetaT,S>::ifor(const Xpr& xpr, F&& f) const
     {
-	// TODO: EFor Function argument; meanwhile ignore unused function error!!!
-	return EFor<S,0,Xpr>(this->id(), xpr);
+	return EFor<S,0,Xpr>(this->id(), xpr, std::forward<F>(f));
     }
 
 }
diff --git a/src/include/xpr/for.cc.h b/src/include/xpr/for.cc.h
index 90d861c..3a3c672 100644
--- a/src/include/xpr/for.cc.h
+++ b/src/include/xpr/for.cc.h
@@ -389,31 +389,52 @@ namespace CNORXZ
      *   EFor   *
      ************/
 
-    template <SizeT N, SizeT L, class Xpr>
-    constexpr EFor<N,L,Xpr>::EFor(const IndexId<L>& id, const Xpr& xpr) :
+    template <SizeT N, SizeT L, class Xpr, class F>
+    constexpr EFor<N,L,Xpr,F>::EFor(const IndexId<L>& id, const Xpr& xpr, F&& f) :
 	mId(id),
 	mXpr(xpr),
-	mExt(mXpr.RootSteps(mId))
+	mExt(mXpr.RootSteps(mId)),
+	mF(std::forward<F>(f))
     {}
 
-    template <SizeT N, SizeT L, class Xpr>
+    template <SizeT N, SizeT L, class Xpr, class F>
     template <class PosT>
-    constexpr decltype(auto) EFor<N,L,Xpr>::operator()(const PosT& last) const
+    constexpr decltype(auto) EFor<N,L,Xpr,F>::operator()(const PosT& last) const
     {
-	auto pos = mkEPos<N>(last, mExt);
-	return mXpr(pos);
+	if constexpr(std::is_same<typename std::remove_reference<F>::type,NoF>::value){
+	    const auto pos = mkEPos<N>(last, mExt);
+	    mXpr(pos);
+	}
+	else {
+	    typedef typename
+		std::remove_reference<decltype(mXpr(mkEPos<N>(SPos<0>(), mExt)))>::type OutT;
+	    auto o = OutT();
+	    const auto pos = mkEPos<N>(last, mExt);
+	    mF(o, mXpr(pos));
+	    return o;
+	}
     }
 	
-    template <SizeT N, SizeT L, class Xpr>
-    constexpr decltype(auto) EFor<N,L,Xpr>::operator()() const
+    template <SizeT N, SizeT L, class Xpr, class F>
+    constexpr decltype(auto) EFor<N,L,Xpr,F>::operator()() const
     {
-	auto pos = mkEPos<N>(SPos<0>(), mExt);
-	return mXpr(pos);
+	if constexpr(std::is_same<typename std::remove_reference<F>::type,NoF>::value){
+	    const auto pos = mkEPos<N>(SPos<0>(), mExt);
+	    mXpr(pos);
+	}
+	else {
+	    typedef typename
+		std::remove_reference<decltype(mXpr(mkEPos<N>(SPos<0>(), mExt)))>::type OutT;
+	    auto o = OutT();
+	    const auto pos = mkEPos<N>(SPos<0>(), mExt);
+	    mF(o, mXpr(pos));
+	    return o;
+	}
     }
 
-    template <SizeT N, SizeT L, class Xpr>
+    template <SizeT N, SizeT L, class Xpr, class F>
     template <SizeT I>
-    constexpr decltype(auto) EFor<N,L,Xpr>::rootSteps(const IndexId<I>& id) const
+    constexpr decltype(auto) EFor<N,L,Xpr,F>::rootSteps(const IndexId<I>& id) const
     {
 	return mXpr.rootSteps(id);
     }
diff --git a/src/include/xpr/for.h b/src/include/xpr/for.h
index 1ef46fd..ea56ade 100644
--- a/src/include/xpr/for.h
+++ b/src/include/xpr/for.h
@@ -149,13 +149,13 @@ namespace CNORXZ
     };
 
     // Extension For (Vectorization)
-    template <SizeT N, SizeT L, class Xpr>
+    template <SizeT N, SizeT L, class Xpr, class F = NoF>
     class EFor : public XprInterface<EFor<N,L,Xpr>>
     {
     public:
 	DEFAULT_MEMBERS(EFor);
 
-	constexpr EFor(const IndexId<L>& id, const Xpr& xpr);
+	constexpr EFor(const IndexId<L>& id, const Xpr& xpr, F&& f);
 
 	template <class PosT>
 	constexpr decltype(auto) operator()(const PosT& last) const;
@@ -170,6 +170,7 @@ namespace CNORXZ
 	Xpr mXpr;
 	typedef decltype(mXpr.rootSteps(mId)) XPosT;
 	XPosT mExt;
+	F mF;
     };
     
 }