choice constraint generation duplication dropped

libasn1compiler/asn1c_C.c

@@ -1893,10 +1893,12 @@ emit_member_PER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx) {
 	asn1cnst_range_t *range;
 	asn1p_expr_type_e etype;
 
+	etype = expr_get_type(arg, expr);
+
 	if((arg->flags & A1C_GEN_PER)
 	&& (expr->constraints
-		|| expr->expr_type == ASN_BASIC_ENUMERATED
-		|| expr->expr_type == ASN_CONSTR_CHOICE)
+		|| etype == ASN_BASIC_ENUMERATED
+		|| etype == ASN_CONSTR_CHOICE)
 	) {
 		/* Fall through */
 	} else {
@@ -1909,8 +1911,6 @@ emit_member_PER_constraints(arg_t *arg, asn1p_expr_t *expr, const char *pfx) {
 		"asn_PER_%s_%s_constr_%d = {\n",
 		pfx, MKID(expr), expr->_type_unique_index);
 
-	etype = expr_get_type(arg, expr);
-
 	INDENT(+1);
 
 	/*
@@ -2193,9 +2193,7 @@ emit_member_table(arg_t *arg, asn1p_expr_t *expr) {
 	}
 	if(C99_MODE) OUT(".per_constraints = ");
 	if(arg->flags & A1C_GEN_PER) {
-		if(expr->constraints
-		|| expr->expr_type == ASN_BASIC_ENUMERATED
-		|| expr->expr_type == ASN_CONSTR_CHOICE) {
+		if(expr->constraints) {
 			OUT("&asn_PER_memb_%s_constr_%d,\n",
 				MKID(expr),
 				expr->_type_unique_index);

tests/119-per-strings-OK.asn1.-EF

+ModulePERStrings { iso org(3) dod(6) internet(1) private(4) enterprise(1)
+	spelio(9363) software(1) asn1c(5) test(1) 119 }
+DEFINITIONS AUTOMATIC TAGS ::=
+BEGIN
+
+PDU ::= SEQUENCE {
+    many	 [0] IMPLICIT SEQUENCE OF PDU OPTIONAL,
+    ia5	 [1] IMPLICIT IA5String OPTIONAL,
+    ia5-c	 [2] IMPLICIT IA5String (FROM("A".."Z")) OPTIONAL,
+    ia5-ce	 [3] IMPLICIT IA5String (FROM("A".."Z",...)) OPTIONAL,
+    ia5-ir	 [4] IMPLICIT IA5String (FROM("A".."B" | "X".."Z")) OPTIONAL,
+    vs	 [5] IMPLICIT VisibleString OPTIONAL,
+    vs-c	 [6] IMPLICIT VisibleString (FROM("A".."Z")) OPTIONAL,
+    vs-ce	 [7] IMPLICIT VisibleString (FROM("A".."Z",...)) OPTIONAL,
+    vs-ir	 [8] IMPLICIT VisibleString (FROM("A".."B" | "X".."Z")) OPTIONAL,
+    pr	 [9] IMPLICIT PrintableString OPTIONAL,
+    pr-c	 [10] IMPLICIT PrintableString (FROM("A".."Z")) OPTIONAL,
+    pr-ir	 [11] IMPLICIT PrintableString (FROM("A".."B" | "X".."Z")) OPTIONAL,
+    ns	 [12] IMPLICIT NumericString OPTIONAL,
+    ns-c	 [13] IMPLICIT NumericString (FROM("5".."9")) OPTIONAL,
+    ns-ce	 [14] IMPLICIT NumericString (FROM("5".."9",...)) OPTIONAL,
+    ns-ir	 [15] IMPLICIT NumericString (FROM("1" | "9")) OPTIONAL,
+    ut-c	 [16] IMPLICIT UTF8String (SIZE(6)) OPTIONAL,
+    ut-ce	 [17] IMPLICIT UTF8String (SIZE(6,...)) OPTIONAL,
+    ut-ir	 [18] IMPLICIT UTF8String (FROM("A" | "Z")) OPTIONAL,
+    real	 [19] IMPLICIT REAL OPTIONAL,
+    oid	 [20] IMPLICIT OBJECT IDENTIFIER OPTIONAL
+}
+
+END

tests/50-constraint-OK.asn1.-Pgen-PER

@@ -4456,7 +4456,7 @@ static asn_TYPE_member_t asn_MBR_Sequence_1[] = {
 		.tag_mode = 0,
 		.type = &asn_DEF_enum_c_6,
 		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.per_constraints = &asn_PER_memb_enum_c_constr_6,
+		.per_constraints = 0,	/* No PER visible constraints */
 		.default_value = 0,
 		.name = "enum-c"
 		},

tests/95-choice-per-order-OK.asn1.-Pgen-PER

@@ -154,7 +154,7 @@ static asn_TYPE_member_t asn_MBR_Choice_1[] = {
 		.tag_mode = 0,
 		.type = &asn_DEF_ch_4,
 		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.per_constraints = &asn_PER_memb_ch_constr_4,
+		.per_constraints = 0,	/* No PER visible constraints */
 		.default_value = 0,
 		.name = "ch"
 		},