regenerated
diff --git a/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.-Pgen-OER b/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.-Pgen-OER
index fc7e8ff..e973c95 100644
--- a/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.-Pgen-OER
+++ b/tests/tests-asn1c-compiler/138-oer-constraints-OK.asn1.-Pgen-OER
@@ -36,15 +36,13 @@
"A-noc",
"A-noc",
&asn_OP_NativeInteger,
- NativeInteger_constraint,
asn_DEF_A_noc_tags_1,
sizeof(asn_DEF_A_noc_tags_1)
/sizeof(asn_DEF_A_noc_tags_1[0]), /* 1 */
asn_DEF_A_noc_tags_1, /* Same as above */
sizeof(asn_DEF_A_noc_tags_1)
/sizeof(asn_DEF_A_noc_tags_1[0]), /* 1 */
- 0, /* No OER visible constraints */
- 0, /* No PER visible constraints */
+ { 0, 0, NativeInteger_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -118,15 +116,13 @@
"B-0-0",
"B-0-0",
&asn_OP_NativeInteger,
- B_0_0_constraint,
asn_DEF_B_0_0_tags_1,
sizeof(asn_DEF_B_0_0_tags_1)
/sizeof(asn_DEF_B_0_0_tags_1[0]), /* 1 */
asn_DEF_B_0_0_tags_1, /* Same as above */
sizeof(asn_DEF_B_0_0_tags_1)
/sizeof(asn_DEF_B_0_0_tags_1[0]), /* 1 */
- &asn_OER_type_B_0_0_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_B_0_0_constr_1, 0, B_0_0_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -200,15 +196,13 @@
"C-1-2",
"C-1-2",
&asn_OP_NativeInteger,
- C_1_2_constraint,
asn_DEF_C_1_2_tags_1,
sizeof(asn_DEF_C_1_2_tags_1)
/sizeof(asn_DEF_C_1_2_tags_1[0]), /* 1 */
asn_DEF_C_1_2_tags_1, /* Same as above */
sizeof(asn_DEF_C_1_2_tags_1)
/sizeof(asn_DEF_C_1_2_tags_1[0]), /* 1 */
- &asn_OER_type_C_1_2_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_C_1_2_constr_1, 0, C_1_2_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -282,15 +276,13 @@
"D-inv",
"D-inv",
&asn_OP_NativeInteger,
- D_inv_constraint,
asn_DEF_D_inv_tags_1,
sizeof(asn_DEF_D_inv_tags_1)
/sizeof(asn_DEF_D_inv_tags_1[0]), /* 1 */
asn_DEF_D_inv_tags_1, /* Same as above */
sizeof(asn_DEF_D_inv_tags_1)
/sizeof(asn_DEF_D_inv_tags_1[0]), /* 1 */
- &asn_OER_type_D_inv_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_D_inv_constr_1, 0, D_inv_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -364,15 +356,13 @@
"E-2-5",
"E-2-5",
&asn_OP_NativeInteger,
- E_2_5_constraint,
asn_DEF_E_2_5_tags_1,
sizeof(asn_DEF_E_2_5_tags_1)
/sizeof(asn_DEF_E_2_5_tags_1[0]), /* 1 */
asn_DEF_E_2_5_tags_1, /* Same as above */
sizeof(asn_DEF_E_2_5_tags_1)
/sizeof(asn_DEF_E_2_5_tags_1[0]), /* 1 */
- &asn_OER_type_E_2_5_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_E_2_5_constr_1, 0, E_2_5_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -446,15 +436,13 @@
"F-inv",
"F-inv",
&asn_OP_NativeInteger,
- F_inv_constraint,
asn_DEF_F_inv_tags_1,
sizeof(asn_DEF_F_inv_tags_1)
/sizeof(asn_DEF_F_inv_tags_1[0]), /* 1 */
asn_DEF_F_inv_tags_1, /* Same as above */
sizeof(asn_DEF_F_inv_tags_1)
/sizeof(asn_DEF_F_inv_tags_1[0]), /* 1 */
- &asn_OER_type_F_inv_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_F_inv_constr_1, 0, F_inv_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -528,15 +516,13 @@
"G-3-3",
"G-3-3",
&asn_OP_NativeInteger,
- G_3_3_constraint,
asn_DEF_G_3_3_tags_1,
sizeof(asn_DEF_G_3_3_tags_1)
/sizeof(asn_DEF_G_3_3_tags_1[0]), /* 1 */
asn_DEF_G_3_3_tags_1, /* Same as above */
sizeof(asn_DEF_G_3_3_tags_1)
/sizeof(asn_DEF_G_3_3_tags_1[0]), /* 1 */
- &asn_OER_type_G_3_3_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_G_3_3_constr_1, 0, G_3_3_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -610,15 +596,13 @@
"H-4-5",
"H-4-5",
&asn_OP_NativeInteger,
- H_4_5_constraint,
asn_DEF_H_4_5_tags_1,
sizeof(asn_DEF_H_4_5_tags_1)
/sizeof(asn_DEF_H_4_5_tags_1[0]), /* 1 */
asn_DEF_H_4_5_tags_1, /* Same as above */
sizeof(asn_DEF_H_4_5_tags_1)
/sizeof(asn_DEF_H_4_5_tags_1[0]), /* 1 */
- &asn_OER_type_H_4_5_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_H_4_5_constr_1, 0, H_4_5_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -692,15 +676,13 @@
"I-1-5",
"I-1-5",
&asn_OP_NativeInteger,
- I_1_5_constraint,
asn_DEF_I_1_5_tags_1,
sizeof(asn_DEF_I_1_5_tags_1)
/sizeof(asn_DEF_I_1_5_tags_1[0]), /* 1 */
asn_DEF_I_1_5_tags_1, /* Same as above */
sizeof(asn_DEF_I_1_5_tags_1)
/sizeof(asn_DEF_I_1_5_tags_1[0]), /* 1 */
- &asn_OER_type_I_1_5_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_I_1_5_constr_1, 0, I_1_5_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -774,15 +756,13 @@
"J-4-5",
"J-4-5",
&asn_OP_NativeInteger,
- J_4_5_constraint,
asn_DEF_J_4_5_tags_1,
sizeof(asn_DEF_J_4_5_tags_1)
/sizeof(asn_DEF_J_4_5_tags_1[0]), /* 1 */
asn_DEF_J_4_5_tags_1, /* Same as above */
sizeof(asn_DEF_J_4_5_tags_1)
/sizeof(asn_DEF_J_4_5_tags_1[0]), /* 1 */
- &asn_OER_type_J_4_5_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_J_4_5_constr_1, 0, J_4_5_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -856,15 +836,13 @@
"K-1-4",
"K-1-4",
&asn_OP_NativeInteger,
- K_1_4_constraint,
asn_DEF_K_1_4_tags_1,
sizeof(asn_DEF_K_1_4_tags_1)
/sizeof(asn_DEF_K_1_4_tags_1[0]), /* 1 */
asn_DEF_K_1_4_tags_1, /* Same as above */
sizeof(asn_DEF_K_1_4_tags_1)
/sizeof(asn_DEF_K_1_4_tags_1[0]), /* 1 */
- &asn_OER_type_K_1_4_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_K_1_4_constr_1, 0, K_1_4_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -938,15 +916,13 @@
"L-0-5",
"L-0-5",
&asn_OP_NativeInteger,
- L_0_5_constraint,
asn_DEF_L_0_5_tags_1,
sizeof(asn_DEF_L_0_5_tags_1)
/sizeof(asn_DEF_L_0_5_tags_1[0]), /* 1 */
asn_DEF_L_0_5_tags_1, /* Same as above */
sizeof(asn_DEF_L_0_5_tags_1)
/sizeof(asn_DEF_L_0_5_tags_1[0]), /* 1 */
- &asn_OER_type_L_0_5_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_L_0_5_constr_1, 0, L_0_5_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -1020,15 +996,13 @@
"M-inv",
"M-inv",
&asn_OP_NativeInteger,
- M_inv_constraint,
asn_DEF_M_inv_tags_1,
sizeof(asn_DEF_M_inv_tags_1)
/sizeof(asn_DEF_M_inv_tags_1[0]), /* 1 */
asn_DEF_M_inv_tags_1, /* Same as above */
sizeof(asn_DEF_M_inv_tags_1)
/sizeof(asn_DEF_M_inv_tags_1[0]), /* 1 */
- &asn_OER_type_M_inv_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_M_inv_constr_1, 0, M_inv_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -1102,15 +1076,13 @@
"N-0-5",
"N-0-5",
&asn_OP_NativeInteger,
- N_0_5_constraint,
asn_DEF_N_0_5_tags_1,
sizeof(asn_DEF_N_0_5_tags_1)
/sizeof(asn_DEF_N_0_5_tags_1[0]), /* 1 */
asn_DEF_N_0_5_tags_1, /* Same as above */
sizeof(asn_DEF_N_0_5_tags_1)
/sizeof(asn_DEF_N_0_5_tags_1[0]), /* 1 */
- &asn_OER_type_N_0_5_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_N_0_5_constr_1, 0, N_0_5_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -1184,15 +1156,13 @@
"O-inv",
"O-inv",
&asn_OP_NativeInteger,
- O_inv_constraint,
asn_DEF_O_inv_tags_1,
sizeof(asn_DEF_O_inv_tags_1)
/sizeof(asn_DEF_O_inv_tags_1[0]), /* 1 */
asn_DEF_O_inv_tags_1, /* Same as above */
sizeof(asn_DEF_O_inv_tags_1)
/sizeof(asn_DEF_O_inv_tags_1[0]), /* 1 */
- &asn_OER_type_O_inv_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_O_inv_constr_1, 0, O_inv_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -1266,15 +1236,13 @@
"EConstr",
"EConstr",
&asn_OP_NativeInteger,
- EConstr_constraint,
asn_DEF_EConstr_tags_1,
sizeof(asn_DEF_EConstr_tags_1)
/sizeof(asn_DEF_EConstr_tags_1[0]), /* 1 */
asn_DEF_EConstr_tags_1, /* Same as above */
sizeof(asn_DEF_EConstr_tags_1)
/sizeof(asn_DEF_EConstr_tags_1[0]), /* 1 */
- &asn_OER_type_EConstr_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_EConstr_constr_1, 0, EConstr_constraint },
0, 0, /* No members */
0 /* No specifics */
};
@@ -1348,15 +1316,13 @@
"FConstr",
"FConstr",
&asn_OP_NativeInteger,
- FConstr_constraint,
asn_DEF_FConstr_tags_1,
sizeof(asn_DEF_FConstr_tags_1)
/sizeof(asn_DEF_FConstr_tags_1[0]), /* 1 */
asn_DEF_FConstr_tags_1, /* Same as above */
sizeof(asn_DEF_FConstr_tags_1)
/sizeof(asn_DEF_FConstr_tags_1[0]), /* 1 */
- &asn_OER_type_FConstr_constr_1,
- 0, /* No PER visible constraints */
+ { &asn_OER_type_FConstr_constr_1, 0, FConstr_constraint },
0, 0, /* No members */
0 /* No specifics */
};