moved -DASN_PDU_COLLECTION into compiler
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1200 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/libasn1parser/asn1p_expr.c b/libasn1parser/asn1p_expr.c
index 29919a1..8760066 100644
--- a/libasn1parser/asn1p_expr.c
+++ b/libasn1parser/asn1p_expr.c
@@ -13,13 +13,14 @@
* Construct a new empty types collection.
*/
asn1p_expr_t *
-asn1p_expr_new(int _lineno) {
+asn1p_expr_new(int _lineno, asn1p_module_t *mod) {
asn1p_expr_t *expr;
expr = calloc(1, sizeof *expr);
if(expr) {
TQ_INIT(&(expr->members));
expr->spec_index = -1;
+ expr->module = mod;
expr->_lineno = _lineno;
}
@@ -96,7 +97,7 @@
return NULL; /* Hard error */
}
}
- if(!clone) clone = asn1p_expr_new(expr->_lineno);
+ if(!clone) clone = asn1p_expr_new(expr->_lineno, expr->module);
if(!clone) return NULL;
/*
@@ -106,7 +107,6 @@
CLCOPY(expr_type);
CLCOPY(tag);
CLCOPY(marker.flags); /* OPTIONAL/DEFAULT */
- CLCOPY(module);
CLCOPY(_mark);
clone->data = 0; /* Do not clone this */
@@ -165,7 +165,7 @@
}
ref = value->value.reference;
- tmpexpr = asn1p_expr_new(ref->_lineno);
+ tmpexpr = asn1p_expr_new(ref->_lineno, 0);
tmpexpr->meta_type = AMT_TYPEREF;
tmpexpr->expr_type = A1TC_REFERENCE;
tmpexpr->reference = ref;