osmocom
/
asn1c
mirror of https://gerrit.osmocom.org/asn1c
14
0
Fork 0
Code Issues Projects Releases Wiki Activity

better ValueSet printing 

git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@223 59561ff5-6e30-0410-9f3c-9617f08c8826
This commit is contained in:
vlm 2004-08-25 02:27:47 +00:00
parent 26afd20a79
commit da4df3f888
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@
PER visibility rules for actual constraints checking code generator.
* Indirect references in constraints resolver code fixed.
* Avoided compilation warning on gcc 3.3.3 systems.
* Better ValueSet printing.
0.9.1: 2004-Aug-23

20
libasn1print/asn1print.c
View File

@ -442,6 +442,7 @@ asn1print_expr(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *tc, enum asn1pri
}
if(tc->meta_type != AMT_VALUE
&& tc->meta_type != AMT_VALUESET
&& tc->expr_type != A1TC_EXTENSIBLE) {
if(level) {
if(tc->Identifier)
@ -503,14 +504,27 @@ asn1print_expr(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *tc, enum asn1pri
asn1print_ref(tc->reference, flags);
}
if(tc->meta_type == AMT_VALUESET)
printf(" ::=");
/*
* Display the descendants (children) of the current type.
*/
if(TQ_FIRST(&(tc->members))) {
if(TQ_FIRST(&(tc->members))
|| (tc->expr_type & ASN_CONSTR_MASK)
|| tc->meta_type == AMT_VALUESET
|| tc->meta_type == AMT_OBJECT
|| tc->meta_type == AMT_OBJECTSET
) {
asn1p_expr_t *se; /* SubExpression */
int put_braces = !SEQ_OF; /* Don't need 'em, if SET OF... */
if(put_braces) printf(" {\n");
if(put_braces) {
printf(" {");
if(TQ_FIRST(&tc->members))
printf("\n");
else printf(" }");
}
TQ_FOR(se, &(tc->members), next) {
/*
@ -528,7 +542,7 @@ asn1print_expr(asn1p_t *asn, asn1p_module_t *mod, asn1p_expr_t *tc, enum asn1pri
}
}
if(put_braces) {
if(put_braces && TQ_FIRST(&tc->members)) {
printf("\n");
INDENT("}");
}

2
tests/07-int-OK.asn1.-EF
View File

@ -9,7 +9,7 @@ int123456 INTEGER ::= 123456
Interval ::= INTEGER (1..123456)
SameInterval ::= INTEGER
SameInterval INTEGER ::= { }
Reason ::= INTEGER {
no-reason(0),