Skip to content
Snippets Groups Projects
Commit 61b40d81 authored by Lev Walkin's avatar Lev Walkin
Browse files

CHOICE XER decoder

parent da3ca411
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 32 deletions
libasn1compiler/asn1c_C.c
+ 9
− 5
View file @ 61b40d81
......@@ -1508,11 +1508,15 @@ emit_type_DEF(arg_t *arg, asn1p_expr_t *expr, enum tvm_compat tv_mode, int tags_
OUT("%s_constraint,\n", p);
OUT("%s_decode_ber,\n", p);
OUT("%s_encode_der,\n", p);
if(!(expr->expr_type & ASN_CONSTR_MASK)
&& (expr->expr_type != ASN_CONSTR_SEQUENCE))
OUT("%s_decode_xer,\n", p);
else
OUT("0,\t\t\t\t/* Not implemented yet */\n");
switch(expr->expr_type) {
case ASN_CONSTR_SET:
case ASN_CONSTR_SET_OF:
case ASN_CONSTR_SEQUENCE_OF:
OUT("0,\t\t\t\t/* Not implemented yet */\n");
break;
default:
OUT("%s_decode_xer,\n", p);
}
OUT("%s_encode_xer,\n", p);
p = MKID(expr->Identifier);
......
tests/19-param-OK.asn1.-P
+ 2
− 2
View file @ 61b40d81
......@@ -114,7 +114,7 @@ asn_TYPE_descriptor_t asn_DEF_toBeSigned = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_toBeSigned_tags,
......@@ -175,7 +175,7 @@ asn_TYPE_descriptor_t asn_DEF_Certificate = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_Certificate_tags,
......
tests/31-set-of-OK.asn1.-P
+ 3
− 3
View file @ 61b40d81
......@@ -122,7 +122,7 @@ asn_TYPE_descriptor_t asn_DEF_Tree = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_Tree_tags,
......@@ -289,7 +289,7 @@ asn_TYPE_descriptor_t asn_DEF_anything_member = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_anything_member_tags,
......@@ -382,7 +382,7 @@ asn_TYPE_descriptor_t asn_DEF_other = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......
tests/32-sequence-of-OK.asn1.-P
+ 1
− 1
View file @ 61b40d81
......@@ -167,7 +167,7 @@ asn_TYPE_descriptor_t asn_DEF_Error = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_Error_tags,
......
tests/39-sequence-of-OK.asn1.-P
+ 2
− 2
View file @ 61b40d81
......@@ -108,7 +108,7 @@ asn_TYPE_descriptor_t asn_DEF_T = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_T_tags,
......@@ -185,7 +185,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_T2_tags,
......
tests/42-real-life-OK.asn1.-PR
+ 6
− 6
View file @ 61b40d81
......@@ -144,7 +144,7 @@ asn_TYPE_descriptor_t asn_DEF_LogLine = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_LogLine_tags,
......@@ -294,7 +294,7 @@ asn_TYPE_descriptor_t asn_DEF_VariablePartSet = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_VariablePartSet_tags,
......@@ -474,7 +474,7 @@ asn_TYPE_descriptor_t asn_DEF_vrange = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_vrange_tags,
......@@ -525,7 +525,7 @@ asn_TYPE_descriptor_t asn_DEF_VariablePart = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......@@ -671,7 +671,7 @@ asn_TYPE_descriptor_t asn_DEF_notify = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_notify_tags,
......@@ -724,7 +724,7 @@ asn_TYPE_descriptor_t asn_DEF_ActionItem = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_ActionItem_tags,
......
tests/43-recursion-OK.asn1.-P
+ 2
− 2
View file @ 61b40d81
......@@ -175,7 +175,7 @@ asn_TYPE_descriptor_t asn_DEF_Test_structure_1 = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_Test_structure_1_tags,
......@@ -330,7 +330,7 @@ asn_TYPE_descriptor_t asn_DEF_Choice_1 = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......
tests/44-choice-in-sequence-OK.asn1.-P
+ 4
− 4
View file @ 61b40d81
......@@ -106,7 +106,7 @@ asn_TYPE_descriptor_t asn_DEF_e = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......@@ -156,7 +156,7 @@ asn_TYPE_descriptor_t asn_DEF_h = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......@@ -223,7 +223,7 @@ asn_TYPE_descriptor_t asn_DEF_b = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......@@ -279,7 +279,7 @@ asn_TYPE_descriptor_t asn_DEF_T = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_T_tags,
......
tests/46-redefine-OK.asn1.-PR
+ 1
− 1
View file @ 61b40d81
......@@ -70,7 +70,7 @@ asn_TYPE_descriptor_t asn_DEF_ConstructedType = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_ConstructedType_tags,
......
tests/47-set-ext-OK.asn1.-P
+ 2
− 2
View file @ 61b40d81
......@@ -237,7 +237,7 @@ asn_TYPE_descriptor_t asn_DEF_T3 = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......@@ -312,7 +312,7 @@ asn_TYPE_descriptor_t asn_DEF_T4 = {
CHOICE_constraint,
CHOICE_decode_ber,
CHOICE_encode_der,
0, /* Not implemented yet */
CHOICE_decode_xer,
CHOICE_encode_xer,
CHOICE_outmost_tag,
0, /* No effective tags (pointer) */
......
tests/60-any-OK.asn1.-P
+ 2
− 2
View file @ 61b40d81
......@@ -60,7 +60,7 @@ asn_TYPE_descriptor_t asn_DEF_T1 = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_T1_tags,
......@@ -137,7 +137,7 @@ asn_TYPE_descriptor_t asn_DEF_T2 = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_T2_tags,
......
tests/65-multi-tag-OK.asn1.-P
+ 1
− 1
View file @ 61b40d81
......@@ -836,7 +836,7 @@ asn_TYPE_descriptor_t asn_DEF_Ts = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_Ts_tags,
......
tests/65-multi-tag-OK.asn1.-Pfnative-types
+ 1
− 1
View file @ 61b40d81
......@@ -836,7 +836,7 @@ asn_TYPE_descriptor_t asn_DEF_Ts = {
SEQUENCE_constraint,
SEQUENCE_decode_ber,
SEQUENCE_encode_der,
0, /* Not implemented yet */
SEQUENCE_decode_xer,
SEQUENCE_encode_xer,
0, /* Use generic outmost tag fetcher */
asn_DEF_Ts_tags,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment