Changeset 26 for trunk/Classes/serialization/parser.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/serialization/parser.cpp (modified) (8 diffs)

trunk/Classes/serialization/parser.cpp

@@ -114 +114 @@
     elements.push(element(&cfg_, ""));
     
-    leading_spaces_buffer.reserve(1024);
-    value_buffer.reserve(10*1024);
+    //leading_spaces_buffer.reserve(1024);
+    //value_buffer.reserve(10*1024);
 
     do {
@@ -186 +186 @@
     case token::STRING: // [element]
         elname = tok_->current_token().value;
+        //elname.assign(tok_->current_token().value_ptr, tok_->current_token().value_size);
         if (tok_->next_token().type != ']')
             error(_("Unterminated [element] tag"));
@@ -199 +200 @@
             error(_("Invalid tag name"));
         elname = tok_->current_token().value;
+        //elname.assign(tok_->current_token().value_ptr, tok_->current_token().value_size);
         if (tok_->next_token().type != ']')
             error(_("Unterminated [+element] tag"));
@@ -218 +220 @@
             error(_("Invalid closing tag name"));
         elname = tok_->current_token().value;
+        //elname.assign(tok_->current_token().value_ptr, tok_->current_token().value_size);
         if(tok_->next_token().type != ']')
             error(_("Unterminated closing tag"));
@@ -251 +254 @@
                 variables.back() += ' ';
             variables.back() += tok_->current_token().value;
+            //variables.back().append(tok_->current_token().value_ptr, tok_->current_token().value_size);
             break;
         case ',':
@@ -299 +303 @@
             case token::QSTRING:
                 cfg[*curvar] += tok_->current_token().value;
+                /*  
+                {
+                    std::string tempStr = cfg[*curvar];
+                    tempStr.append(tok_->current_token().value_ptr, tok_->current_token().value_size);
+                    cfg[*curvar] = tempStr;
+                }
+                 */
                 break;
             default:
                 cfg[*curvar] += "_";
                 cfg[*curvar] += tok_->current_token().value;
+                    /*
+                {
+                    std::string tempStr = cfg[*curvar] + "_";
+                    tempStr.append(tok_->current_token().value_ptr, tok_->current_token().value_size);
+                    cfg[*curvar] = tempStr;
+                }
+                     */
                 break;
             case token::END:
@@ -314 +332 @@
         default:
             cfg[*curvar] += tok_->current_token().leading_spaces + tok_->current_token().value;
+                /*
+            {
+                std::string tempStr = cfg[*curvar];
+                //tempStr.append(tok_->current_token().leading_spaces_ptr, tok_->current_token().leading_spaces_size);
+                tempStr.append(tok_->current_token().value_ptr, tok_->current_token().value_size);
+                cfg[*curvar] = tempStr;
+            }
+                 */
             break;
         case token::QSTRING:
             cfg[*curvar] += tok_->current_token().value;
+                /*
+            {
+                std::string tempStr = cfg[*curvar];
+                tempStr.append(tok_->current_token().value_ptr, tok_->current_token().value_size);
+                cfg[*curvar] = tempStr;
+            }
+                 */
             break;
         case token::UNTERMINATED_QSTRING:
@@ -355 +388 @@
     i18n_symbols["error"] = error_type;
     i18n_symbols["value"] = tok_->current_token().value;
+    //i18n_symbols["value"].assign(tok_->current_token().value_ptr, tok_->current_token().value_size);
     std::stringstream ss;
     ss << tok_->get_start_line() << " " << tok_->get_file();
 #ifdef DEBUG
     i18n_symbols["previous_value"] = tok_->previous_token().value;
+    //i18n_symbols["previous_value"].assign(tok_->previous_token().value_ptr, tok_->previous_token().value_size);
     throw config::error(
         lineno_string(i18n_symbols, ss.str(),