Ticket #2792: fix.2792.patch

string_parse_tree.hpp

@@ -12 +12 @@
 
 #include "boost/lexical_cast.hpp" //error without?
 #include "boost/algorithm/string/case_conv.hpp"
+#include "boost/shared_ptr.hpp"
 #include <map>
 #include <string>
 #include <vector>
@@ -83 +84 @@
 struct string_parse_tree
 {
 #if BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x581) )
-  typedef std::multimap<charT, string_parse_tree< charT> > ptree_coll;
+  typedef boost::shared_ptr<string_parse_tree< charT> > subtree;
 #else
-  typedef std::multimap<charT, string_parse_tree > ptree_coll;
+  typedef boost::shared_ptr<string_parse_tree> subtree;
 #endif
+  typedef std::multimap<charT, subtree> ptree_coll;
   typedef typename ptree_coll::value_type value_type;
   typedef typename ptree_coll::iterator iterator;
   typedef typename ptree_coll::const_iterator const_iterator;
@@ -126 +128 @@
     while(i < s.size()) {
       if (i==0) {
         if (i == (s.size()-1)) {
-          ti = m_next_chars.insert(value_type(s[i],
-                                              string_parse_tree<charT>(value)));
+          subtree st(new typename subtree::element_type(value));
+          ti = m_next_chars.insert(value_type(s[i], st));
         }
         else {
-          ti = m_next_chars.insert(value_type(s[i],
-                                              string_parse_tree<charT>()));
+          subtree st(new typename subtree::element_type());
+          ti = m_next_chars.insert(value_type(s[i], st));
         }
       }
       else {
         if (i == (s.size()-1)) {
-          ti = ti->second.m_next_chars.insert(value_type(s[i],
-                                                         string_parse_tree<charT>(value)));
+          subtree st(new typename subtree::element_type(value));
+          ti = ti->second->m_next_chars.insert(value_type(s[i], st));
         }
 
         else {
-          ti = ti->second.m_next_chars.insert(value_type(s[i],
-                                                         string_parse_tree<charT>()));
+          subtree st(new typename subtree::element_type());
+          ti = ti->second->m_next_chars.insert(value_type(s[i], st));
         }
 
       }
@@ -193 +195 @@
         sitr++;
         result.cache += c;
       }
-      if (litr->second.m_value != -1) { // -1 is default value
+      if (litr->second->m_value != -1) { // -1 is default value
         if (result.match_depth < level) {
-          result.current_match = litr->second.m_value;
+          result.current_match = litr->second->m_value;
           result.match_depth = static_cast<unsigned short>(level);
         }
-        litr->second.match(sitr, stream_end,
-                           result, level);
+        litr->second->match(sitr, stream_end,
+                            result, level);
         level--;
       }
       else {
-        litr->second.match(sitr, stream_end,
-                           result, level);
+        litr->second->match(sitr, stream_end,
+                            result, level);
         level--;
       }
 
@@ -244 +246 @@
     while (itr != end) {
       os << "level:  " << level
          << " node:  " << itr->first
-         << " value: " << itr->second.m_value
+         << " value: " << itr->second->m_value
          << std::endl;
-      itr->second.printme(os, level);
+      itr->second->printme(os, level);
       itr++;
     }
     level--;
@@ -265 +267 @@
     os << "matches for: " << c << std::endl;
     while (litr != uitr) {
       os << " node:  " << litr->first
-         << " value: " << litr->second.m_value
+         << " value: " << litr->second->m_value
          << std::endl;
       litr++;
     }