Skip to content

Added support for oneof fields #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
britzl wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Added support for oneof fields #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions protobuf-c-text/generate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,14 @@ protobuf_c_text_to_string_internal(ReturnString *rs,
return;
}

if (0 != (f[i].flags & PROTOBUF_C_FIELD_FLAG_ONEOF) &&
f[i].id != STRUCT_MEMBER(uint32_t, m, f[i].quantifier_offset))
{
/* This is not the selected oneof, skip it */
continue;
}


/* Decide if something needs to be done for this field. */
switch (f[i].label) {
case PROTOBUF_C_LABEL_OPTIONAL:
Expand Down
10 changes: 10 additions & 0 deletions protobuf-c-text/parse.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,10 @@ state_assignment(State *state, Token *t)
} else {
STRUCT_MEMBER(ProtobufCMessage *, msg, state->field->offset)
= state->msgs[state->current_msg];
/* Set the field as the assigned oneof */
if (0 != (state->field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF)) {
STRUCT_MEMBER(uint32_t, msg, state->field->quantifier_offset) = state->field->id;
}
return STATE_OPEN;
}

Expand Down Expand Up @@ -789,6 +793,12 @@ state_value(State *state, Token *t)
state->field->quantifier_offset) = 1;
}
}

/* Set the field as the assigned oneof */
if (0 != (state->field->flags & PROTOBUF_C_FIELD_FLAG_ONEOF)) {
STRUCT_MEMBER(uint32_t, msg, state->field->quantifier_offset) = state->field->id;
}

switch (t->id) {
case TOK_BAREWORD:
if (state->field->type == PROTOBUF_C_TYPE_ENUM) {
Expand Down