FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simgear/props/props.cxx: parse_name(): improved exception text.

Browse Source 
Also fixed indentation.
This commit is contained in:
Julian Smith 2020-12-18 15:49:20 +00:00
parent 995608fc9e
commit 42c89ba6d3
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
simgear/props/props.cxx
View File

@ -143,28 +143,33 @@ parse_name (const SGPropertyNode *node, const Range &path)
i++; i++;
} }
if (i != max && *i != '/') if (i != max && *i != '/')
throw std::runtime_error("illegal character after . or .. in '" + node->getPath() + "'"); throw std::runtime_error("illegal character after . or .. in '" + node->getPath() + "'");
} else if (isalpha_c(*i) || *i == '_') { }
else if (isalpha_c(*i) || *i == '_') {
i++; i++;
// The rules inside a name are a little // The rules inside a name are a little
// less restrictive. // less restrictive.
while (i != max) { while (i != max) {
if (isalpha_c(*i) || isdigit_c(*i) || isspecial_c(*i)) { if (isalpha_c(*i) || isdigit_c(*i) || isspecial_c(*i)) {
// name += path[i]; // name += path[i];
} else if (*i == '[' || *i == '/') { }
break; else if (*i == '[' || *i == '/') {
} else { break;
}
else {
std::string err = "'"; std::string err = "'";
err.push_back(*i); err.push_back(*i);
err.append("' found in propertyname after '"+node->getPath()+"'"); err.append("' found in propertyname after '"+node->getPath()+"'.");
err.append("\nname may contain only ._- and alphanumeric characters"); err.append(" name may contain only ._- and alphanumeric characters.");
err.append(" Complete path is: '");
for (auto j: path) err.push_back(j);
err.append("'");
throw std::runtime_error(err); throw std::runtime_error(err);
} }
i++; i++;
} }
} }
else { else {
if (path.begin() == i) { if (path.begin() == i) {
std::string err = "'"; std::string err = "'";