AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Enum::foreach(), change EnumValue to return SKSL_INT

Browse Source 
This gives a nicer interface (name + SKSL_INT) to getting all the values
of an enum (rather than iterating over the symbol table). Will be used
in a follow-up CL.

Change-Id: I1c104623bd06f770c57b88ca9996d3e8c87a3ca7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/379057
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
This commit is contained in:
Brian Osman 2021-03-03 12:51:31 -05:00 committed by Skia Commit-Bot
parent 46d9bb255d
commit db6ad656ee
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sksl/ir/SkSLEnum.h
View File

@ -57,15 +57,16 @@ public:
String code() const {
String result = "enum class " + this->typeName() + " {\n";
String separator;
std::vector<const Symbol*> sortedSymbols;
struct Enumerant { StringFragment name; SKSL_INT value; };
std::vector<Enumerant> sortedSymbols;
sortedSymbols.reserve(symbols()->count());
this->symbols()->foreach([&](StringFragment, const Symbol* symbol) {
sortedSymbols.push_back(symbol);
this->foreach([&](StringFragment name, SKSL_INT value){
sortedSymbols.push_back({name, value});
});
std::sort(sortedSymbols.begin(), sortedSymbols.end(),
[](const Symbol* a, const Symbol* b) { return EnumValue(a) < EnumValue(b); });
for (const Symbol* s : sortedSymbols) {
result += separator + " " + s->name() + " = " + to_string(EnumValue(s));
[](const Enumerant& a, const Enumerant& b) { return a.value < b.value; });
for (const auto& entry : sortedSymbols) {
result += separator + " " + entry.name + " = " + to_string(entry.value);
separator = ",\n";
}
result += "\n};";
@ -76,8 +77,13 @@ public:
return this->code();
}
template <typename Fn> void foreach(Fn&& fn) const {
this->symbols()->foreach(
[&fn](StringFragment name, const Symbol* symbol) { fn(name, EnumValue(symbol)); });
}
private:
static int EnumValue(const Symbol* symbol) {
static SKSL_INT EnumValue(const Symbol* symbol) {
return symbol->as<Variable>().initialValue()->as<IntLiteral>().value();
}