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

4
third_party/nix/src/libexpr/nixexpr.cc vendored
View file

@ -14,7 +14,7 @@ std::ostream& operator<<(std::ostream& str, const Expr& e) {
return str;
}
static void showString(std::ostream& str, const string& s) {
static void showString(std::ostream& str, const std::string& s) {
str << '"';
for (auto c : (string)s) {
if (c == '"' || c == '\\' || c == '$') {
@ -32,7 +32,7 @@ static void showString(std::ostream& str, const string& s) {
str << '"';
}
static void showId(std::ostream& str, const string& s) {
static void showId(std::ostream& str, const std::string& s) {
if (s.empty()) {
str << "\"\"";
} else if (s == "if") { // FIXME: handle other keywords