[Wesnoth-commits] r29236 - in /trunk/src/serialization: parser.cpp tokenizer.hpp

[paniemin]

Author: suokko
Date: Wed Sep  3 11:55:06 2008
New Revision: 29236

URL: http://svn.gna.org/viewcvs/wesnoth?rev=29236&view=rev
Log:
Fixed parser not to discard leading spaces

Modified:
    trunk/src/serialization/parser.cpp
    trunk/src/serialization/tokenizer.hpp

Modified: trunk/src/serialization/parser.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/serialization/parser.cpp?rev=29236&r1=29235&r2=29236&view=diff
==============================================================================
--- trunk/src/serialization/parser.cpp (original)
+++ trunk/src/serialization/parser.cpp Wed Sep  3 11:55:06 2008
@@ -293,7 +293,7 @@
                        // Ignore this
                        break;
                default:
-                       cfg[*curvar] += tok_->current_token().value;
+                       cfg[*curvar] += tok_->current_token().leading_spaces + 
tok_->current_token().value;
                        break;
                case token::QSTRING:
                        cfg[*curvar] += tok_->current_token().value;

Modified: trunk/src/serialization/tokenizer.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/serialization/tokenizer.hpp?rev=29236&r1=29235&r2=29236&view=diff
==============================================================================
--- trunk/src/serialization/tokenizer.hpp (original)
+++ trunk/src/serialization/tokenizer.hpp Wed Sep  3 11:55:06 2008
@@ -29,6 +29,7 @@
 {
        token() :
                type(END),
+               leading_spaces(),
                value()
                {}
 
@@ -51,8 +52,10 @@
 
        void reset() {
                value.clear();
+               leading_spaces.clear();
        }
 
+       std::string leading_spaces;
        std::string value;
 };
 
@@ -73,6 +76,7 @@
                        // Dump spaces and inlined comments
                        for(;;) {
                                while (is_space(current_)) {
+                                       token_.leading_spaces += current_;
                                        next_char_fast();
                                }
                                if (current_ != 254)


_______________________________________________
Wesnoth-commits mailing list
Wesnoth-commits@gna.org
https://mail.gna.org/listinfo/wesnoth-commits