Thread: [ZooLib-checkins] SF.net SVN: zoolib:[1260] trunk/zoolib/source/cxx (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1260
          http://zoolib.svn.sourceforge.net/zoolib/?rev=1260&view=rev
Author:   agreen
Date:     2010-04-08 19:03:27 +0000 (Thu, 08 Apr 2010)

Log Message:
-----------
ZVisitor seems to be quite useful -- create a base class
that Visits ZRefCountedWithFinalization instances, and hook
ZVisitor_ExprRep and ZVisitor_Yad to it.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/more/zoolib/tql/ZTQLTest.cpp
    trunk/zoolib/source/cxx/zoolib/ZExprRep.cpp
    trunk/zoolib/source/cxx/zoolib/ZExprRep.h
    trunk/zoolib/source/cxx/zoolib/ZRef_Counted.cpp
    trunk/zoolib/source/cxx/zoolib/ZRef_Counted.h
    trunk/zoolib/source/cxx/zoolib/ZYad.cpp
    trunk/zoolib/source/cxx/zoolib/ZYad.h

Modified: trunk/zoolib/source/cxx/more/zoolib/tql/ZTQLTest.cpp
===================================================================

--- trunk/zoolib/source/cxx/more/zoolib/tql/ZTQLTest.cpp	2010-04-08 17:58:27 UTC (rev 1259)
+++ trunk/zoolib/source/cxx/more/zoolib/tql/ZTQLTest.cpp	2010-04-08 19:03:27 UTC (rev 1260)
@@ -109,7 +109,7 @@
 
 static void sTesterfsdfsdf()
 	{
-	Condition theCondition = CName("Object").EQ(CConst("view"));
+	Condition theCondition = CName("Object") == CConst("view");
 	}
 
 static const string sProps_note[] = { "Object", "titl", "crea", "text", "stat" };
@@ -120,14 +120,14 @@
 
 static Query sNotesWithIDs()
 	{
-	return sAllID("noteID", sRelHead_note) & (CName("Object").EQ(CConst("note")));
+	return sAllID("noteID", sRelHead_note) & (CName("Object") == CConst("note"));
 	}
 
 static const string sProps_Link[] = { "Link", "from", "to" };
 static const RelHead sRelHead_Link(sProps_Link, countof(sProps_Link));
 static Query sLinks_Owns()
 	{
-	return sAll(sRelHead_Link) & (CName("Link").EQ(CConst("owns")));
+	return sAll(sRelHead_Link) & (CName("Link") == CConst("owns"));
 	}
 
 static void sTest()
@@ -233,7 +233,7 @@
 
 static Query sAllNotesNoHead()
 	{
-	return sAllID("$ID$") & (CName("Object").EQ(CConst("note")));
+	return sAllID("$ID$") & (CName("Object") == CConst("note"));
 	}
 
 static Query sAllViews()
@@ -245,13 +245,13 @@
 static Query sAllViewsNoHead()
 	{
 //	return sAllID("$ID$", sRelHead_view) & Spec(true);
-	return sAllID("$ID$") & (CName("Object").EQ(CConst("view")));
+	return sAllID("$ID$") & (CName("Object") == CConst("view"));
 	}
 
 static Query sAllContains()
 	{
 	Query theQuery = sAll(sRelHead_Link) & (CName("Link") == CConst("contains"));
-//	Query theQuery = sAll(sRelHead_Link) & (CName("Link").EQ(CConst("contains")));
+//	Query theQuery = sAll(sRelHead_Link) & EQ(CName("Link"), CConst("contains")));
 	return sDrop(theQuery, "Link");
 	}
 

Modified: trunk/zoolib/source/cxx/zoolib/ZExprRep.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExprRep.cpp	2010-04-08 17:58:27 UTC (rev 1259)
+++ trunk/zoolib/source/cxx/zoolib/ZExprRep.cpp	2010-04-08 19:03:27 UTC (rev 1260)
@@ -32,6 +32,19 @@
 ZExprRep::~ZExprRep()
 	{}
 
+bool ZExprRep::Accept(ZVisitor& iVisitor)
+	{
+	if (ZVisitor_ExprRep* theVisitor =
+		dynamic_cast<ZVisitor_ExprRep*>(&iVisitor))
+		{
+		return this->Accept(*theVisitor);
+		}
+	else
+		{
+		return ZRefCountedWithFinalize::Accept(iVisitor);
+		}
+	}
+
 bool ZExprRep::Accept(ZVisitor_ExprRep& iVisitor)
 	{ return iVisitor.Visit_ExprRep(this); }
 
@@ -40,6 +53,6 @@
 #pragma mark * ZVisitor_ExprRep
 
 bool ZVisitor_ExprRep::Visit_ExprRep(ZRef<ZExprRep> iRep)
-	{ return true; }
+	{ return ZVisitor::Visit(iRep); }
 
 NAMESPACE_ZOOLIB_END

Modified: trunk/zoolib/source/cxx/zoolib/ZExprRep.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExprRep.h	2010-04-08 17:58:27 UTC (rev 1259)
+++ trunk/zoolib/source/cxx/zoolib/ZExprRep.h	2010-04-08 19:03:27 UTC (rev 1260)
@@ -40,6 +40,10 @@
 public:
 	virtual ~ZExprRep();
 
+// From ZRefCountedWithFinalize
+	virtual bool Accept(ZVisitor& iVisitor);
+
+// Our protocol
 	virtual bool Accept(ZVisitor_ExprRep& iVisitor);
 	};
 
@@ -47,9 +51,10 @@
 #pragma mark -
 #pragma mark * ZVisitor_ExprRep
 
-class ZVisitor_ExprRep
+class ZVisitor_ExprRep : public ZVisitor
 	{
 public:
+// Our protocol
 	virtual bool Visit_ExprRep(ZRef<ZExprRep> iRep);
 	};
 

Modified: trunk/zoolib/source/cxx/zoolib/ZRef_Counted.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZRef_Counted.cpp	2010-04-08 17:58:27 UTC (rev 1259)
+++ trunk/zoolib/source/cxx/zoolib/ZRef_Counted.cpp	2010-04-08 19:03:27 UTC (rev 1260)
@@ -144,4 +144,14 @@
 ZRefCountedWithFinalize::~ZRefCountedWithFinalize()
 	{}
 
+bool ZRefCountedWithFinalize::Accept(ZVisitor& iVisitor)
+	{ return iVisitor.Visit(this); }
+
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZVisitor
+
+bool ZVisitor::Visit(ZRef<ZRefCountedWithFinalize> iRep)
+	{ return true; }
+
 NAMESPACE_ZOOLIB_END

Modified: trunk/zoolib/source/cxx/zoolib/ZRef_Counted.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZRef_Counted.h	2010-04-08 17:58:27 UTC (rev 1259)
+++ trunk/zoolib/source/cxx/zoolib/ZRef_Counted.h	2010-04-08 19:03:27 UTC (rev 1260)
@@ -31,6 +31,8 @@
 
 NAMESPACE_ZOOLIB_BEGIN
 
+class ZVisitor;
+
 // =================================================================================================
 #pragma mark -
 #pragma mark * ZRefCounted
@@ -97,8 +99,21 @@
 public:
 	ZRefCountedWithFinalize();
 	virtual ~ZRefCountedWithFinalize();
+
+// Our protocol
+	virtual bool Accept(ZVisitor& iVisitor);
 	};
 
+// =================================================================================================
+#pragma mark -
+#pragma mark * ZVisitor
+
+class ZVisitor
+	{
+public:
+	virtual bool Visit(ZRef<ZRefCountedWithFinalize> iRep);
+	};
+
 NAMESPACE_ZOOLIB_END
 
 #endif // __ZRef_Counted__

Modified: trunk/zoolib/source/cxx/zoolib/ZYad.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad.cpp	2010-04-08 17:58:27 UTC (rev 1259)
+++ trunk/zoolib/source/cxx/zoolib/ZYad.cpp	2010-04-08 19:03:27 UTC (rev 1260)
@@ -92,6 +92,19 @@
 ZYadR::ZYadR()
 	{}
 
+bool ZYadR::Accept(ZVisitor& iVisitor)
+	{
+	if (ZVisitor_Yad* theVisitor =
+		dynamic_cast<ZVisitor_Yad*>(&iVisitor))
+		{
+		return this->Accept(*theVisitor);
+		}
+	else
+		{
+		return ZRefCountedWithFinalize::Accept(iVisitor);
+		}
+	}
+
 void ZYadR::Finish()
 	{}
 
@@ -310,14 +323,8 @@
 
 */
 
-ZVisitor_Yad::ZVisitor_Yad()
-	{}
-
-ZVisitor_Yad::~ZVisitor_Yad()
-	{}
-
 bool ZVisitor_Yad::Visit_YadR(ZRef<ZYadR> iYadR)
-	{ return false; }
+	{ return ZVisitor::Visit(iYadR); }
 
 bool ZVisitor_Yad::Visit_YadPrimR(ZRef<ZYadPrimR> iYadPrimR)
 	{ return this->Visit_YadR(iYadPrimR); }

Modified: trunk/zoolib/source/cxx/zoolib/ZYad.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad.h	2010-04-08 17:58:27 UTC (rev 1259)
+++ trunk/zoolib/source/cxx/zoolib/ZYad.h	2010-04-08 19:03:27 UTC (rev 1260)
@@ -78,6 +78,9 @@
 	ZYadR();
 
 public:
+// From ZRefCountedWithFinalize
+	virtual bool Accept(ZVisitor& iVisitor);
+	
 // Our protocol
 	virtual void Finish();
 	virtual ZRef<ZYadR> Meta();
@@ -208,12 +211,9 @@
 #pragma mark -
 #pragma mark * ZVisitor_Yad
 
-class ZVisitor_Yad
+class ZVisitor_Yad : public ZVisitor
 	{
 public:
-	ZVisitor_Yad();
-	~ZVisitor_Yad();
-
 	virtual bool Visit_YadR(ZRef<ZYadR> iYadR);
 	virtual bool Visit_YadPrimR(ZRef<ZYadPrimR> iYadPrimR);
 	virtual bool Visit_YadStreamR(ZRef<ZYadStreamR> iYadStreamR);


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




Thread: [ZooLib-checkins] SF.net SVN: zoolib:[1260] trunk/zoolib/source/cxx (Page 3)

zoolib-checkins