Fix parsing empty vector in parameter. (#5087)

This commit is contained in:
Jiaming Yuan
2019-12-05 11:42:01 +08:00
committed by GitHub
parent f5e13dcb9b
commit df9bdbbcb9
4 changed files with 89 additions and 57 deletions

81
src/tree/param.cc Normal file
View File

@@ -0,0 +1,81 @@
/*!
* Copyright by Contributors 2019
*/
#include <iostream>
#include <vector>
#include <utility>
#include "param.h"
namespace std {
std::istream &operator>>(std::istream &is, std::vector<int> &t) {
t.clear();
// get (
while (true) {
char ch = is.peek();
if (isdigit(ch)) {
int idx;
if (is >> idx) {
t.emplace_back(idx);
}
return is;
}
is.get();
if (ch == '(') {
break;
}
if (!isspace(ch)) {
is.setstate(std::ios::failbit);
return is;
}
}
int idx;
std::vector<int> tmp;
while (true) {
char ch = is.peek();
if (isspace(ch)) {
is.get();
} else {
break;
}
}
if (is.peek() == ')') {
is.get();
return is;
}
while (is >> idx) {
tmp.push_back(idx);
char ch;
do {
ch = is.get();
} while (isspace(ch));
if (ch == 'L') {
ch = is.get();
}
if (ch == ',') {
while (true) {
ch = is.peek();
if (isspace(ch)) {
is.get();
continue;
}
if (ch == ')') {
is.get();
break;
}
break;
}
if (ch == ')') {
break;
}
} else if (ch == ')') {
break;
} else {
is.setstate(std::ios::failbit);
return is;
}
}
t = std::move(tmp);
return is;
}
} // namespace std

View File

@@ -495,63 +495,7 @@ inline std::ostream &operator<<(std::ostream &os, const std::vector<int> &t) {
return os;
}
inline std::istream &operator>>(std::istream &is, std::vector<int> &t) {
// get (
while (true) {
char ch = is.peek();
if (isdigit(ch)) {
int idx;
if (is >> idx) {
t.assign(&idx, &idx + 1);
}
return is;
}
is.get();
if (ch == '(') {
break;
}
if (!isspace(ch)) {
is.setstate(std::ios::failbit);
return is;
}
}
int idx;
std::vector<int> tmp;
while (is >> idx) {
tmp.push_back(idx);
char ch;
do {
ch = is.get();
} while (isspace(ch));
if (ch == 'L') {
ch = is.get();
}
if (ch == ',') {
while (true) {
ch = is.peek();
if (isspace(ch)) {
is.get();
continue;
}
if (ch == ')') {
is.get();
break;
}
break;
}
if (ch == ')') {
break;
}
} else if (ch == ')') {
break;
} else {
is.setstate(std::ios::failbit);
return is;
}
}
t.assign(tmp.begin(), tmp.end());
return is;
}
std::istream &operator>>(std::istream &is, std::vector<int> &t);
} // namespace std
#endif // XGBOOST_TREE_PARAM_H_