commit 38d2d68b9847ff297bc387c2516de51f44dd0784
author George Kulakowski <kulakowski@google.com> Fri Feb 23 08:53:53 2018 -0800
committer George Kulakowski <kulakowski@google.com> Sat Feb 24 19:28:49 2018 +0000
tree df413bea1106235b1500174092b032f31bf073e4
parent 7f647652ad2b05355ba93bd140ccd790a3c1013e

[fidl] Give flat_ast Decls a uniform subtype so they can be referred to by pointer

Change-Id: I10b66f616356629ef45c736c7da6901ff904b3c1

system/host/fidl/include/fidl/flat_ast.h

diff --git a/system/host/fidl/include/fidl/flat_ast.h b/system/host/fidl/include/fidl/flat_ast.h
index 2264db1..06198ba 100644
--- a/system/host/fidl/include/fidl/flat_ast.h
+++ b/system/host/fidl/include/fidl/flat_ast.h
@@ -38,6 +38,9 @@
     explicit Name(std::unique_ptr<raw::Identifier> name)
         : name_(std::move(name)) {}
 
+    Name(Name&&) = default;
+    Name& operator=(Name&&) = default;
+
     const raw::Identifier* get() const { return name_.get(); }
 
     bool operator<(const Name& other) const {
@@ -48,15 +51,35 @@
     std::unique_ptr<raw::Identifier> name_;
 };
 
-struct Const {
-    Const(Name name, std::unique_ptr<raw::Type> type, std::unique_ptr<raw::Constant> value)
-        : name(std::move(name)), type(std::move(type)), value(std::move(value)) {}
+struct Decl {
+    virtual ~Decl() {}
+
+    enum struct Kind {
+        kConst,
+        kEnum,
+        kInterface,
+        kStruct,
+        kUnion,
+    };
+
+    Decl(Kind kind, Name name)
+        : kind(kind), name(std::move(name)) {}
+
+    Decl(Decl&&) = default;
+    Decl& operator=(Decl&&) = default;
+
+    const Kind kind;
     Name name;
+};
+
+struct Const : public Decl {
+    Const(Name name, std::unique_ptr<raw::Type> type, std::unique_ptr<raw::Constant> value)
+        : Decl(Kind::kConst, std::move(name)), type(std::move(type)), value(std::move(value)) {}
     std::unique_ptr<raw::Type> type;
     std::unique_ptr<raw::Constant> value;
 };
 
-struct Enum {
+struct Enum : public Decl {
     struct Member {
         Member(Name name, std::unique_ptr<raw::Constant> value)
             : name(std::move(name)), value(std::move(value)) {}
@@ -65,14 +88,13 @@
     };
 
     Enum(Name name, std::unique_ptr<raw::PrimitiveType> type, std::vector<Member> members)
-        : name(std::move(name)), type(std::move(type)), members(std::move(members)) {}
+        : Decl(Kind::kEnum, std::move(name)), type(std::move(type)), members(std::move(members)) {}
 
-    Name name;
     std::unique_ptr<raw::PrimitiveType> type;
     std::vector<Member> members;
 };
 
-struct Interface {
+struct Interface : public Decl {
     struct Method {
         struct Parameter {
             Parameter(std::unique_ptr<raw::Type> type, std::unique_ptr<raw::Identifier> name)
@@ -108,13 +130,12 @@
     };
 
     Interface(Name name, std::vector<Method> methods)
-        : name(std::move(name)), methods(std::move(methods)) {}
+        : Decl(Kind::kInterface, std::move(name)), methods(std::move(methods)) {}
 
-    Name name;
     std::vector<Method> methods;
 };
 
-struct Struct {
+struct Struct : public Decl {
     struct Member {
         Member(std::unique_ptr<raw::Type> type, std::unique_ptr<raw::Identifier> name,
                std::unique_ptr<raw::Constant> maybe_default_value)
@@ -128,15 +149,14 @@
     };
 
     Struct(Name name, std::vector<Member> members)
-        : name(std::move(name)), members(std::move(members)) {}
+        : Decl(Kind::kStruct, std::move(name)), members(std::move(members)) {}
 
-    Name name;
     std::vector<Member> members;
     // TODO(TO-758) Compute this.
     uint64_t size = 8;
 };
 
-struct Union {
+struct Union : public Decl {
     struct Member {
         Member(std::unique_ptr<raw::Type> type, std::unique_ptr<raw::Identifier> name)
             : type(std::move(type)), name(std::move(name)) {}
@@ -147,9 +167,8 @@
     };
 
     Union(Name name, std::vector<Member> members)
-        : name(std::move(name)), members(std::move(members)) {}
+        : Decl(Kind::kUnion, std::move(name)), members(std::move(members)) {}
 
-    Name name;
     std::vector<Member> members;
     // TODO(TO-758) Compute this.
     uint64_t size = 8;