continued development

Global.cpp

@@ -11,4 +11,9 @@ namespace jet {
 
    }
 
+   void Global::dump() {
+      for (auto i = variables.begin(); i != variables.end(); i++)
+	std::cout << i->first << "=[" << i->second << "]" << std::endl; 
+   }
+
 }

Global.h

@@ -12,6 +12,8 @@ namespace  jet {
       Global();
       virtual ~Global();
 
+      void dump();
+      
       std::map<coreutils::MString, coreutils::MString> variables;
       
    };

Tag.cpp

@@ -61,12 +61,13 @@ namespace jet {
      }
    
    Tag::~Tag() {
-      if(evaluate) {	   
+      if(evaluate) 
+	if(output)
 	  copyContainer(out, parent);
-      } else {
+      else 
+	if(output)
 	  copyContainer(container, parent);	   
    }
-   }
    
    void Tag::parseContainer(coreutils::ZString &in) {
       char *start = in.getCursor();

Tag.h

@@ -18,11 +18,12 @@ namespace jet {
 
     protected:
       bool hasContainer;
-      std::map<coreutils::ZString, coreutils::ZString> variables;
+      std::map<coreutils::ZString, coreutils::MString> variables;
       bool variableDefined(coreutils::ZString variable);
       void parseContainer(coreutils::ZString &in);
       void copyContainer(coreutils::ZString &in, coreutils::MString &out);
 
+      bool output = true;
       bool evaluate = true;
       bool filterBlankLines = false;
       bool trim = false;

__set.cpp

@@ -5,20 +5,14 @@
 namespace jet {
    
    __set::__set(coreutils::ZString &in, coreutils::MString &out, Global &global) : Tag(in, out, global) {
-      std::cout << "name: [" << variables["name"] << "]" << std::endl;
+      output = false;      
-      std::cout << "value: [" << variables["value"] << "]" << std::endl;
-      std::cout << "container: [" << container << "]" << std::endl;
-      std::cout << "scope: [" << variables["scope"] << "]" << std::endl;
-
       if(variables["scope"] == "local") 
 	variables[variables["name"]] = variables["value"];
       if(variables["scope"] == "global")
 	global.variables[variables["name"]] = container;
 
-      std::cout << "localvar: [" << variables.size() << "]" << std::endl;
+      global.dump();
-      std::cout << "localvarx: [" << variables[variables["name"]] << "]" << std::endl;
+      
-      std::cout << "globalvar: [" << global.variables.size() << "]" << std::endl;
-      std::cout << "globalvarx: [" << global.variables[variables["name"]] << "]" << std::endl;
    }
       
 }