zoolib-checkins Mailing List for zoolib

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2711
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2711&view=rev
Author:   agreen
Date:     2012-02-04 20:55:40 +0000 (Sat, 04 Feb 2012)
Log Message:
-----------
Add sCog_If, which supersedes sCog_Then.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/zoolib/ZCog.h

Modified: trunk/zoolib/source/cxx/zoolib/ZCog.h
===================================================================

--- trunk/zoolib/source/cxx/zoolib/ZCog.h	2012-02-03 07:29:58 UTC (rev 2710)
+++ trunk/zoolib/source/cxx/zoolib/ZCog.h	2012-02-04 20:55:40 UTC (rev 2711)
@@ -107,32 +107,25 @@
 
 //--
 
-	static const ZCog& sFalse();
-	static const ZCog& sTrue();
-	};
+	static const ZCog& sFalse()
+		{
+		static const ZCog<Param> spCog;
+		return spCog;
+		}
 
-template <class Param>
-const ZCog<Param>& ZCog<Param>::sFalse()
-	{
-	static const ZCog<Param> spCog;
-	return spCog;
-	}
+	static ZCog spCogFun_True(const ZCog& iSelf, Param iParam)
+		{
+		// Must not ever call this.
+		ZUnimplemented();
+		}
 
-template <class Param>
-ZCog<Param> spCogFun_True(const ZCog<Param>& iSelf, Param iParam)
-	{
-	// Must not ever call this.
-	ZUnimplemented();
-	return null;
-	}
+	static const ZCog& sTrue()
+		{
+		static const ZCog spCog = sCallable(spCogFun_True);
+		return spCog;
+		}
+	};
 
-template <class Param>
-const ZCog<Param>& ZCog<Param>::sTrue()
-	{
-	static const ZCog<Param> spCog = sCallable(spCogFun_True<Param>);
-	return spCog;
-	}
-
 // =================================================================================================
 // MARK: - Nullary, sCog_Unknown
 
@@ -363,6 +356,9 @@
 ZCog<Param> spCogFun_Repeat(const ZCog<Param>& iSelf, Param iParam,
 	const ZCog<Param>& iCog_Init, const ZCog<Param>& iCog)
 	{
+	// We don't do the usual trick of having iCog be a value param called 'lCog', because we may
+	// need to compare it's original value against iCog_Init later.
+	
 	ZCog<Param> newCog = iCog;
 	if (sCallPendingCog_Unchanged(newCog, iParam))
 		return iSelf;
@@ -410,75 +406,78 @@
 	{ return sCog_Repeat<Param>(iCallable); }
 
 // =================================================================================================
-// MARK: - Binary sequential, sCog_Then
+// MARK: - Ternary sequential, sCog_If
 
 // Call cog0 till it finishes, if true then call cog1
 
 template <class Param>
-ZCog<Param> spCog_Then
-	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
+ZCog<Param> spCog_If
+	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCondition,
+	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1);
 
 template <class Param>
-ZCog<Param> spCogFun_Then(const ZCog<Param>& iSelf, Param iParam,
-	ZCog<Param> lCog, const ZCog<Param>& iCog1)
+ZCog<Param> spCogFun_If(const ZCog<Param>& iSelf, Param iParam,
+	ZCog<Param> lCondition,
+	const ZCog<Param>& iCog0,
+	const ZCog<Param>& iCog1)
 	{
-	if (sCallPendingCog_Unchanged(lCog, iParam))
+	if (sCallPendingCog_Unchanged(lCondition, iParam))
 		return iSelf;
 
-	if (sIsFalse(lCog))
-		return false;
+	if (sIsTrue(lCondition))
+		{
+		if (sIsFinished(iCog0))
+			return iCog0;
+		return iCog0->Call(iCog0, iParam);
+		}
 
-	if (sIsTrue(lCog))
+	if (sIsFalse(lCondition))
 		{
 		if (sIsFinished(iCog1))
 			return iCog1;
 		return iCog1->Call(iCog1, iParam);
 		}
 
-	return spCog_Then(lCog, iCog1);
+	return spCog_If(lCondition, iCog0, iCog1);
 	}
 
 template <class Param>
-ZCog<Param> sCog_Then
-	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
+ZCog<Param> sCog_If
+	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCondition,
+	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
 	{
-	if (sIsFalse(iCallable0))
-		return false;
+	if (sIsTrue(iCondition))
+		return iCallable0;
 
-	if (sIsTrue(iCallable0))
+	if (sIsFalse(iCondition))
 		return iCallable1;
 
-	return spCog_Then(iCallable0, iCallable1);
+	return spCog_If(iCondition, iCallable0, iCallable1);
 	}
 
 template <class Param>
-ZCog<Param> spCog_Then
-	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
+ZCog<Param> spCog_If
+	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCondition,
+	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
 	{
-	if (sIsFalse(iCallable0))
-		return false;
-
-	if (sIsTrue(iCallable0))
-		return iCallable1;
-
-	static ZMACRO_auto(spCallable, sCallable(spCogFun_Then<Param>));
-	return sBindR(spCallable, iCallable0, iCallable1);
+	static ZMACRO_auto(spCallable, sCallable(spCogFun_If<Param>));
+	return sBindR(spCallable, iCondition, iCallable0, iCallable1);
 	}
 
 template <class Param>
 ZCog<Param> operator>>
 	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
-	{ return sCog_Then<Param>(iCallable0, iCallable1); }
+	{ return sCog_If<Param>(iCallable0, iCallable1, null); }
 
 template <class Param>
 ZCog<Param>& operator>>=
 	(ZCog<Param>& ioCog0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
-	{ return ioCog0 = sCog_Then<Param>(ioCog0, iCallable1); }
+	{ return ioCog0 = sCog_If<Param>(ioCog0, iCallable1, null); }
 
 // =================================================================================================
 // MARK: - Binary sequential, sCog_Each
@@ -489,7 +488,8 @@
 ZCog<Param> sCog_Each
 	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
-	{ return +iCallable0 >> iCallable1; }
+	{ return sCog_If(iCallable0, iCallable1, iCallable1); }
+//	{ return +iCallable0 >> iCallable1; }
 
 template <class Param>
 ZCog<Param> operator^

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2002	Jan	Feb	Mar (25)	Apr (97)	May (56)	Jun (29)	Jul (65)	Aug (18)	Sep (14)	Oct (114)	Nov (12)	Dec (40)
2003	Jan (44)	Feb (47)	Mar (109)	Apr (114)	May (47)	Jun (36)	Jul (8)	Aug (23)	Sep (111)	Oct (64)	Nov (57)	Dec (26)
2004	Jan (2)	Feb (18)	Mar (11)	Apr (1)	May (52)	Jun (70)	Jul (37)	Aug (24)	Sep (4)	Oct (27)	Nov (4)	Dec (29)
2005	Jan (8)	Feb (36)	Mar (71)	Apr (31)	May (42)	Jun (2)	Jul (53)	Aug (43)	Sep (41)	Oct (55)	Nov (59)	Dec (51)
2006	Jan (36)	Feb (36)	Mar (19)	Apr (85)	May (33)	Jun (10)	Jul (110)	Aug (44)	Sep (10)	Oct (123)	Nov (27)	Dec
2007	Jan (34)	Feb (16)	Mar (21)	Apr (53)	May (6)	Jun (8)	Jul (117)	Aug (10)	Sep (131)	Oct (13)	Nov (8)	Dec (46)
2008	Jan (47)	Feb (44)	Mar (66)	Apr (2)	May (29)	Jun (37)	Jul (13)	Aug (22)	Sep (32)	Oct (55)	Nov (60)	Dec (108)
2009	Jan (23)	Feb (103)	Mar (98)	Apr (21)	May (78)	Jun (141)	Jul (130)	Aug (60)	Sep (56)	Oct (51)	Nov (26)	Dec (17)
2010	Jan (48)	Feb (49)	Mar (42)	Apr (123)	May (38)	Jun (89)	Jul (34)	Aug (64)	Sep (31)	Oct (113)	Nov (20)	Dec (104)
2011	Jan (110)	Feb (70)	Mar (43)	Apr (30)	May (48)	Jun (115)	Jul (186)	Aug (17)	Sep (69)	Oct (77)	Nov (25)	Dec (25)
2012	Jan (49)	Feb (9)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

zoolib-checkins Mailing List for zoolib

zoolib-checkins — CVS checkin messages are posted to this list as they occur.