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

Merge branch 'ehofman/propfix' into next

Browse Source
This commit is contained in:
Tim Moore
2010-03-16 17:15:29 +01:00
parent 7b1d1fd288 64072be83c
commit 60349a8690
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/props/props.cxx
+14 -5
View File
@@ -94,7 +94,7 @@ public:
template<typename Range> template<typename Range>
inline Range inline Range
parse_name (const Range &path) parse_name (const SGPropertyNode *node, const Range &path)
{ {
typename Range::iterator i = path.begin(); typename Range::iterator i = path.begin();
typename Range::iterator max = path.end(); typename Range::iterator max = path.end();
@@ -118,15 +118,24 @@ parse_name (const Range &path)
} else if (*i == '[' || *i == '/') { } else if (*i == '[' || *i == '/') {
break; break;
} else { } else {
throw string("name may contain only ._- and alphanumeric characters"); string err = "'";
err.push_back(*i);
err.append("' found in propertyname after '"+node->getNameString()+"'");
err.append("\nname may contain only ._- and alphanumeric characters");
throw err;
} }
i++; i++;
} }
} }
else { else {
if (path.begin() == i) if (path.begin() == i) {
throw string("name must begin with alpha or '_'"); string err = "'";
err.push_back(*i);
err.append("' found in propertyname after '"+node->getNameString()+"'");
err.append("\nname must begin with alpha or '_'");
throw err;
}
} }
return Range(path.begin(), i); return Range(path.begin(), i);
} }
@@ -268,7 +277,7 @@ find_node_aux(SGPropertyNode * current, SplitItr& itr, bool create,
// Empty name at this point is empty, not root. // Empty name at this point is empty, not root.
if (token.empty()) if (token.empty())
return find_node_aux(current, ++itr, create, last_index); return find_node_aux(current, ++itr, create, last_index);
Range name = parse_name(token); Range name = parse_name(current, token);
if (equals(name, ".")) if (equals(name, "."))
return find_node_aux(current, ++itr, create, last_index); return find_node_aux(current, ++itr, create, last_index);
if (equals(name, "..")) { if (equals(name, "..")) {