Menu
▾
▴
[ZooLib-checkins] SF.net SVN: zoolib:[1846] trunk/zoolib/source/cxx
|
From: <ag...@us...> - 2011-01-02 19:52:36
|
Revision: 1846
http://zoolib.svn.sourceforge.net/zoolib/?rev=1846&view=rev
Author: agreen
Date: 2011-01-02 19:52:29 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
trunk/zoolib/source/cxx/zoolib/ZTagged_T.h
trunk/zoolib/source/cxx/zoolib/ZValPred.h
trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZValPred_Any.h
trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.cpp
trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.h
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2011-01-02 19:52:29 UTC (rev 1846)
@@ -38,28 +38,18 @@
void Expr_Rel_Restrict::Accept(ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor =
- dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
- {
+ if (Visitor_Expr_Rel_Restrict* theVisitor = dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
- }
else
- {
inherited::Accept(iVisitor);
- }
}
void Expr_Rel_Restrict::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor =
- dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
- {
+ if (Visitor_Expr_Rel_Restrict* theVisitor = dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
- }
else
- {
inherited::Accept_Expr_Op1(iVisitor);
- }
}
ZRef<Expr_Rel> Expr_Rel_Restrict::Self()
@@ -78,8 +68,7 @@
#pragma mark -
#pragma mark * Visitor_Expr_Rel_Restrict
-void Visitor_Expr_Rel_Restrict::Visit_Expr_Rel_Restrict(
- const ZRef<Expr_Rel_Restrict >& iExpr)
+void Visitor_Expr_Rel_Restrict::Visit_Expr_Rel_Restrict(const ZRef<Expr_Rel_Restrict >& iExpr)
{ this->Visit_Expr_Op1(iExpr); }
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2011-01-02 19:52:29 UTC (rev 1846)
@@ -36,17 +36,20 @@
ZExpr_Bool_True::ZExpr_Bool_True()
{}
+void ZExpr_Bool_True::Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Bool_True* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_True*>(&iVisitor))
+ this->Accept_Expr_Bool_True(*theVisitor);
+ else
+ inherited::Accept(iVisitor);
+ }
+
void ZExpr_Bool_True::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_True* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_True*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Bool_True* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_True*>(&iVisitor))
this->Accept_Expr_Bool_True(*theVisitor);
- }
else
- {
inherited::Accept_Expr_Op0(iVisitor);
- }
}
ZRef<ZExpr_Bool> ZExpr_Bool_True::Self()
@@ -72,17 +75,20 @@
ZExpr_Bool_False::ZExpr_Bool_False()
{}
+void ZExpr_Bool_False::Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Bool_False* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_False*>(&iVisitor))
+ this->Accept_Expr_Bool_False(*theVisitor);
+ else
+ inherited::Accept(iVisitor);
+ }
+
void ZExpr_Bool_False::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_False* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_False*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Bool_False* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_False*>(&iVisitor))
this->Accept_Expr_Bool_False(*theVisitor);
- }
else
- {
inherited::Accept_Expr_Op0(iVisitor);
- }
}
ZRef<ZExpr_Bool> ZExpr_Bool_False::Self()
@@ -109,17 +115,20 @@
: inherited(iOp0)
{}
+void ZExpr_Bool_Not::Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Bool_Not* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Not*>(&iVisitor))
+ this->Accept_Expr_Bool_Not(*theVisitor);
+ else
+ inherited::Accept(iVisitor);
+ }
+
void ZExpr_Bool_Not::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Not* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_Not*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Bool_Not* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Not*>(&iVisitor))
this->Accept_Expr_Bool_Not(*theVisitor);
- }
else
- {
inherited::Accept_Expr_Op1(iVisitor);
- }
}
ZRef<ZExpr_Bool> ZExpr_Bool_Not::Self()
@@ -146,17 +155,20 @@
: inherited(iOp0, iOp1)
{}
+void ZExpr_Bool_And::Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Bool_And* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_And*>(&iVisitor))
+ this->Accept_Expr_Bool_And(*theVisitor);
+ else
+ inherited::Accept(iVisitor);
+ }
+
void ZExpr_Bool_And::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_And* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_And*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Bool_And* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_And*>(&iVisitor))
this->Accept_Expr_Bool_And(*theVisitor);
- }
else
- {
inherited::Accept_Expr_Op2(iVisitor);
- }
}
ZRef<ZExpr_Bool> ZExpr_Bool_And::Self()
@@ -183,17 +195,20 @@
: inherited(iOp0, iOp1)
{}
+void ZExpr_Bool_Or::Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Bool_Or* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Or*>(&iVisitor))
+ this->Accept_Expr_Bool_Or(*theVisitor);
+ else
+ inherited::Accept(iVisitor);
+ }
+
void ZExpr_Bool_Or::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Or* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_Or*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Bool_Or* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Or*>(&iVisitor))
this->Accept_Expr_Bool_Or(*theVisitor);
- }
else
- {
inherited::Accept_Expr_Op2(iVisitor);
- }
}
ZRef<ZExpr_Bool> ZExpr_Bool_Or::Self()
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h 2011-01-02 19:52:29 UTC (rev 1846)
@@ -51,6 +51,9 @@
public:
ZExpr_Bool_True();
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor);
+
// From ZExpr_Op0_T
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
@@ -87,6 +90,9 @@
public:
ZExpr_Bool_False();
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor);
+
// From ZExpr_Op0_T
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
@@ -123,6 +129,9 @@
public:
ZExpr_Bool_Not(ZRef<ZExpr_Bool> iOp0);
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor);
+
// From ZExpr_Op1_T
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<ZExpr_Bool>& iVisitor);
@@ -159,6 +168,9 @@
public:
ZExpr_Bool_And(ZRef<ZExpr_Bool> iOp0, ZRef<ZExpr_Bool> iOp1);
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor);
+
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor);
@@ -195,6 +207,9 @@
public:
ZExpr_Bool_Or(ZRef<ZExpr_Bool> iOp0, ZRef<ZExpr_Bool> iOp1);
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor);
+
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2011-01-02 19:52:29 UTC (rev 1846)
@@ -65,8 +65,7 @@
ZRef<ZExpr_Bool> ZExpr_Bool_ValPred::Clone()
{ return this; }
-void ZExpr_Bool_ValPred::Accept_Expr_Bool_ValPred(
- ZVisitor_Expr_Bool_ValPred& iVisitor)
+void ZExpr_Bool_ValPred::Accept_Expr_Bool_ValPred(ZVisitor_Expr_Bool_ValPred& iVisitor)
{ iVisitor.Visit_Expr_Bool_ValPred(this); }
const ZValPred& ZExpr_Bool_ValPred::GetValPred()
@@ -76,8 +75,7 @@
#pragma mark -
#pragma mark * ZVisitor_Expr_Bool_ValPred
-void ZVisitor_Expr_Bool_ValPred::Visit_Expr_Bool_ValPred(
- const ZRef<ZExpr_Bool_ValPred >& iExpr)
+void ZVisitor_Expr_Bool_ValPred::Visit_Expr_Bool_ValPred(const ZRef<ZExpr_Bool_ValPred >& iExpr)
{ this->Visit_Expr_Op0(iExpr); }
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2011-01-02 19:52:29 UTC (rev 1846)
@@ -45,18 +45,22 @@
virtual ~ZExpr_Op0_T()
{}
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ this->Accept_Expr_Op0(*theVisitor);
+ else
+ ZExpr::Accept(iVisitor);
+ }
+
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op0_T<T>* theVisitor =
- dynamic_cast<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
this->Accept_Expr_Op0(*theVisitor);
- }
else
- {
ZExpr::Accept_Expr(iVisitor);
- }
}
// Our protocol
@@ -101,18 +105,22 @@
virtual ~ZExpr_Op1_T()
{}
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
+ this->Accept_Expr_Op1(*theVisitor);
+ else
+ ZExpr::Accept(iVisitor);
+ }
+
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op1_T<T>* theVisitor =
- dynamic_cast<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
this->Accept_Expr_Op1(*theVisitor);
- }
else
- {
ZExpr::Accept_Expr(iVisitor);
- }
}
// Our protocol
@@ -164,18 +172,22 @@
virtual ~ZExpr_Op2_T()
{}
+// From ZVisitee
+ virtual void Accept(ZVisitor& iVisitor)
+ {
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
+ this->Accept_Expr_Op2(*theVisitor);
+ else
+ ZExpr::Accept(iVisitor);
+ }
+
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op2_T<T>* theVisitor =
- dynamic_cast<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
- {
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
this->Accept_Expr_Op2(*theVisitor);
- }
else
- {
ZExpr::Accept_Expr(iVisitor);
- }
}
// Our protocol
Modified: trunk/zoolib/source/cxx/zoolib/ZTagged_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZTagged_T.h 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZTagged_T.h 2011-01-02 19:52:29 UTC (rev 1846)
@@ -41,6 +41,7 @@
ZTagged_T(const Value& iValue) : fValue(iValue) {}
ZTagged_T& operator=(const Value& iValue) { fValue = iValue; return *this; }
+ Value& Get() { return fValue; }
const Value& Get() const { return fValue; }
};
Modified: trunk/zoolib/source/cxx/zoolib/ZValPred.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValPred.h 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZValPred.h 2011-01-02 19:52:29 UTC (rev 1846)
@@ -48,15 +48,7 @@
class ZValComparator_Simple : public ZValComparator
{
public:
- enum EComparator
- {
- eLT,
- eLE,
- eEQ,
- eNE,
- eGE,
- eGT
- };
+ enum EComparator { eLT, eLE, eEQ, eNE, eGE, eGT };
ZValComparator_Simple(EComparator iEComparator);
Modified: trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp 2011-01-02 19:52:29 UTC (rev 1846)
@@ -52,7 +52,10 @@
template <> int sCompare_T(const ZValComparator_Callable_Any& iL,
const ZValComparator_Callable_Any& iR)
- { return sCompare_T((void*)iL.GetCallable().Get(), (void*)iR.GetCallable().Get()); }
+ {
+ ZUnimplemented(); //## just checking to see if this is ever called.
+ return sCompare_T((void*)iL.GetCallable().Get(), (void*)iR.GetCallable().Get());
+ }
ZMACRO_CompareRegistration_T(ZValComparator_Callable_Any)
Modified: trunk/zoolib/source/cxx/zoolib/ZValPred_Any.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValPred_Any.h 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZValPred_Any.h 2011-01-02 19:52:29 UTC (rev 1846)
@@ -55,6 +55,7 @@
ZValComparator_Callable_Any(ZRef<Callable> iCallable);
+// Our protocol
const ZRef<Callable>& GetCallable() const;
private:
Modified: trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.cpp 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.cpp 2011-01-02 19:52:29 UTC (rev 1846)
@@ -22,16 +22,18 @@
namespace ZooLib {
+using std::map;
+using std::string;
+
ZRef<ZValComparand> sRenamed(
- const std::map<std::string,std::string>& iRename,
- const ZRef<ZValComparand>& iVal)
+ const map<string,string>& iRename, const ZRef<ZValComparand>& iVal)
{
if (ZRef<ZValComparand_Name> as = iVal.DynamicCast<ZValComparand_Name>())
return new ZValComparand_Name(iRename.find(as->GetName())->second);
return iVal;
}
-ZValPred sRenamed(const std::map<std::string,std::string>& iRename, const ZValPred& iValPred)
+ZValPred sRenamed(const map<string,string>& iRename, const ZValPred& iValPred)
{
return ZValPred(
sRenamed(iRename, iValPred.GetLHS()),
Modified: trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.h 2011-01-02 19:22:05 UTC (rev 1845)
+++ trunk/zoolib/source/cxx/zoolib/ZValPred_Rename.h 2011-01-02 19:52:29 UTC (rev 1846)
@@ -29,8 +29,7 @@
namespace ZooLib {
ZRef<ZValComparand> sRenamed(
- const std::map<std::string,std::string>& iRename,
- const ZRef<ZValComparand>& iVal);
+ const std::map<std::string,std::string>& iRename, const ZRef<ZValComparand>& iVal);
ZValPred sRenamed(const std::map<std::string,std::string>& iRename, const ZValPred& iValPred);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
