maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libexpr): Use std::string as qualified type

Browse source 
Replaces most uses of `string` with `std::string`.

This came up because I removed the "types.hh" import from
"symbol-table.hh", which percolated through a bunch of files where
`string` was suddenly no longer defined ... *sigh*
This commit is contained in:
Vincent Ambo 2020-05-21 05:43:22 +01:00
parent b97307056d
commit a162f4e825
26 changed files with 196 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/libexpr/json-to-value.cc vendored
View file

@ -10,8 +10,8 @@ static void skipWhitespace(const char*& s) {
}
}
static string parseJSONString(const char*& s) {
string res;
static std::string parseJSONString(const char*& s) {
std::string res;
if (*s++ != '"') {
throw JSONParseError("expected JSON string");
}
@ -97,7 +97,7 @@ static void parseJSON(EvalState& state, const char*& s, Value& v) {
if (attrs.empty() && *s == '}') {
break;
}
string name = parseJSONString(s);
std::string name = parseJSONString(s);
skipWhitespace(s);
if (*s != ':') {
throw JSONParseError("expected ':' in JSON object");
@ -128,7 +128,7 @@ static void parseJSON(EvalState& state, const char*& s, Value& v) {
}
else if ((isdigit(*s) != 0) || *s == '-' || *s == '.') {
// Buffer into a string first, then use built-in C++ conversions
// Buffer into a std::string first, then use built-in C++ conversions
std::string tmp_number;
ValueType number_type = tInt;
@ -173,7 +173,7 @@ static void parseJSON(EvalState& state, const char*& s, Value& v) {
}
}
void parseJSON(EvalState& state, const string& s_, Value& v) {
void parseJSON(EvalState& state, const std::string& s_, Value& v) {
const char* s = s_.c_str();
parseJSON(state, s, v);
skipWhitespace(s);