[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src/serialization parser.cpp
From: |
Philippe Plantier |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src/serialization parser.cpp |
Date: |
Mon, 28 Mar 2005 08:36:08 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Philippe Plantier <address@hidden> 05/03/28 13:36:07
Modified files:
src/serialization: parser.cpp
Log message:
Since string freeze is still not in effect, commiting a little change
in the parser messages:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/parser.cpp.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
Patches:
Index: wesnoth/src/serialization/parser.cpp
diff -u wesnoth/src/serialization/parser.cpp:1.11
wesnoth/src/serialization/parser.cpp:1.12
--- wesnoth/src/serialization/parser.cpp:1.11 Mon Mar 28 13:31:20 2005
+++ wesnoth/src/serialization/parser.cpp Mon Mar 28 13:36:07 2005
@@ -1,4 +1,4 @@
-/* $Id: parser.cpp,v 1.11 2005/03/28 13:31:20 gruikya Exp $ */
+/* $Id: parser.cpp,v 1.12 2005/03/28 13:36:07 gruikya Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Copyright (C) 2005 by Guillaume Melquiond <address@hidden>
@@ -214,12 +214,10 @@
break;
case ',':
if(variables.back().empty()) {
- // FIXME: this error message is not really
- // appropriate, although a proper one should
- // wait after string freeze.
- error(_("Unexpected characters after variable
name (expected , or =)"));
+ error(_("Empty variable name"));
+ } else {
+ variables.push_back("");
}
- variables.push_back("");
break;
default:
error(_("Unexpected characters after variable name
(expected , or =)"));
@@ -227,6 +225,8 @@
}
tok_.next_token();
}
+ if(variables.back().empty())
+ error(_("Empty variable name"));
std::vector<std::string>::const_iterator curvar = variables.begin();