test named sets...
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@991 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/asn1c/tests/check-assembly.sh b/asn1c/tests/check-assembly.sh
index 2edc8f4..4eb22d2 100755
--- a/asn1c/tests/check-assembly.sh
+++ b/asn1c/tests/check-assembly.sh
@@ -43,7 +43,7 @@
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 b4f0d9b..4a2a627 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 cdb0967..a175091 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 0000000..5a57256
--- /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 0000000..269247d
--- /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 0000000..d3a8344
--- /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 1a19ca2..330b913 100644
--- a/tests/70-xer-test-OK.asn1
+++ b/tests/70-xer-test-OK.asn1
@@ -18,13 +18,16 @@
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 @@
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