Skip to content

A
asn1c
Commit 8041fe87 authored by Lev Walkin's avatar Lev Walkin
Browse files
Options

regenerate with simpler constraint checking code

parent 4118ccf9
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 58 deletions
tests/136-oer-long-OK.asn1.-Pgen-OER
View file @ 8041fe87
...@@ -345,41 +345,41 @@ memb_signed33ext_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -345,41 +345,41 @@ memb_signed33ext_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
/*** <<< CTDEFS [T] >>> ***/ /*** <<< CTDEFS [T] >>> ***/
static asn_oer_constraints_t asn_OER_memb_unsigned8_constr_2 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_unsigned8_constr_2 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 255 } /* (0..255) */, { 1, 1 } /* (0..255) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_unsigned16_constr_3 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_unsigned16_constr_3 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 65535 } /* (0..65535) */, { 2, 1 } /* (0..65535) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_unsigned16stack_constr_4 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_unsigned16stack_constr_4 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 255 } /* (0..255) */, { 1, 1 } /* (0..255) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_unsigned16stack_ext_constr_5 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_unsigned16stack_ext_constr_5 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 32767 } /* (0..32767) */, { 2, 1 } /* (0..32767) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_unsigned33_constr_6 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_unsigned33_constr_6 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 5000000000 } /* (0..5000000000) */, { 8, 1 } /* (0..5000000000) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_minmax_constr_7 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_minmax_constr_7 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_signed8_constr_9 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_signed8_constr_9 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -128, 127 } /* (-128..127) */, { 1, 0 } /* (-128..127) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_signed16_constr_10 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_signed16_constr_10 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -32768, 32767 } /* (-32768..32767) */, { 2, 0 } /* (-32768..32767) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_signed16stack_constr_11 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_signed16stack_constr_11 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -128, 127 } /* (-128..127) */, { 1, 0 } /* (-128..127) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_signed16stack_ext_constr_12 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_signed16stack_ext_constr_12 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -32768, 32767 } /* (-32768..32767) */, { 2, 0 } /* (-32768..32767) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_signed32_constr_13 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_signed32_constr_13 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -2000000000, 2000000000 } /* (-2000000000..2000000000) */, { 4, 0 } /* (-2000000000..2000000000) */,
{ 0, 0, 0 }}; -1};
static asn_oer_constraints_t asn_OER_memb_signed33ext_constr_14 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_signed33ext_constr_14 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [T] >>> ***/ /*** <<< STAT-DEFS [T] >>> ***/
......
tests/137-oer-string-OK.asn1.-Pgen-OER
View file @ 8041fe87
...@@ -159,14 +159,14 @@ memb_con_universal_constraint_6(asn_TYPE_descriptor_t *td, const void *sptr, ...@@ -159,14 +159,14 @@ memb_con_universal_constraint_6(asn_TYPE_descriptor_t *td, const void *sptr,
/*** <<< CTDEFS [T] >>> ***/ /*** <<< CTDEFS [T] >>> ***/
static asn_oer_constraints_t asn_OER_memb_con_ia5_constr_7 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_con_ia5_constr_7 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 2, 2 } /* (SIZE(2..2)) */}; 2 /* (SIZE(2..2)) */};
static asn_oer_constraints_t asn_OER_memb_con_utf8_constr_8 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_con_utf8_constr_8 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 } /* (SIZE(0..MAX)) */}; -1 /* (SIZE(0..MAX)) */};
static asn_oer_constraints_t asn_OER_memb_con_universal_constr_9 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_memb_con_universal_constr_9 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 2, 2 } /* (SIZE(2..2)) */}; 2 /* (SIZE(2..2)) */};
/*** <<< STAT-DEFS [T] >>> ***/ /*** <<< STAT-DEFS [T] >>> ***/
......
tests/138-oer-constraints-OK.asn1.-Pgen-OER
View file @ 8041fe87
...@@ -285,8 +285,8 @@ B_0_0_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -285,8 +285,8 @@ B_0_0_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [B-0-0] >>> ***/ /*** <<< CTDEFS [B-0-0] >>> ***/
static asn_oer_constraints_t asn_OER_type_B_0_0_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_B_0_0_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 0 } /* (0..0) */, { 1, 1 } /* (0..0) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [B-0-0] >>> ***/ /*** <<< STAT-DEFS [B-0-0] >>> ***/
...@@ -457,8 +457,8 @@ C_1_2_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -457,8 +457,8 @@ C_1_2_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [C-1-2] >>> ***/ /*** <<< CTDEFS [C-1-2] >>> ***/
static asn_oer_constraints_t asn_OER_type_C_1_2_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_C_1_2_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 1, 2 } /* (1..2) */, { 1, 1 } /* (1..2) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [C-1-2] >>> ***/ /*** <<< STAT-DEFS [C-1-2] >>> ***/
...@@ -629,8 +629,8 @@ D_inv_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -629,8 +629,8 @@ D_inv_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [D-inv] >>> ***/ /*** <<< CTDEFS [D-inv] >>> ***/
static asn_oer_constraints_t asn_OER_type_D_inv_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_D_inv_constr_1 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [D-inv] >>> ***/ /*** <<< STAT-DEFS [D-inv] >>> ***/
...@@ -801,8 +801,8 @@ E_2_5_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -801,8 +801,8 @@ E_2_5_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [E-2-5] >>> ***/ /*** <<< CTDEFS [E-2-5] >>> ***/
static asn_oer_constraints_t asn_OER_type_E_2_5_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_E_2_5_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 2, 5 } /* (2..5) */, { 1, 1 } /* (2..5) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [E-2-5] >>> ***/ /*** <<< STAT-DEFS [E-2-5] >>> ***/
...@@ -973,8 +973,8 @@ F_inv_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -973,8 +973,8 @@ F_inv_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [F-inv] >>> ***/ /*** <<< CTDEFS [F-inv] >>> ***/
static asn_oer_constraints_t asn_OER_type_F_inv_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_F_inv_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 10 } /* (0..10) */, { 1, 1 } /* (0..10) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [F-inv] >>> ***/ /*** <<< STAT-DEFS [F-inv] >>> ***/
...@@ -1145,8 +1145,8 @@ G_3_3_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -1145,8 +1145,8 @@ G_3_3_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [G-3-3] >>> ***/ /*** <<< CTDEFS [G-3-3] >>> ***/
static asn_oer_constraints_t asn_OER_type_G_3_3_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_G_3_3_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 3, 3 } /* (3..3) */, { 1, 1 } /* (3..3) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [G-3-3] >>> ***/ /*** <<< STAT-DEFS [G-3-3] >>> ***/
...@@ -1317,8 +1317,8 @@ H_4_5_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -1317,8 +1317,8 @@ H_4_5_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [H-4-5] >>> ***/ /*** <<< CTDEFS [H-4-5] >>> ***/
static asn_oer_constraints_t asn_OER_type_H_4_5_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_H_4_5_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 4, 5 } /* (4..5) */, { 1, 1 } /* (4..5) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [H-4-5] >>> ***/ /*** <<< STAT-DEFS [H-4-5] >>> ***/
...@@ -1489,8 +1489,8 @@ I_0_5_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -1489,8 +1489,8 @@ I_0_5_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [I-0-5] >>> ***/ /*** <<< CTDEFS [I-0-5] >>> ***/
static asn_oer_constraints_t asn_OER_type_I_0_5_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_I_0_5_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 5 } /* (0..5) */, { 1, 1 } /* (0..5) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [I-0-5] >>> ***/ /*** <<< STAT-DEFS [I-0-5] >>> ***/
...@@ -1661,8 +1661,8 @@ J_4_9_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -1661,8 +1661,8 @@ J_4_9_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [J-4-9] >>> ***/ /*** <<< CTDEFS [J-4-9] >>> ***/
static asn_oer_constraints_t asn_OER_type_J_4_9_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_J_4_9_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 4, 9 } /* (4..9) */, { 1, 1 } /* (4..9) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [J-4-9] >>> ***/ /*** <<< STAT-DEFS [J-4-9] >>> ***/
...@@ -1833,8 +1833,8 @@ K_inv_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -1833,8 +1833,8 @@ K_inv_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [K-inv] >>> ***/ /*** <<< CTDEFS [K-inv] >>> ***/
static asn_oer_constraints_t asn_OER_type_K_inv_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_K_inv_constr_1 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [K-inv] >>> ***/ /*** <<< STAT-DEFS [K-inv] >>> ***/
...@@ -2005,8 +2005,8 @@ L_0_5_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -2005,8 +2005,8 @@ L_0_5_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [L-0-5] >>> ***/ /*** <<< CTDEFS [L-0-5] >>> ***/
static asn_oer_constraints_t asn_OER_type_L_0_5_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_L_0_5_constr_1 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 5 } /* (0..5) */, { 1, 1 } /* (0..5) */,
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [L-0-5] >>> ***/ /*** <<< STAT-DEFS [L-0-5] >>> ***/
...@@ -2177,8 +2177,8 @@ M_inv_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -2177,8 +2177,8 @@ M_inv_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [M-inv] >>> ***/ /*** <<< CTDEFS [M-inv] >>> ***/
static asn_oer_constraints_t asn_OER_type_M_inv_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_M_inv_constr_1 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [M-inv] >>> ***/ /*** <<< STAT-DEFS [M-inv] >>> ***/
...@@ -2349,8 +2349,8 @@ N_inv_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -2349,8 +2349,8 @@ N_inv_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [N-inv] >>> ***/ /*** <<< CTDEFS [N-inv] >>> ***/
static asn_oer_constraints_t asn_OER_type_N_inv_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_N_inv_constr_1 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [N-inv] >>> ***/ /*** <<< STAT-DEFS [N-inv] >>> ***/
...@@ -2521,8 +2521,8 @@ O_inv_encode_oer(asn_TYPE_descriptor_t *td, ...@@ -2521,8 +2521,8 @@ O_inv_encode_oer(asn_TYPE_descriptor_t *td,
/*** <<< CTDEFS [O-inv] >>> ***/ /*** <<< CTDEFS [O-inv] >>> ***/
static asn_oer_constraints_t asn_OER_type_O_inv_constr_1 GCC_NOTUSED = { static asn_oer_constraints_t asn_OER_type_O_inv_constr_1 GCC_NOTUSED = {
{ 0, 0, 0 }, { 0, 0 },
{ 0, 0, 0 }}; -1};
/*** <<< STAT-DEFS [O-inv] >>> ***/ /*** <<< STAT-DEFS [O-inv] >>> ***/
......
Markdown is supported
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