updating a correct source files (prior update was not entirely correct)

Author: Dmitry Lyssenko

jtc.cpp

@@ -272,7 +272,7 @@ class Jtc {
     void                jsonized_output_obj_(Json::iterator &, Json &jref, Grouping);
     void                jsonized_output_ary_(Json::iterator &, Json &jref, Grouping);
     void                merge_ns_(Json::map_jn &to, const Json::map_jn &from)
-                         { for(auto & ns: from) to[ns.KEY] = ns.VALUE; }
+                         { for(const auto & ns: from) to[ns.KEY] = ns.VALUE; }
     bool                shell_callback_(const std::string &lxm, Json::iterator jit) {
      // reminder:
      //typedef std::function<bool(const std::string &, const Jnode &)> uws_callback;
@@ -1054,8 +1054,8 @@ void Jtc::output_by_iterator(Json::iterator &wi, Grouping grp) {
  tmp.type(Jnode::Neither);
  DBG().increment(+2, tmp, -2);
 
- wns_[&wi][WLK_HPFX] = move(hwlk_);                             // merge prior hist. into namespace
- hwlk_.type(Jnode::Neither);
+ wns_[&wi][WLK_HPFX] = move(hwlk_[0]);                          // merge prior hist. into namespace
+ hwlk_[0].type(Jnode::Neither);
  if(opt_[CHR(OPT_TMP)].hits() >= 1) {                           // -T given, interpolate
   merge_ns_(cr_.global_ns(), wns_[&wi]);
   // if multiple interleaved walks and multiple templates, then relate each template per walk-path
@@ -1074,7 +1074,7 @@ void Jtc::output_by_iterator(Json::iterator &wi, Grouping grp) {
    if(++key_  >= opt_[CHR(OPT_TMP)].size() - 1) key_ = 0;       // -1: adjust b/c of opt_'s default
   }
  }
- if(hwlk_.is_neither()) {                                       // templating failed or was none
+ if(hwlk_[0].is_neither()) {                                    // templating failed or was none
   if(wi->has_label()) hwlk_ = move(OBJ{LBL{wi->label(), *wi}}); // preserve also the label if exist
   else hwlk_ = move(ARY{*wi});
  }
@@ -1537,8 +1537,7 @@ void Jtc::update_wlk_history_(Json::iterator & jit) {
  // now stores result of interpolation
 
  wns_[&jit] = jinp_.ns();                                       // preserve walked namespace
- wns_[&jit][WLK_HPFX] = move(hwlk_);                            // add historical namespace
- hwlk_ = *jit;                                                  // preserve current walk
+ wns_[&jit][WLK_HPFX] = move(hwlk_[0]);                         // add historical namespace
  if(jit->has_label()) hwlk_ = move(OBJ{LBL{jit->label(), *jit}});
  else hwlk_ = move(ARY{*jit});
 }

lib/Json.hpp

@@ -772,18 +772,24 @@ class Jnode {
                          return *this;
                         }
 
-    virtual Jnode &     operator[](signed_size_t i) {
+    virtual Jnode &     operator[](long i) {
                          // signed_size_t type is used instead of size_t b/c super node's overload
                          // supports negative offsets
                          if(is_atomic()) throw EXP(type_non_indexable);
                          return iterator_by_idx_(i)->VALUE;
                         }
 
-  virtual const Jnode & operator[](signed_size_t i) const {
+    virtual Jnode &     operator[](int i)
+                         { return operator[](static_cast<signed_size_t>(i)); }
+
+  virtual const Jnode & operator[](long i) const {
                          if(is_atomic()) throw EXP(type_non_indexable);
                          return iterator_by_idx_(i)->VALUE;
                         }
 
+  virtual const Jnode & operator[](int i) const
+                         { return operator[](static_cast<signed_size_t>(i)); }
+
     Jnode &             operator[](const std::string & l) {
                          if(not is_object()) throw EXP(type_non_subscriptable);
                          return children_()[l];
@@ -1475,8 +1481,10 @@ class Json {
     bool                has_children(void) const { return root().has_children(); }
     size_t              children(void) const { return root().children(); }
     Json &              clear(void) { root().clear(); return *this; }
-    Jnode &             operator[](signed_size_t i) { return root()[i]; }
-    const Jnode &       operator[](signed_size_t i) const { return root()[i]; }
+    Jnode &             operator[](long i) { return root()[i]; }
+    Jnode &             operator[](int i) { return root()[i]; }
+    const Jnode &       operator[](long i) const { return root()[i]; }
+    const Jnode &       operator[](int i) const { return root()[i]; }
     Jnode &             operator[](const std::string & l) { return root()[l]; }
     const Jnode &       operator[](const std::string & l) const { return root()[l]; }
     Jnode &             front(void) { return root().front(); }