test named sets...

7 files changed, 24 insertions, 6 deletions

diff --git a/asn1c/tests/check-assembly.sh b/asn1c/tests/check-assembly.sh
index 2edc8f4f..4eb22d2a 100755
--- a/asn1c/tests/check-assembly.sh
+++ b/asn1c/tests/check-assembly.sh
@@ -43,7 +43,7 @@ COMMON_FLAGS= -I. -DEMIT_ASN_DEBUG
 CFLAGS=\${COMMON_FLAGS} ${CFLAGS}
 CXXFLAGS=\${COMMON_FLAGS} ${CXXFLAGS}
 
-CC=${CC}
+CC ?= ${CC}
 
 all: check-executable
 check-executable: compiled-module *.c*
diff --git a/asn1c/tests/data-70/data-70-09-D.in b/asn1c/tests/data-70/data-70-09-D.in
index b4f0d9bd..4a2a627f 100644
--- a/asn1c/tests/data-70/data-70-09-D.in
+++ b/asn1c/tests/data-70/data-70-09-D.in
@@ -1,6 +1,6 @@
 <PDU>
-	<setOf>
+	<setOfREAL>
 		<REAL>3.14</REAL>
 		<REAL><!--<zzz>--><PLUS-INFINITY/></REAL>
-	</setOf>
+	</setOfREAL>
 </PDU>
diff --git a/asn1c/tests/data-70/data-70-10.in b/asn1c/tests/data-70/data-70-10.in
index cdb0967b..a1750910 100644
--- a/asn1c/tests/data-70/data-70-10.in
+++ b/asn1c/tests/data-70/data-70-10.in
@@ -1 +1 @@
-<PDU><setOf></setOf></PDU>
+<PDU><setOfREAL></setOfREAL></PDU>
diff --git a/asn1c/tests/data-70/data-70-47.in b/asn1c/tests/data-70/data-70-47.in
new file mode 100644
index 00000000..5a572561
--- /dev/null
+++ b/asn1c/tests/data-70/data-70-47.in
@@ -0,0 +1,6 @@
+<PDU>
+	<namedSetOfEnums>
+		<one/>
+		<oneMore/>
+	</namedSetOfEnums>
+</PDU>
diff --git a/asn1c/tests/data-70/data-70-48.in b/asn1c/tests/data-70/data-70-48.in
new file mode 100644
index 00000000..269247da
--- /dev/null
+++ b/asn1c/tests/data-70/data-70-48.in
@@ -0,0 +1,5 @@
+<PDU>
+	<setOfREAL>
+		<REAL>1.0</REAL>
+	</setOfREAL>
+</PDU>
diff --git a/asn1c/tests/data-70/data-70-49.in b/asn1c/tests/data-70/data-70-49.in
new file mode 100644
index 00000000..d3a83442
--- /dev/null
+++ b/asn1c/tests/data-70/data-70-49.in
@@ -0,0 +1 @@
+<PDU> <namedSetOfREAL> <name>1.0</name> </namedSetOfREAL> </PDU>
diff --git a/tests/70-xer-test-OK.asn1 b/tests/70-xer-test-OK.asn1
index 1a19ca26..330b9137 100644
--- a/tests/70-xer-test-OK.asn1
+++ b/tests/70-xer-test-OK.asn1
@@ -18,13 +18,16 @@ BEGIN
 	PDU ::= CHOICE {
 		sequence		Sequence,
 		set			Set,
-		setOf			SetOf,
 		sequenceOf		SequenceOf,
 		extensibleSet		ExtensibleSet,
 		extensibleSequence	ExtensibleSequence,
 		extensibleSequence2	ExtensibleSequence2,
 		setOfNULL		SetOfNULL,
+		setOfREAL		SetOfREAL,
 		setOfEnums		SetOfEnums,
+		namedSetOfNULL		NamedSetOfNULL,
+		namedSetOfREAL		NamedSetOfREAL,
+		namedSetOfEnums		NamedSetOfEnums,
 		seqOfZuka		SeqOfZuka,
 		...
 	}
@@ -60,9 +63,12 @@ BEGIN
 		integer	INTEGER	OPTIONAL
 	}
 
-	SetOf ::= SET OF REAL
 	SetOfNULL ::= SET OF NULL
+	SetOfREAL ::= SET OF REAL
 	SetOfEnums ::= SET OF ENUMERATED { one, oneMore }
+	NamedSetOfNULL ::= SET OF y NULL
+	NamedSetOfREAL ::= SET OF name REAL
+	NamedSetOfEnums ::= SET OF name ENUMERATED { one, oneMore }
 	SequenceOf ::= SEQUENCE OF id INTEGER { one(1), two(2) }
 	SeqOfZuka ::= SEQUENCE OF zuka NULL