revng artifact: omit kind

When working with `revng artifact`, omit the kind in both the output of
`--list` and the parameters taken specifying which targets to produce.
This commit is contained in:
Giacomo Vercesi
2025-02-06 17:03:21 +01:00
parent 8ba134bb45
commit e3074ec29a
3 changed files with 11 additions and 29 deletions
+1 -11
View File
@@ -106,6 +106,7 @@ public:
public:
std::string toString() const;
std::string path() const;
void dump() const debug_function { dump(dbg); }
@@ -114,17 +115,6 @@ public:
indent(OS, Indentation);
OS << toString() << '\n';
}
template<typename OStream>
void dumpPathComponents(OStream &OS) const debug_function {
OS << "/";
for (const auto &Entry : Components) {
OS << Entry;
if (&Entry != &Components.back())
OS << "/";
}
OS << ":" << K->name().str();
}
};
class KindsRegistry;
+5 -14
View File
@@ -78,21 +78,12 @@ int Target::operator<=>(const Target &Other) const {
return 0;
}
std::string Target::path() const {
return llvm::join(Components, "/");
}
std::string Target::toString() const {
std::string ToReturn;
if (Components.size() == 0) {
return ":" + K->name().str();
}
for (size_t I = 0; I < Components.size() - 1; I++)
ToReturn += Components[I] + "/";
ToReturn += Components.back();
ToReturn += ":";
ToReturn += K->name();
return ToReturn;
return path() + ":" + K->name().str();
}
llvm::Expected<Target> Target::deserialize(Context &Context,
+5 -4
View File
@@ -186,8 +186,7 @@ int main(int argc, char *argv[]) {
auto State = StepState.second.find(ContainerName)->second.filter(*Kind);
for (const auto &Entry : State) {
Entry.dumpPathComponents(dbg);
dbg << "\n";
dbg << Entry.path() << "\n";
}
return EXIT_SUCCESS;
}
@@ -197,8 +196,10 @@ int main(int argc, char *argv[]) {
Map.add(ContainerName, Kind->allTargets(Manager.context()));
} else {
for (llvm::StringRef Argument : llvm::drop_begin(Arguments, 2)) {
auto RequestedTarget = AbortOnError(Target::deserialize(Manager.context(),
Argument));
std::string ArgumentWithKind = (Argument + ":" + Kind->name()).str();
auto
RequestedTarget = AbortOnError(Target::deserialize(Manager.context(),
ArgumentWithKind));
Map.add(ContainerName, RequestedTarget);
}
}