Skip to content

Commit 1052799

Browse files
authored
Merge pull request #215 from JuliaIO/td-moar-semicolons
Allow trailing semicolon after `oneof` fields
2 parents f363948 + bb81b7c commit 1052799

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/parsing/proto_types.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ function parse_oneof_type(ps::ParserState, definitions, name_prefix="")
262262
push!(fields, parse_field(ps, false))
263263
end
264264
end
265+
accept(ps, Tokens.SEMICOLON)
265266
return OneOfType(name, fields, options)
266267
end
267268

test/test_parser.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ end
6262
@test haskey(p.definitions, "A")
6363
@test p.definitions["A"] isa Parsers.MessageType
6464
end
65-
65+
6666
@testset "Single message proto file with single decimal-numbered field" begin
6767
s, p, ctx = translate_simple_proto("message A { required uint32 b = 1234; }")
6868

@@ -93,7 +93,7 @@ end
9393
end
9494

9595
@testset "Trailing semicolon is fine" begin
96-
s, p, ctx = translate_simple_proto("message A {}; enum B { b = 0; };")
96+
s, p, ctx = translate_simple_proto("message A { oneof oneof_field { uint32 u = 1; };}; enum B { b = 0; };")
9797

9898
@test haskey(p.definitions, "A")
9999
@test p.definitions["A"] isa Parsers.MessageType

0 commit comments

Comments
 (0)