Commit 5861e8a0 authored by Lev Walkin's avatar Lev Walkin

better constraint recognition (fix F-inv though)

parent ed1ce785
...@@ -354,7 +354,7 @@ static asn_oer_constraints_t asn_OER_memb_unsigned16stack_constr_4 GCC_NOTUSED = ...@@ -354,7 +354,7 @@ 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) */, { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 255 } /* (0..255) */,
{ 0, 0, 0 }}; { 0, 0, 0 }};
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, 255 } /* (0..255,...) */, { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 32767 } /* (0..32767) */,
{ 0, 0, 0 }}; { 0, 0, 0 }};
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) */, { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 0, 5000000000 } /* (0..5000000000) */,
...@@ -372,13 +372,13 @@ static asn_oer_constraints_t asn_OER_memb_signed16stack_constr_11 GCC_NOTUSED = ...@@ -372,13 +372,13 @@ 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) */, { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -128, 127 } /* (-128..127) */,
{ 0, 0, 0 }}; { 0, 0, 0 }};
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, -128, 127 } /* (-128..127,...) */, { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -32768, 32767 } /* (-32768..32767) */,
{ 0, 0, 0 }}; { 0, 0, 0 }};
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) */, { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -2000000000, 2000000000 } /* (-2000000000..2000000000) */,
{ 0, 0, 0 }}; { 0, 0, 0 }};
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 = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, -4000000000, 4000000000 } /* (-4000000000..4000000000,...) */, { 0, 0, 0 },
{ 0, 0, 0 }}; { 0, 0, 0 }};
/*** <<< STAT-DEFS [T] >>> ***/ /*** <<< STAT-DEFS [T] >>> ***/
......
...@@ -163,7 +163,7 @@ static asn_oer_constraints_t asn_OER_memb_con_ia5_constr_7 GCC_NOTUSED = { ...@@ -163,7 +163,7 @@ static asn_oer_constraints_t asn_OER_memb_con_ia5_constr_7 GCC_NOTUSED = {
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 2, 2 } /* (SIZE(2..2)) */}; { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 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, 0 } /* (SIZE(2..2)) */}; { 0, 0, 0 } /* (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, 0 },
{ AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 2, 2 } /* (SIZE(2..2)) */}; { AOC_HAS_LOWER_BOUND | AOC_HAS_UPPER_BOUND, 2, 2 } /* (SIZE(2..2)) */};
......
...@@ -12,11 +12,21 @@ ModuleOERConstraints ...@@ -12,11 +12,21 @@ ModuleOERConstraints
BEGIN BEGIN
A-noc ::= INTEGER -- No constraints A-noc ::= INTEGER -- No constraints
B-vis ::= INTEGER (0) -- Value constraint B-0-0 ::= INTEGER (0) -- Value constraint
C-vis ::= INTEGER (-1..1) -- Value range constraint C-1-2 ::= INTEGER (1..2) -- Value range constraint
D-inv ::= INTEGER (0..10,...) -- Extensible, not OER-visible D-inv ::= INTEGER (0..10,...) -- Extensible, not OER-visible
E-vis ::= INTEGER (0..10,...)(2..5) -- OER-visible constraint 2..5 E-2-5 ::= INTEGER (0..10,...)(2..5) -- OER-visible constraint 2..5
F-inv ::= INTEGER (0..10,...)(2..5,...) -- Not OER-visible F-inv ::= INTEGER (0..10,...)(2..5,...) -- Not OER-visible
G-vis ::= INTEGER (0..10,...)(2..5,...)(3) -- OER-visible constraint 3 G-3-3 ::= INTEGER (0..10,...)(2..5,...)(3) -- OER-visible constraint 3
-- X.696 #8.2.4 Not OER-visible parts of INTERSECTION are ignored
H-4-5 ::= INTEGER ((0..5) ^ (4..9)) -- OER-visible constraint 4..5
I-0-5 ::= INTEGER ((0..5) ^ (4..12,...)) -- OER-visible constraint 0..5
J-4-9 ::= INTEGER ((0..5,...) ^ (4..9)) -- OER-visible constraint 4..9
K-inv ::= INTEGER ((0..5,...) ^ (4..9,...)) -- Not OER-visible
-- X.696 #8.2.5 UNION with exeptions are ignored
L-0-5 ::= INTEGER ((0) | (5)) -- OER-visible constraint 0..5
M-inv ::= INTEGER ((0) | (5,...)) -- Not OER-visible
N-inv ::= INTEGER ((0..4,...) | (5)) -- Not OER-visible
O-inv ::= INTEGER ((0..4,...) | (5,...)) -- Not OER-visible
END END
This diff is collapsed.
...@@ -89,7 +89,7 @@ OK-IntegerInRange4 ::= INTEGER (-2147483648 | 2147483647) ...@@ -89,7 +89,7 @@ OK-IntegerInRange4 ::= INTEGER (-2147483648 | 2147483647)
OK-IntegerInRange5 ::= INTEGER (-2147483648 | 2147483647,...) OK-IntegerInRange5 ::= INTEGER (-2147483648 | 2147483647,...)
-- Combined constraints: (-2147483648 | 2147483647,...) -- Combined constraints: (-2147483648 | 2147483647,...)
-- Practical constraints (OK-IntegerInRange5): (-2147483648 | 2147483647,...) -- Practical constraints (OK-IntegerInRange5): (-2147483648 | 2147483647,...)
-- OER-visible constraints (OK-IntegerInRange5): (-2147483648 | 2147483647,...) -- OER-visible constraints (OK-IntegerInRange5): (MIN..MAX)
-- PER-visible constraints (OK-IntegerInRange5): (-2147483648 | 2147483647,...) -- PER-visible constraints (OK-IntegerInRange5): (-2147483648 | 2147483647,...)
NO-IntegerInRange6 ::= INTEGER (0..4294967295) NO-IntegerInRange6 ::= INTEGER (0..4294967295)
......
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