aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/bookmaker/definition.cpp
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@skia.org>2018-05-30 09:21:49 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-05-30 13:46:38 +0000
commit137b87485508e3882968a10559c2cb389dcc93c5 (patch)
tree7f45aec7b2f0252830ef7d417b71e87bfcc9e299 /tools/bookmaker/definition.cpp
parent594b64c4851c82597b3a2045062efad42039d461 (diff)
generate include comments
- formalize how aliases and substitutions work together - add constexpr, #define, typedef support - check for correct description order - write short enum, struct members R=caryclark@google.com Docs-Preview: https://skia.org/?cl=129455 Bug: skia:6898 Change-Id: Id60fc2ed02f38a7ba4e5cad5ef493d8c674e6183 Reviewed-on: https://skia-review.googlesource.com/129455 Commit-Queue: Cary Clark <caryclark@skia.org> Reviewed-by: Cary Clark <caryclark@skia.org> Auto-Submit: Cary Clark <caryclark@skia.org>
Diffstat (limited to 'tools/bookmaker/definition.cpp')
-rw-r--r--tools/bookmaker/definition.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/tools/bookmaker/definition.cpp b/tools/bookmaker/definition.cpp
index 1c6b1ebbe0..18ce808068 100644
--- a/tools/bookmaker/definition.cpp
+++ b/tools/bookmaker/definition.cpp
@@ -814,21 +814,20 @@ bool Definition::hasMatch(string name) const {
}
string Definition::incompleteMessage(DetailsType detailsType) const {
- if (!IncompleteAllowed(fMarkType)) {
- auto iter = std::find_if(fChildren.begin(), fChildren.end(),
- [](const Definition* test) { return IncompleteAllowed(test->fMarkType); });
- SkASSERT(fChildren.end() != iter);
- return (*iter)->incompleteMessage(detailsType);
- }
- string message = MarkType::kExperimental == fMarkType ?
+ SkASSERT(!IncompleteAllowed(fMarkType));
+ auto iter = std::find_if(fChildren.begin(), fChildren.end(),
+ [](const Definition* test) { return IncompleteAllowed(test->fMarkType); });
+ SkASSERT(fChildren.end() != iter);
+ SkASSERT(Details::kNone == (*iter)->fDetails);
+ string message = MarkType::kExperimental == (*iter)->fMarkType ?
"Experimental." : "Deprecated.";
- if (Definition::Details::kDoNotUse_Experiement == fDetails) {
+ if (Details::kDoNotUse_Experiment == fDetails) {
message += " Do not use.";
- } else if (Definition::Details::kNotReady_Experiment == fDetails) {
+ } else if (Details::kNotReady_Experiment == fDetails) {
message += " Not ready for general use.";
- } else if (Definition::Details::kSoonToBe_Deprecated == fDetails) {
- message += " Soon to be deprecated.";
- } else if (Definition::Details::kTestingOnly_Experiment == fDetails) {
+ } else if (Details::kSoonToBe_Deprecated == fDetails) {
+ message = "To be deprecated soon.";
+ } else if (Details::kTestingOnly_Experiment == fDetails) {
message += " For testing only.";
}
if (DetailsType::kPhrase == detailsType) {