Skip to content
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.

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

ASN_TAG_AMBIGUOUS #249

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Regenerate tests-asn1c-compiler
ringlej committed Nov 22, 2017
commit e060632f08ee4ee1b2135fec621f01f9b3a5cf62
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = {
.name = "ident"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct Frame, value),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_value_3,
.type_selector = select_Frame_value_type,
Original file line number Diff line number Diff line change
@@ -185,7 +185,7 @@ static asn_TYPE_member_t asn_MBR_Frame_1[] = {
.name = "ident"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct Frame, value),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_value_3,
.type_selector = select_Frame_value_type,
Original file line number Diff line number Diff line change
@@ -244,7 +244,7 @@ asn_TYPE_member_t asn_MBR_SpecializedContent_30P0_1[] = {
.name = "id"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct SpecializedContent_30P0, value),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_value_3,
.type_selector = select_SpecializedContent_30P0_value_type,
Original file line number Diff line number Diff line change
@@ -260,7 +260,7 @@ asn_TYPE_member_t asn_MBR_SpecializedContent_30P0_1[] = {
.name = "id"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct SpecializedContent_30P0, value),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_value_3,
.type_selector = select_SpecializedContent_30P0_value_type,
Original file line number Diff line number Diff line change
@@ -725,7 +725,7 @@ asn_TYPE_member_t asn_MBR_Packet_51P0_1[] = {
.name = "color"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct Packet_51P0, value),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_value_4,
.type_selector = 0,
2 changes: 1 addition & 1 deletion tests/tests-asn1c-compiler/156-union-ios-OK.asn1.-Pgen-PER
Original file line number Diff line number Diff line change
@@ -291,7 +291,7 @@ asn_TYPE_member_t asn_MBR_SpecializedContent_42P0_1[] = {
.name = "id"
},
{ ATF_OPEN_TYPE | ATF_NOFLAGS, 0, offsetof(struct SpecializedContent_42P0, value),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_value_3,
.type_selector = select_SpecializedContent_42P0_value_type,
Original file line number Diff line number Diff line change
@@ -417,7 +417,7 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = {
.name = "anything"
},
{ ATF_POINTER, 1, offsetof(struct Stuff, other),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_other_9,
.type_selector = 0,
2 changes: 1 addition & 1 deletion tests/tests-asn1c-compiler/31-set-of-OK.asn1.-Pfwide-types
Original file line number Diff line number Diff line change
@@ -417,7 +417,7 @@ static asn_TYPE_member_t asn_MBR_Stuff_1[] = {
.name = "anything"
},
{ ATF_POINTER, 1, offsetof(struct Stuff, other),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_other_9,
.type_selector = 0,
2 changes: 1 addition & 1 deletion tests/tests-asn1c-compiler/42-real-life-OK.asn1.-PR
Original file line number Diff line number Diff line change
@@ -222,7 +222,7 @@ memb_vparts_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,

static asn_TYPE_member_t asn_MBR_vparts_2[] = {
{ ATF_POINTER, 0, 0,
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_VariablePart,
.type_selector = 0,
Original file line number Diff line number Diff line change
@@ -245,7 +245,7 @@ extern asn_TYPE_member_t asn_MBR_Choice_1_1[4];

static asn_TYPE_member_t asn_MBR_or_3[] = {
{ ATF_POINTER, 0, 0,
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_Choice_1,
.type_selector = 0,
4 changes: 2 additions & 2 deletions tests/tests-asn1c-compiler/44-choice-in-sequence-OK.asn1.-P
Original file line number Diff line number Diff line change
@@ -188,7 +188,7 @@ static asn_TYPE_member_t asn_MBR_b_3[] = {
.name = "d"
},
{ ATF_NOFLAGS, 0, offsetof(struct b, choice.e),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_e_6,
.type_selector = 0,
@@ -249,7 +249,7 @@ static asn_TYPE_member_t asn_MBR_T_1[] = {
.name = "a"
},
{ ATF_NOFLAGS, 0, offsetof(struct T, b),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_b_3,
.type_selector = 0,
6 changes: 3 additions & 3 deletions tests/tests-asn1c-compiler/60-any-OK.asn1.-Pfwide-types
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ static asn_TYPE_member_t asn_MBR_T1_1[] = {
.name = "i"
},
{ ATF_ANY_TYPE | ATF_NOFLAGS, 0, offsetof(struct T1, any),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_ANY,
.type_selector = 0,
@@ -169,7 +169,7 @@ extern asn_TYPE_descriptor_t asn_DEF_T3;

static asn_TYPE_member_t asn_MBR_T3_1[] = {
{ ATF_ANY_TYPE | ATF_NOFLAGS, 0, offsetof(struct T3, any1),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_ANY,
.type_selector = 0,
@@ -178,7 +178,7 @@ static asn_TYPE_member_t asn_MBR_T3_1[] = {
.name = "any1"
},
{ ATF_ANY_TYPE | ATF_NOFLAGS, 0, offsetof(struct T3, any2),
.tag = -1 /* Ambiguous tag (ANY?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (ANY?) */,
.tag_mode = 0,
.type = &asn_DEF_ANY,
.type_selector = 0,
4 changes: 2 additions & 2 deletions tests/tests-asn1c-compiler/70-xer-test-OK.asn1.-Pfwide-types
Original file line number Diff line number Diff line change
@@ -1388,7 +1388,7 @@ extern asn_TYPE_member_t asn_MBR_SetOfChoice_1[1];

asn_TYPE_member_t asn_MBR_SetOfChoice_1[] = {
{ ATF_POINTER, 0, 0,
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_SimpleChoice,
.type_selector = 0,
@@ -1454,7 +1454,7 @@ extern asn_TYPE_member_t asn_MBR_NamedSetOfChoice_1[1];

asn_TYPE_member_t asn_MBR_NamedSetOfChoice_1[] = {
{ ATF_POINTER, 0, 0,
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_SimpleChoice,
.type_selector = 0,
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ static asn_TYPE_member_t asn_MBR_Member_2[] = {
.name = "t1"
},
{ ATF_NOFLAGS, 0, offsetof(struct Member, t2),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_Type2,
.type_selector = 0,
@@ -258,7 +258,7 @@ asn_TYPE_descriptor_t asn_DEF_one_name_2 = {

asn_TYPE_member_t asn_MBR_Type1_1[] = {
{ ATF_NOFLAGS, 0, offsetof(struct Type1, one_name),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_one_name_2,
.type_selector = 0,
Original file line number Diff line number Diff line change
@@ -475,7 +475,7 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = {

static asn_TYPE_member_t asn_MBR_c_5[] = {
{ ATF_POINTER, 0, 0,
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_Choice3,
.type_selector = 0,
Original file line number Diff line number Diff line change
@@ -474,7 +474,7 @@ asn_TYPE_descriptor_t asn_DEF_a_2 = {

static asn_TYPE_member_t asn_MBR_c_5[] = {
{ ATF_POINTER, 0, 0,
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_Choice3,
.type_selector = 0,
Original file line number Diff line number Diff line change
@@ -127,7 +127,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = {
.name = "bitstr"
},
{ ATF_NOFLAGS, 0, offsetof(struct Choice, choice.ch),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_ch_4,
.type_selector = 0,
Original file line number Diff line number Diff line change
@@ -143,7 +143,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = {
.name = "bitstr"
},
{ ATF_NOFLAGS, 0, offsetof(struct Choice, choice.ch),
.tag = -1 /* Ambiguous tag (CHOICE?) */,
.tag = ASN_TAG_AMBIGUOUS /* Ambiguous tag (CHOICE?) */,
.tag_mode = 0,
.type = &asn_DEF_ch_4,
.type_selector = 0,