style(3p/nix): Reformat project in Google C++ style

Reformatted with:

    fd . -e hh -e cc | xargs clang-format -i
This commit is contained in:
Vincent Ambo 2020-05-17 16:31:57 +01:00
parent 65a1aae98c
commit 0f2cf531f7
175 changed files with 32126 additions and 34689 deletions

View file

@ -1,56 +1,41 @@
#include "dotgraph.hh"
#include "util.hh"
#include "store-api.hh"
#include <iostream>
#include "store-api.hh"
#include "util.hh"
using std::cout;
namespace nix {
static string dotQuote(const string& s) { return "\"" + s + "\""; }
static string dotQuote(const string & s)
{
return "\"" + s + "\"";
static string nextColour() {
static int n = 0;
static string colours[] = {"black", "red", "green",
"blue", "magenta", "burlywood"};
return colours[n++ % (sizeof(colours) / sizeof(string))];
}
static string nextColour()
{
static int n = 0;
static string colours[] =
{ "black", "red", "green", "blue"
, "magenta", "burlywood" };
return colours[n++ % (sizeof(colours) / sizeof(string))];
static string makeEdge(const string& src, const string& dst) {
format f = format("%1% -> %2% [color = %3%];\n") % dotQuote(src) %
dotQuote(dst) % dotQuote(nextColour());
return f.str();
}
static string makeEdge(const string & src, const string & dst)
{
format f = format("%1% -> %2% [color = %3%];\n")
% dotQuote(src) % dotQuote(dst) % dotQuote(nextColour());
return f.str();
static string makeNode(const string& id, const string& label,
const string& colour) {
format f = format(
"%1% [label = %2%, shape = box, "
"style = filled, fillcolor = %3%];\n") %
dotQuote(id) % dotQuote(label) % dotQuote(colour);
return f.str();
}
static string makeNode(const string & id, const string & label,
const string & colour)
{
format f = format("%1% [label = %2%, shape = box, "
"style = filled, fillcolor = %3%];\n")
% dotQuote(id) % dotQuote(label) % dotQuote(colour);
return f.str();
static string symbolicName(const string& path) {
string p = baseNameOf(path);
return string(p, p.find('-') + 1);
}
static string symbolicName(const string & path)
{
string p = baseNameOf(path);
return string(p, p.find('-') + 1);
}
#if 0
string pathLabel(const Path & nePath, const string & elemPath)
{
@ -92,29 +77,27 @@ void printClosure(const Path & nePath, const StoreExpr & fs)
}
#endif
void printDotGraph(ref<Store> store, const PathSet& roots) {
PathSet workList(roots);
PathSet doneSet;
void printDotGraph(ref<Store> store, const PathSet & roots)
{
PathSet workList(roots);
PathSet doneSet;
cout << "digraph G {\n";
cout << "digraph G {\n";
while (!workList.empty()) {
Path path = *(workList.begin());
workList.erase(path);
while (!workList.empty()) {
Path path = *(workList.begin());
workList.erase(path);
if (doneSet.find(path) != doneSet.end()) continue;
doneSet.insert(path);
if (doneSet.find(path) != doneSet.end()) continue;
doneSet.insert(path);
cout << makeNode(path, symbolicName(path), "#ff0000");
cout << makeNode(path, symbolicName(path), "#ff0000");
for (auto & p : store->queryPathInfo(path)->references) {
if (p != path) {
workList.insert(p);
cout << makeEdge(p, path);
}
}
for (auto& p : store->queryPathInfo(path)->references) {
if (p != path) {
workList.insert(p);
cout << makeEdge(p, path);
}
}
#if 0
StoreExpr ne = storeExprFromPath(path);
@ -146,10 +129,9 @@ void printDotGraph(ref<Store> store, const PathSet & roots)
cout << makeNode(path, label, colour);
#endif
}
}
cout << "}\n";
cout << "}\n";
}
}
} // namespace nix

View file

@ -6,6 +6,6 @@ namespace nix {
class Store;
void printDotGraph(ref<Store> store, const PathSet & roots);
void printDotGraph(ref<Store> store, const PathSet& roots);
}
} // namespace nix

View file

@ -1,90 +1,76 @@
#include "graphml.hh"
#include "util.hh"
#include "store-api.hh"
#include "derivations.hh"
#include <iostream>
#include "derivations.hh"
#include "store-api.hh"
#include "util.hh"
using std::cout;
namespace nix {
static inline const string & xmlQuote(const string & s)
{
// Luckily, store paths shouldn't contain any character that needs to be
// quoted.
return s;
static inline const string& xmlQuote(const string& s) {
// Luckily, store paths shouldn't contain any character that needs to be
// quoted.
return s;
}
static string symbolicName(const string & path)
{
string p = baseNameOf(path);
return string(p, p.find('-') + 1);
static string symbolicName(const string& path) {
string p = baseNameOf(path);
return string(p, p.find('-') + 1);
}
static string makeEdge(const string & src, const string & dst)
{
return fmt(" <edge source=\"%1%\" target=\"%2%\"/>\n",
xmlQuote(src), xmlQuote(dst));
static string makeEdge(const string& src, const string& dst) {
return fmt(" <edge source=\"%1%\" target=\"%2%\"/>\n", xmlQuote(src),
xmlQuote(dst));
}
static string makeNode(const ValidPathInfo & info)
{
return fmt(
" <node id=\"%1%\">\n"
" <data key=\"narSize\">%2%</data>\n"
" <data key=\"name\">%3%</data>\n"
" <data key=\"type\">%4%</data>\n"
" </node>\n",
info.path,
info.narSize,
symbolicName(info.path),
(isDerivation(info.path) ? "derivation" : "output-path"));
static string makeNode(const ValidPathInfo& info) {
return fmt(
" <node id=\"%1%\">\n"
" <data key=\"narSize\">%2%</data>\n"
" <data key=\"name\">%3%</data>\n"
" <data key=\"type\">%4%</data>\n"
" </node>\n",
info.path, info.narSize, symbolicName(info.path),
(isDerivation(info.path) ? "derivation" : "output-path"));
}
void printGraphML(ref<Store> store, const PathSet& roots) {
PathSet workList(roots);
PathSet doneSet;
std::pair<PathSet::iterator, bool> ret;
void printGraphML(ref<Store> store, const PathSet & roots)
{
PathSet workList(roots);
PathSet doneSet;
std::pair<PathSet::iterator,bool> ret;
cout << "<?xml version='1.0' encoding='utf-8'?>\n"
<< "<graphml xmlns='http://graphml.graphdrawing.org/xmlns'\n"
<< " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n"
<< " "
"xsi:schemaLocation='http://graphml.graphdrawing.org/xmlns/1.0/"
"graphml.xsd'>\n"
<< "<key id='narSize' for='node' attr.name='narSize' attr.type='int'/>"
<< "<key id='name' for='node' attr.name='name' attr.type='string'/>"
<< "<key id='type' for='node' attr.name='type' attr.type='string'/>"
<< "<graph id='G' edgedefault='directed'>\n";
cout << "<?xml version='1.0' encoding='utf-8'?>\n"
<< "<graphml xmlns='http://graphml.graphdrawing.org/xmlns'\n"
<< " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'\n"
<< " xsi:schemaLocation='http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd'>\n"
<< "<key id='narSize' for='node' attr.name='narSize' attr.type='int'/>"
<< "<key id='name' for='node' attr.name='name' attr.type='string'/>"
<< "<key id='type' for='node' attr.name='type' attr.type='string'/>"
<< "<graph id='G' edgedefault='directed'>\n";
while (!workList.empty()) {
Path path = *(workList.begin());
workList.erase(path);
while (!workList.empty()) {
Path path = *(workList.begin());
workList.erase(path);
ret = doneSet.insert(path);
if (ret.second == false) continue;
ret = doneSet.insert(path);
if (ret.second == false) continue;
ValidPathInfo info = *(store->queryPathInfo(path));
cout << makeNode(info);
for (auto & p : store->queryPathInfo(path)->references) {
if (p != path) {
workList.insert(p);
cout << makeEdge(path, p);
}
}
ValidPathInfo info = *(store->queryPathInfo(path));
cout << makeNode(info);
for (auto& p : store->queryPathInfo(path)->references) {
if (p != path) {
workList.insert(p);
cout << makeEdge(path, p);
}
}
}
cout << "</graph>\n";
cout << "</graphml>\n";
cout << "</graph>\n";
cout << "</graphml>\n";
}
}
} // namespace nix

View file

@ -6,6 +6,6 @@ namespace nix {
class Store;
void printGraphML(ref<Store> store, const PathSet & roots);
void printGraphML(ref<Store> store, const PathSet& roots);
}
} // namespace nix

File diff suppressed because it is too large Load diff