Made .proto parsing understand nested declarations.

Bug: 24401812
Change-Id: I196a03b8c5ef0bcd3c26178239c764e40ca1950d
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2015-09-28 09:42:45 -07:00
parent a35c32e30f
commit 2abe24b9dd
5 changed files with 57 additions and 52 deletions

View File

@@ -9,12 +9,6 @@ enum ProtoEnum : short {
BAR = 5,
}
table OtherMessage {
a:double;
/// doc comment for b.
b:float = 3.14149;
}
/// 2nd table doc comment with
/// many lines.
table ProtoMessage {
@@ -39,3 +33,9 @@ table ProtoMessage {
o:[string];
}
table OtherMessage {
a:double;
/// doc comment for b.
b:float = 3.14149;
}

View File

@@ -12,16 +12,16 @@ enum ProtoEnum {
BAR = 5;
}
// Ignored non-doc comment.
message OtherMessage {
optional double a = 26;
/// doc comment for b.
optional float b = 32 [default = 3.14149];
}
/// 2nd table doc comment with
/// many lines.
message ProtoMessage {
// Ignored non-doc comment.
// A nested message declaration, will be moved to top level in .fbs
message OtherMessage {
optional double a = 26;
/// doc comment for b.
optional float b = 32 [default = 3.14149];
}
optional int32 c = 12 [default = 16];
optional int64 d = 1 [default = 0];
optional uint32 p = 1;