From 106fbe1612c4c751c7ac8d5a6a6ac669f689ee56 Mon Sep 17 00:00:00 2001
From: Michael Uleysky <uleysky@poi.dvo.ru>
Date: Tue, 8 Sep 2015 15:03:43 +1000
Subject: [PATCH] Fixes

---
 src/object.cpp | 2 +-
 src/object.h   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/object.cpp b/src/object.cpp
index a21186e..754dc75 100644
--- a/src/object.cpp
+++ b/src/object.cpp
@@ -30,6 +30,6 @@ inline ObjectBase* OFunc::Evaluate(bool* err)
   if(ret!=0) return ret;
  }
  *err=true;
- COUT(ERROR)<<"Function(s) "<<name<< "can't evaluate expression "<<args->Dump()<<std::endl;
+ COUT(ERROR)<<"Function "<<name<<" can't evaluate expression "<<args->Dump()<<std::endl;
  return 0;
 }
diff --git a/src/object.h b/src/object.h
index 5b910d6..1cc6082 100644
--- a/src/object.h
+++ b/src/object.h
@@ -146,7 +146,7 @@ public:
  {
   if(!Exist()) return false;
   COUT(NORMAL)<<std::endl<<"Object type: "<<Type()<<std::endl;
-  COUT(NORMAL)<<"Value: "<<val<<std::endl;
+  COUT(NORMAL)<<"Name is: "<<Name()<<std::endl;
   COUT(NORMAL)<<"Value type: "<<val->Type()<<std::endl;
   return true;
  }
@@ -201,7 +201,7 @@ public:
  ObjectList() {vals.reset(new ListValues, [](ListValues* p){for(auto& i: *p) delete i; delete p;});}
  ObjectList(ObjectBase* o) {vals.reset(new ListValues, [](ListValues* p){for(auto& i: *p) delete i; delete p;}); PushBack(o);}
  ~ObjectList() {}
- bool Exist() const {return 0==vals->size();}
+ bool Exist() const {return 0!=vals->size();}
 
  bool Print() const override
  {
@@ -268,9 +268,9 @@ public:
   for(auto& i: *vals)
   {
    p=0;
-   if(IS_OTYPEI(i,ObjectPair)) p=dynamic_cast<const ObjectPair*>(i)->Get(gname);
+   if(IS_OTYPE(i,ObjectPair)) p=dynamic_cast<const ObjectPair*>(i)->Get(gname);
    if(0!=p) return p;
-   if(IS_OTYPEI(i,ObjectList)) p=dynamic_cast<const ObjectList*>(i)->Get(gname);
+   if(IS_OTYPE(i,ObjectList)) p=dynamic_cast<const ObjectList*>(i)->Get(gname);
    if(0!=p) return p;
   }
   return 0;