commit 0605b039c038acc18dc8059c8cac9b4d18d59287
author Scott Graham <scottmg@google.com> Mon Feb 11 10:44:14 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Feb 11 21:45:15 2019 +0000
tree d70e7df98ec3f8f8a094ff96aba0cc674b3ca52d
parent 71ec8350e8603c5629a3f410afdb52cc98392c1d

[gn][fidl] Fix fallthrough warning, and make ParseProtocolMember return void

bool return value was unused and was somewhat inconsistent as pointed
out by the upcoming fallthrough warning in the gn build. Switch to void
return to make the code a bit clearer.

ZX-3415 #comment [gn][fidl] Fix fallthrough warning, and make ParseProtocolMember return void

Test: CQ
Change-Id: I2b275afc5eb4c62e89bd6779189f7df660a7d817

zircon/system/host/fidl/include/fidl/parser.h

diff --git a/zircon/system/host/fidl/include/fidl/parser.h b/zircon/system/host/fidl/include/fidl/parser.h
index 3cb7207..21e8021 100644
--- a/zircon/system/host/fidl/include/fidl/parser.h
+++ b/zircon/system/host/fidl/include/fidl/parser.h
@@ -216,7 +216,7 @@
         std::unique_ptr<raw::Identifier> method_name);
     // ParseProtocolMember parses any one protocol member, i.e. an event,
     // a method, or a compose stanza.
-    bool ParseProtocolMember(
+    void ParseProtocolMember(
         std::unique_ptr<raw::AttributeList> attributes, ASTScope& scope,
         std::vector<std::unique_ptr<raw::ComposeProtocol>>* composed_protocols,
         std::vector<std::unique_ptr<raw::InterfaceMethod>>* methods);

zircon/system/host/fidl/lib/parser.cpp

diff --git a/zircon/system/host/fidl/lib/parser.cpp b/zircon/system/host/fidl/lib/parser.cpp
index aa83a58..cabfe37 100644
--- a/zircon/system/host/fidl/lib/parser.cpp
+++ b/zircon/system/host/fidl/lib/parser.cpp
@@ -717,7 +717,7 @@
                                                   std::move(maybe_error));
 }
 
-bool Parser::ParseProtocolMember(
+void Parser::ParseProtocolMember(
     std::unique_ptr<raw::AttributeList> attributes, ASTScope& scope,
     std::vector<std::unique_ptr<raw::ComposeProtocol>>* composed_protocols,
     std::vector<std::unique_ptr<raw::InterfaceMethod>>* methods) {
@@ -726,30 +726,32 @@
         case Token::Kind::kArrow: {
             auto event = ParseProtocolEvent(std::move(attributes), scope, nullptr /* ordinal */);
             methods->push_back(std::move(event));
-            return true;
+            break;
         }
         case Token::Kind::kIdentifier: {
             auto identifier = ParseIdentifier();
             if (!Ok())
-                return false;
+                break;
             if (Peek().kind() == Token::Kind::kLeftParen) {
                 auto method = ParseProtocolMethod(
                     std::move(attributes), scope, nullptr /* ordinal */, std::move(identifier));
                 methods->push_back(std::move(method));
+                break;
             } else if (identifier->location().data() == "compose") {
                 auto protocol_name = ParseCompoundIdentifier();
                 if (!Ok())
-                    return false;
+                    break;
                 composed_protocols->push_back(std::make_unique<raw::ComposeProtocol>(
                     raw::SourceElement(identifier->start_, protocol_name->end_),
                     std::move(protocol_name)));
+                break;
             } else {
                 Fail("unrecognized protocol member");
-                return false;
+                break;
             }
         }
         default:
-            return false;
+            break;
     }
 }