add starting template support

some support for interfaces containing
template <typename x> class x
includeParser now correctly balances
bracket indentions and builds correct hierarchy.

Cross-check does not detect that the bmh definition
is missing the class; then includeWriter asserts
when the bmh class can't be found.

TBR=caryclark@google.com
Bug: skia:6898
Change-Id: Ibb70667ed4a6f8e553eec3924b56dfde737b4383
Reviewed-on: https://skia-review.googlesource.com/113460
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/tools/bookmaker/includeParser.cpp b/tools/bookmaker/includeParser.cpp
index 07189dcc3f..c69af7a05a 100644
--- a/tools/bookmaker/includeParser.cpp
+++ b/tools/bookmaker/includeParser.cpp
@@ -1723,7 +1723,7 @@ bool IncludeParser::parseObject(Definition* child, Definition* markupDef) {
                     }
                     break;
                 case KeyWord::kTemplate:
-                    if (!this->parseTemplate()) {
+                    if (!this->parseTemplate(child, markupDef)) {
                         return child->reportError<bool>("failed to parse template");
                     }
                     break;
@@ -1849,9 +1849,8 @@ bool IncludeParser::parseObject(Definition* child, Definition* markupDef) {
     return true;
 }
 
-bool IncludeParser::parseTemplate() {
-
-    return true;
+bool IncludeParser::parseTemplate(Definition* child, Definition* markupDef) {
+    return this->parseObjects(child, markupDef);
 }
 
 bool IncludeParser::parseTypedef(Definition* child, Definition* markupDef) {
@@ -2142,7 +2141,8 @@ bool IncludeParser::parseChar() {
             }
             if (Definition::Type::kKeyWord == fParent->fType
                     && KeyProperty::kObject == (kKeyWords[(int) fParent->fKeyWord].fProperty)) {
-                if (KeyWord::kClass == fParent->fKeyWord && fParent->fParent &&
+                bool parentIsClass = KeyWord::kClass == fParent->fKeyWord;
+                if (parentIsClass && fParent->fParent &&
                         KeyWord::kEnum == fParent->fParent->fKeyWord) {
                     this->popObject();
                 }
@@ -2150,6 +2150,9 @@ bool IncludeParser::parseChar() {
                     fInEnum = false;
                 }
                 this->popObject();
+                if (parentIsClass && fParent && KeyWord::kTemplate == fParent->fKeyWord) {
+                    this->popObject();
+                }
                 fPriorEnum = nullptr;
             } else if (Definition::Type::kBracket == fParent->fType
                     && fParent->fParent && Definition::Type::kKeyWord == fParent->fParent->fType