r447:a07eb292dd95
Mon, 08 Dec 2008 22:47:15
[Not Reviewed]
0 comments (0 inline)
0
1
0
| ... | ... |
@@ -861,26 +861,28 @@ |
| 861 | 861 |
return false; |
| 862 | 862 |
} |
| 863 | 863 |
|
| 864 | 864 |
bool readSuccess() {
|
| 865 | 865 |
return static_cast<bool>(*_is); |
| 866 | 866 |
} |
| 867 | 867 |
|
| 868 | 868 |
void skipSection() {
|
| 869 | 869 |
char c; |
| 870 | 870 |
while (readSuccess() && line >> c && c != '@') {
|
| 871 | 871 |
readLine(); |
| 872 | 872 |
} |
| 873 |
if (readSuccess()) {
|
|
| 873 | 874 |
line.putback(c); |
| 874 | 875 |
} |
| 876 |
} |
|
| 875 | 877 |
|
| 876 | 878 |
void readNodes() {
|
| 877 | 879 |
|
| 878 | 880 |
std::vector<int> map_index(_node_maps.size()); |
| 879 | 881 |
int map_num, label_index; |
| 880 | 882 |
|
| 881 | 883 |
char c; |
| 882 | 884 |
if (!readLine() || !(line >> c) || c == '@') {
|
| 883 | 885 |
if (readSuccess() && line) line.putback(c); |
| 884 | 886 |
if (!_node_maps.empty()) |
| 885 | 887 |
throw FormatError("Cannot find map names");
|
| 886 | 888 |
return; |
| ... | ... |
@@ -1690,26 +1692,28 @@ |
| 1690 | 1692 |
return false; |
| 1691 | 1693 |
} |
| 1692 | 1694 |
|
| 1693 | 1695 |
bool readSuccess() {
|
| 1694 | 1696 |
return static_cast<bool>(*_is); |
| 1695 | 1697 |
} |
| 1696 | 1698 |
|
| 1697 | 1699 |
void skipSection() {
|
| 1698 | 1700 |
char c; |
| 1699 | 1701 |
while (readSuccess() && line >> c && c != '@') {
|
| 1700 | 1702 |
readLine(); |
| 1701 | 1703 |
} |
| 1704 |
if (readSuccess()) {
|
|
| 1702 | 1705 |
line.putback(c); |
| 1703 | 1706 |
} |
| 1707 |
} |
|
| 1704 | 1708 |
|
| 1705 | 1709 |
void readNodes() {
|
| 1706 | 1710 |
|
| 1707 | 1711 |
std::vector<int> map_index(_node_maps.size()); |
| 1708 | 1712 |
int map_num, label_index; |
| 1709 | 1713 |
|
| 1710 | 1714 |
char c; |
| 1711 | 1715 |
if (!readLine() || !(line >> c) || c == '@') {
|
| 1712 | 1716 |
if (readSuccess() && line) line.putback(c); |
| 1713 | 1717 |
if (!_node_maps.empty()) |
| 1714 | 1718 |
throw FormatError("Cannot find map names");
|
| 1715 | 1719 |
return; |
| ... | ... |
@@ -2217,26 +2221,28 @@ |
| 2217 | 2221 |
return false; |
| 2218 | 2222 |
} |
| 2219 | 2223 |
|
| 2220 | 2224 |
bool readSuccess() {
|
| 2221 | 2225 |
return static_cast<bool>(*_is); |
| 2222 | 2226 |
} |
| 2223 | 2227 |
|
| 2224 | 2228 |
void skipSection() {
|
| 2225 | 2229 |
char c; |
| 2226 | 2230 |
while (readSuccess() && line >> c && c != '@') {
|
| 2227 | 2231 |
readLine(); |
| 2228 | 2232 |
} |
| 2233 |
if (readSuccess()) {
|
|
| 2229 | 2234 |
line.putback(c); |
| 2230 | 2235 |
} |
| 2236 |
} |
|
| 2231 | 2237 |
|
| 2232 | 2238 |
public: |
| 2233 | 2239 |
|
| 2234 | 2240 |
|
| 2235 | 2241 |
/// \name Execution of the reader |
| 2236 | 2242 |
/// @{
|
| 2237 | 2243 |
|
| 2238 | 2244 |
/// \brief Start the batch processing |
| 2239 | 2245 |
/// |
| 2240 | 2246 |
/// This function starts the batch processing. |
| 2241 | 2247 |
void run() {
|
| 2242 | 2248 |
|
| ... | ... |
@@ -2558,26 +2564,28 @@ |
| 2558 | 2564 |
return false; |
| 2559 | 2565 |
} |
| 2560 | 2566 |
|
| 2561 | 2567 |
bool readSuccess() {
|
| 2562 | 2568 |
return static_cast<bool>(*_is); |
| 2563 | 2569 |
} |
| 2564 | 2570 |
|
| 2565 | 2571 |
void skipSection() {
|
| 2566 | 2572 |
char c; |
| 2567 | 2573 |
while (readSuccess() && line >> c && c != '@') {
|
| 2568 | 2574 |
readLine(); |
| 2569 | 2575 |
} |
| 2576 |
if (readSuccess()) {
|
|
| 2570 | 2577 |
line.putback(c); |
| 2571 | 2578 |
} |
| 2579 |
} |
|
| 2572 | 2580 |
|
| 2573 | 2581 |
void readMaps(std::vector<std::string>& maps) {
|
| 2574 | 2582 |
char c; |
| 2575 | 2583 |
if (!readLine() || !(line >> c) || c == '@') {
|
| 2576 | 2584 |
if (readSuccess() && line) line.putback(c); |
| 2577 | 2585 |
return; |
| 2578 | 2586 |
} |
| 2579 | 2587 |
line.putback(c); |
| 2580 | 2588 |
std::string map; |
| 2581 | 2589 |
while (_reader_bits::readToken(line, map)) {
|
| 2582 | 2590 |
maps.push_back(map); |
| 2583 | 2591 |
} |
0 comments (0 inline)