diff options
| author | vlm <vlm@59561ff5-6e30-0410-9f3c-9617f08c8826> | 2007-06-26 10:14:11 +0000 |
|---|---|---|
| committer | vlm <vlm@59561ff5-6e30-0410-9f3c-9617f08c8826> | 2007-06-26 10:14:11 +0000 |
| commit | 2fca3ee87563d310e94e97e12c5e58edd3162160 (patch) | |
| tree | 6a90c4a8de29ef0263242c89084776a9b71cb40a | |
| parent | 3b04fba8fd226cf50e6f6ffbbf11ca58f2960306 (diff) | |
new twists
git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@1341 59561ff5-6e30-0410-9f3c-9617f08c8826
| -rw-r--r-- | asn1c/tests/check-126.-gen-PER.c | 2 | ||||
| -rw-r--r-- | asn1c/tests/data-126/data-126-01.out | bin | 4 -> 4 bytes | |||
| -rw-r--r-- | skeletons/constr_CHOICE.c | 2 | ||||
| -rw-r--r-- | tests/126-per-extensions-OK.asn1 | 12 |
4 files changed, 13 insertions, 3 deletions
diff --git a/asn1c/tests/check-126.-gen-PER.c b/asn1c/tests/check-126.-gen-PER.c index db210b4c..b28ed799 100644 --- a/asn1c/tests/check-126.-gen-PER.c +++ b/asn1c/tests/check-126.-gen-PER.c @@ -242,7 +242,7 @@ compare_with_data_out(const char *fname, char *buf, int size) { mustfail = lastChar == 'P'; compare = lastChar != 'C'; - if(compare && getenv("REGENERATE")) { + if((compare && !mustfail) && getenv("REGENERATE")) { f = fopen(outName, "w"); fwrite(buf, 1, size, f); fclose(f); diff --git a/asn1c/tests/data-126/data-126-01.out b/asn1c/tests/data-126/data-126-01.out Binary files differindex 0f23c822..776f2134 100644 --- a/asn1c/tests/data-126/data-126-01.out +++ b/asn1c/tests/data-126/data-126-01.out diff --git a/skeletons/constr_CHOICE.c b/skeletons/constr_CHOICE.c index 4c5414de..912febeb 100644 --- a/skeletons/constr_CHOICE.c +++ b/skeletons/constr_CHOICE.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, 2005, 2006 Lev Walkin <vlm@lionet.info>. + * Copyright (c) 2003, 2004, 2005, 2006, 2007 Lev Walkin <vlm@lionet.info>. * All rights reserved. * Redistribution and modifications are permitted subject to BSD license. */ diff --git a/tests/126-per-extensions-OK.asn1 b/tests/126-per-extensions-OK.asn1 index c4729d32..26503cd0 100644 --- a/tests/126-per-extensions-OK.asn1 +++ b/tests/126-per-extensions-OK.asn1 @@ -14,7 +14,17 @@ BEGIN PDU ::= SEQUENCE { ..., str-o IA5String OPTIONAL, - str-m IA5String + str-m IA5String, + singl Singleton, + pdu-2 PDU-2 + } + + Singleton ::= SEQUENCE { + mandatory IA5String DEFAULT "z" + } + + PDU-2 ::= CHOICE { + str-p2 IA5String } END |