[Wesnoth-cvs-commits] wesnoth/src/serialization parser.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/05/07 16:04:11

Modified files:
        src/serialization: parser.cpp 

Log message:
        No more WML-scoping for textdomains, let's trust the preprocessor.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/parser.cpp.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: wesnoth/src/serialization/parser.cpp
diff -u wesnoth/src/serialization/parser.cpp:1.17 
wesnoth/src/serialization/parser.cpp:1.18
--- wesnoth/src/serialization/parser.cpp:1.17   Sat May  7 14:31:06 2005
+++ wesnoth/src/serialization/parser.cpp        Sat May  7 16:04:10 2005
@@ -1,4 +1,4 @@
-/* $Id: parser.cpp,v 1.17 2005/05/07 14:31:06 silene Exp $ */
+/* $Id: parser.cpp,v 1.18 2005/05/07 16:04:10 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -58,35 +58,28 @@
        tokenizer tok_;
 
        struct element {
-               element(config *cfg, std::string const &name, std::string const 
&start_line,
-                       std::string const &textdomain) :
-                       cfg(cfg), name(name), textdomain(textdomain), 
start_line(start_line){};
+               element(config *cfg, std::string const &name, std::string const 
&start_line)
+                       : cfg(cfg), name(name), start_line(start_line) {}
 
                config* cfg;
                std::string name;
 
                std::map<std::string, config*> last_element_map;
-               std::string textdomain;
                std::string start_line;
        };
 
        std::stack<element> elements;
-
-       std::string current_textdomain_location;
 };
 
-parser::parser(config &cfg, std::istream &in) :
-       cfg_(cfg),
-       tok_(in),
-       current_textdomain_location("")
+parser::parser(config &cfg, std::istream &in)
+       : cfg_(cfg), tok_(in)
 {
 }
 
 void parser::operator()(std::string* error_log)
 {
        cfg_.clear();
-       elements.push(element(&cfg_, "", "", PACKAGE));
-       tok_.textdomain() = PACKAGE;
+       elements.push(element(&cfg_, "", ""));
 
        do {
                try {
@@ -148,8 +141,7 @@
                // Add the element
                current_element = &(elements.top().cfg->add_child(elname));
                elements.top().last_element_map[elname] = current_element;
-               elements.top().textdomain = tok_.textdomain();
-               elements.push(element(current_element, elname, tok_.get_line(), 
elements.top().textdomain));
+               elements.push(element(current_element, elname, 
tok_.get_line()));
                break;
 
        case '+': // [+element]
@@ -168,8 +160,7 @@
                        current_element = last_element_itor->second;
                }
                elements.top().last_element_map[elname] = current_element;
-               elements.top().textdomain = tok_.textdomain();
-               elements.push(element(current_element, elname, tok_.get_line(), 
elements.top().textdomain));
+               elements.push(element(current_element, elname, 
tok_.get_line()));
                break;
 
        case '/': // [/element]
@@ -189,7 +180,6 @@
                }
 
                elements.pop();
-               tok_.textdomain() = elements.top().textdomain;
                break;
        default:
                error(_("Invalid tag name"));