new compiler output format
diff --git a/tests/47-set-ext-OK.asn1.-P b/tests/47-set-ext-OK.asn1.-P
index 69a7ded..a3d1096 100644
--- a/tests/47-set-ext-OK.asn1.-P
+++ b/tests/47-set-ext-OK.asn1.-P
@@ -1,8 +1,10 @@
-/*** <<< DEPS [T1] >>> ***/
+/*** <<< INCLUDES [T1] >>> ***/
-/* Dependencies for T1 */
#include <INTEGER.h>
+#include <constr_SET.h>
+
+/*** <<< DEPS [T1] >>> ***/
/*
@@ -11,8 +13,6 @@
enum T1_PR_e {
T1_PR_i, /* Member i is present */
};
-#include <constr_SET.h>
-
extern asn1_TYPE_descriptor_t asn1_DEF_T1;
/*** <<< TYPE-DECLS [T1] >>> ***/
@@ -35,8 +35,6 @@
/*** <<< STAT-DEFS [T1] >>> ***/
-#include <constr_SET.h>
-
static asn1_SET_element_t asn1_DEF_T1_elements[] = {
{ offsetof(struct T1, i), 0,
(ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
@@ -82,10 +80,12 @@
};
-/*** <<< DEPS [T2] >>> ***/
+/*** <<< INCLUDES [T2] >>> ***/
-/* Dependencies for T2 */
#include <INTEGER.h>
+#include <constr_SET.h>
+
+/*** <<< DEPS [T2] >>> ***/
/*
@@ -94,8 +94,6 @@
enum T2_PR_e {
T2_PR_i, /* Member i is present */
};
-#include <constr_SET.h>
-
extern asn1_TYPE_descriptor_t asn1_DEF_T2;
/*** <<< TYPE-DECLS [T2] >>> ***/
@@ -118,8 +116,6 @@
/*** <<< STAT-DEFS [T2] >>> ***/
-#include <constr_SET.h>
-
static asn1_SET_element_t asn1_DEF_T2_elements[] = {
{ offsetof(struct T2, i), 0,
(ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
@@ -165,21 +161,25 @@
};
+/*** <<< INCLUDES [T3] >>> ***/
+
+#include <INTEGER.h>
+#include <constr_CHOICE.h>
+
/*** <<< DEPS [T3] >>> ***/
-/* Dependencies for T3 */
-#include <INTEGER.h>
-
+typedef enum T3_PR {
+ T3_PR_NOTHING, /* No components present */
+ T3_PR_i,
+ /* Extensions may appear below */
+} T3_PR_e;
extern asn1_TYPE_descriptor_t asn1_DEF_T3;
/*** <<< TYPE-DECLS [T3] >>> ***/
typedef struct T3 {
- enum {
- T3_PR_NOTHING, /* No components present */
- T3_PR_i,
- } present;
+ T3_PR_e present;
union {
INTEGER_t i;
/*
@@ -194,8 +194,6 @@
/*** <<< STAT-DEFS [T3] >>> ***/
-#include <constr_CHOICE.h>
-
static asn1_CHOICE_element_t asn1_DEF_T3_elements[] = {
{ offsetof(struct T3, choice.i), 0,
(ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
@@ -238,21 +236,25 @@
};
+/*** <<< INCLUDES [T4] >>> ***/
+
+#include <INTEGER.h>
+#include <constr_CHOICE.h>
+
/*** <<< DEPS [T4] >>> ***/
-/* Dependencies for T4 */
-#include <INTEGER.h>
-
+typedef enum T4_PR {
+ T4_PR_NOTHING, /* No components present */
+ T4_PR_i,
+ /* Extensions may appear below */
+} T4_PR_e;
extern asn1_TYPE_descriptor_t asn1_DEF_T4;
/*** <<< TYPE-DECLS [T4] >>> ***/
typedef struct T4 {
- enum {
- T4_PR_NOTHING, /* No components present */
- T4_PR_i,
- } present;
+ T4_PR_e present;
union {
INTEGER_t i;
/*
@@ -267,8 +269,6 @@
/*** <<< STAT-DEFS [T4] >>> ***/
-#include <constr_CHOICE.h>
-
static asn1_CHOICE_element_t asn1_DEF_T4_elements[] = {
{ offsetof(struct T4, choice.i), 0,
(ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),