Commit 9fb53597 authored by Lev Walkin's avatar Lev Walkin

dereferencing DEFAULT value

parent fd97d5ec
...@@ -8,47 +8,31 @@ asn1f_fix_dereference_values(arg_t *arg) { ...@@ -8,47 +8,31 @@ asn1f_fix_dereference_values(arg_t *arg) {
asn1p_expr_t *expr = arg->expr; asn1p_expr_t *expr = arg->expr;
int r_value = 0; int r_value = 0;
if(expr->meta_type != AMT_VALUE) if(expr->value && expr->meta_type == AMT_VALUE) {
return 0; /* Just ignore it */
if(expr->value == NULL)
return 0; /* Just ignore it */
if(expr->value && expr->value->type != ATV_REFERENCED)
return 0; /* Not a reference */
DEBUG("%s(%s %x ::= %s) for line %d", __func__,
expr->Identifier, expr->expr_type,
asn1f_printable_value(expr->value), expr->_lineno);
/*
* If this integer has a value, check that this value
* is an integer. If it is a reference, resolve it.
*/
if(expr->value) {
if(asn1f_value_resolve(arg, expr)) { if(asn1f_value_resolve(arg, expr)) {
/* This function will emit messages */ /* This function will emit messages */
r_value = -1; r_value = -1;
} }
}
if(0 && expr->value->type != ATV_INTEGER) { if(expr->marker.default_value) {
FATAL( arg_t tmparg = *arg;
"INTEGER value %s at line %d: " asn1p_expr_t tmpexpr = *expr;
"Incompatible value specified: %s",
expr->Identifier, switch(expr->marker.default_value->type) {
expr->_lineno, default:
asn1f_printable_value(expr->value) return r_value;
); case ATV_REFERENCED:
r_value = -1; break;
} }
} else {
FATAL("Value of \"%s\" at line %d: " tmparg.expr = &tmpexpr;
"Incompatible value specified", tmpexpr.meta_type = AMT_VALUE;
expr->Identifier, tmpexpr.marker.default_value = 0;
expr->_lineno tmpexpr.value = expr->marker.default_value;
); if(asn1f_value_resolve(&tmparg, &tmpexpr))
r_value = -1; r_value = -1;
expr->marker.default_value = tmpexpr.value;
} }
return r_value; return r_value;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment