From ef2218b91c6698862eb15d6ca3a539c1ccf4103e Mon Sep 17 00:00:00 2001
From: Michael Uleysky <uleysky@poi.dvo.ru>
Date: Tue, 8 Sep 2015 13:56:36 +1000
Subject: [PATCH] Realisation of print() and save()

---
 src/debug.h     |  2 +-
 src/deptree.cpp | 69 +++++++++++++++++++++++++++++++++++++++++++++----
 src/globals.cpp | 57 ++++++++++++++++++++++++++++++++++++++++
 src/globals.h   |  3 +++
 src/object.h    | 17 ++++++------
 5 files changed, 134 insertions(+), 14 deletions(-)

diff --git a/src/debug.h b/src/debug.h
index c67e7c5..854d5df 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -3,7 +3,7 @@
 #include <iostream>
 #include "common.h"
 
-enum debug_level {INTERNALREQUEST,MOREDEBUG,DEBUG,INFO,WARNING,ERROR};
+enum debug_level {INTERNALREQUEST,MOREDEBUG,DEBUG,INFO,NORMAL,WARNING,ERROR};
 
 EXPORT std::ostream& COUT(debug_level dl);
 
diff --git a/src/deptree.cpp b/src/deptree.cpp
index 1f8597b..6f0de72 100644
--- a/src/deptree.cpp
+++ b/src/deptree.cpp
@@ -193,6 +193,7 @@ void TreeEvaluate(std::mutex* mtx, int* errflag, DepTree::LeafVector* leafs, con
  // mtx[1] - mutex for manipulating with tree
  DepTree* leaf;
  ObjectBase *ob,*eob;
+ ObjectList* ol;
  bool err;
  while(true)
  {
@@ -213,12 +214,42 @@ void TreeEvaluate(std::mutex* mtx, int* errflag, DepTree::LeafVector* leafs, con
 
   if(DepTree::SAVE==leaf->type)
   {
-   COUT(INFO)<<"save ("<<G_tosave[leaf->index]->Dump()<<")"<<std::endl;
+   err=false;
+   ol=G_tosave[leaf->index];
+   ol->Evaluate(&err); // For list Evaluate always return 0;
+   if(err)
+   {
+    COUT(ERROR)<<" in instruction save"<<ol->Dump()<<")"<<std::endl;
+    *errflag=1;
+    return;
+   }
+   if(!Save(ol))
+   {
+    mtx[0].lock();
+    *errflag=1;
+    mtx[0].unlock();
+    return;
+   }
   }
 
   if(DepTree::PRINT==leaf->type)
   {
-   COUT(INFO)<<"print ("<<G_toprint[leaf->index]->Dump()<<")"<<std::endl;
+   err=false;
+   ol=G_toprint[leaf->index];
+   ol->Evaluate(&err); // For list Evaluate always return 0;
+   if(err)
+   {
+    COUT(ERROR)<<" in instruction print"<<ol->Dump()<<")"<<std::endl;
+    *errflag=1;
+    return;
+   }
+   if(!Print(ol))
+   {
+    mtx[0].lock();
+    *errflag=1;
+    mtx[0].unlock();
+    return;
+   }
   }
 
   if(DepTree::VAR==leaf->type)
@@ -273,6 +304,7 @@ void TreeEvaluate(int* errflag, DepTree::LeafVector* leafs)
 {
  DepTree* leaf;
  ObjectBase *ob,*eob;
+ ObjectList* ol;
  bool err;
  while(0!=leafs->size())
  {
@@ -283,12 +315,39 @@ void TreeEvaluate(int* errflag, DepTree::LeafVector* leafs)
 
   if(DepTree::SAVE==leaf->type)
   {
-   COUT(INFO)<<"save ("<<G_tosave[leaf->index]->Dump()<<")"<<std::endl;
+   err=false;
+   ol=G_tosave[leaf->index];
+   ol->Evaluate(&err); // For list Evaluate always return 0;
+   if(err)
+   {
+    COUT(ERROR)<<" in instruction save"<<ol->Dump()<<")"<<std::endl;
+    *errflag=1;
+    return;
+   }
+   // eob is evaluated object
+   if(!Save(ol))
+   {
+    *errflag=1;
+    return;
+   }
   }
 
   if(DepTree::PRINT==leaf->type)
   {
-   COUT(INFO)<<"print ("<<G_toprint[leaf->index]->Dump()<<")"<<std::endl;
+   err=false;
+   ol=G_toprint[leaf->index];
+   ol->Evaluate(&err); // For list Evaluate always return 0;
+   if(err)
+   {
+    COUT(ERROR)<<" in instruction print"<<ol->Dump()<<")"<<std::endl;
+    *errflag=1;
+    return;
+   }
+   if(!Print(ol))
+   {
+    *errflag=1;
+    return;
+   }
   }
 
   if(DepTree::VAR==leaf->type)
@@ -307,7 +366,7 @@ void TreeEvaluate(int* errflag, DepTree::LeafVector* leafs)
    // eob is evaluated object
    if(0!=eob) delete ob;
    else eob=ob;
-   G_vars.erase(leaf->name); // Concurrent access is safe
+   G_vars.erase(leaf->name);
    for(auto& i:leaf->parents)
    {
     // leaf not children of anyone
diff --git a/src/globals.cpp b/src/globals.cpp
index d460156..b849bd4 100644
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -28,3 +28,60 @@ void RegisterFunction(const std::string& name, Func func)
 {
  G_funcs.emplace(name,func);
 }
+
+
+bool Save(ObjectList* input)
+{
+ ObjectList::ListValues::size_type sz=input->Size(), i;
+ if(sz<2 || sz%2==1 )
+ {
+  COUT(ERROR)<<"Number of save arguments must not be "<<sz<<std::endl;
+  return false;
+ }
+
+ // Check arguments types
+ const ObjectBase* arg1;
+ const ObjectString* arg2;
+ for(i=0;i<sz/2;i++)
+ {
+  arg1=input->At(i*2+1);
+  if(!IS_OTYPE(arg1,ObjectString))
+  {
+   COUT(ERROR)<<"Save format is save(object_1,file_1,...,object_n,file_n) where file_i is string"<<std::endl;
+   return false;
+  }
+ }
+
+ // Save
+ for(i=0;i<sz/2;i++)
+ {
+  arg1=input->At(i*2);
+  arg2=dynamic_cast<const ObjectString*>(input->At(i*2+1));
+  if(!arg1->Save(arg2->Value().c_str()))
+  {
+   COUT(ERROR)<<"Can't save object "<<arg1->Dump()<<" to file "<<arg2->Value()<<std::endl;
+   return false;
+  }
+ }
+
+ return true;
+}
+
+
+bool Print(ObjectList* input)
+{
+ ObjectList::ListValues::size_type sz=input->Size(), i;
+ if(sz==0) return true;
+
+ // Print
+ for(i=0;i<sz;i++)
+ {
+  if(!input->At(i)->Print())
+  {
+   COUT(ERROR)<<"Unprintable object "<<input->At(i)->Dump()<<std::endl;
+   return false;
+  }
+ }
+
+ return true;
+}
diff --git a/src/globals.h b/src/globals.h
index 77d4c22..c0bfae9 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -23,6 +23,9 @@ extern EXPORT G_toType G_toprint;
 
 void ClearGlobals();
 
+bool Save(ObjectList* input);
+bool Print(ObjectList* input);
+
 extern "C" {
 EXPORT void RegisterFunction(const std::string& name, Func func);
 }
diff --git a/src/object.h b/src/object.h
index 990ed4a..5b910d6 100644
--- a/src/object.h
+++ b/src/object.h
@@ -96,8 +96,8 @@ public:
  ~ObjectSimple() {}
  bool Print() const override
  {
-  COUT(INFO)<<"Object type: "<<Type()<<"."<<std::endl;
-  COUT(INFO)<<"Value: "<<val<<std::endl;
+  COUT(NORMAL)<<std::endl<<"Object type: "<<Type()<<std::endl;
+  COUT(NORMAL)<<"Value: "<<val<<std::endl;
   return true;
  }
  std::string Type() const override {return type;}
@@ -145,9 +145,9 @@ public:
  bool Print() const override
  {
   if(!Exist()) return false;
-  COUT(INFO)<<"Object type: "<<Type()<<"."<<std::endl;
-  COUT(INFO)<<"Name: "<<Name()<<std::endl;
-  COUT(INFO)<<"Value type: "<<val->Type()<<std::endl;
+  COUT(NORMAL)<<std::endl<<"Object type: "<<Type()<<std::endl;
+  COUT(NORMAL)<<"Value: "<<val<<std::endl;
+  COUT(NORMAL)<<"Value type: "<<val->Type()<<std::endl;
   return true;
  }
  std::string Type() const override {return "pair";}
@@ -192,8 +192,9 @@ public:
 // Class for objects list
 class EXPORT ObjectList: public ObjectBase
 {
-private:
+public:
  typedef std::vector<ObjectBase*> ListValues;
+private:
  std::shared_ptr<ListValues> vals;
 
 public:
@@ -205,8 +206,8 @@ public:
  bool Print() const override
  {
   if(!Exist()) return false;
-  COUT(INFO)<<"Object type: "<<Type()<<"."<<std::endl;
-  COUT(INFO)<<"Number of elements: "<<Size()<<std::endl;
+  COUT(NORMAL)<<std::endl<<"Object type: "<<Type()<<std::endl;
+  COUT(NORMAL)<<"Number of elements: "<<Size()<<std::endl;
   return true;
  }
  ListValues::size_type Size() const {return vals->size();}