0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed the logic error in the tokenizer,

Browse source 
...which skipped the first character in the buffer.  Removed the
workaround hack in the map, but left the debug code for now.
This commit is contained in:
Mark de Wever 2007-10-28 11:24:13 +00:00
parent 176b293197
commit 291bf90b24
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/map.cpp
View file

@ -350,16 +350,8 @@ void gamemap::read(const std::string& data, const tborder border_tiles, const tu
config header;
::read(header, header_str);
// FIXME ugly work-around hack for a bug in the parser, just to get trunk up and running again
border_size_ = lexical_cast_default<int>(header["order_size"], -1);
if(border_size_ == -1) {
border_size_ = lexical_cast_default<int>(header["border_size"], 0);
}
/*const*/ std::string usage = header["usage"];
if(usage == "") {
usage = header["sage"];
}
border_size_ = lexical_cast_default<int>(header["border_size"], 0);
const std::string usage = header["usage"];
std::cerr << "header: " << header_str << "\n\n\n";
std::cerr << "usage: " << usage << "\tborder: " << border_size_ << "\n";

6
src/serialization/tokenizer.cpp
View file

@ -208,8 +208,8 @@ void tokenizer_string::next_char()
lineno_++;
do {
if(offset_ + 1< in_.size()) {
current_ = in_[++offset_];
if(offset_ < in_.size()) {
current_ = in_[offset_++];
} else {
current_ = EOF;
}
@ -219,6 +219,6 @@ void tokenizer_string::next_char()
int tokenizer_string::peek_char()
{
return in_[offset_ + 1];
return in_[offset_];
}