oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added dummy parsing of CHOICE

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13434 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-03-07 12:42:55 +00:00
parent 2e03946bac
commit 322b4a8a3e
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/asn1/lex.l
View File

@@ -65,6 +65,7 @@ BOOLEAN { return BOOLEAN; }
IMPORTS { return IMPORTS; } IMPORTS { return IMPORTS; }
FROM { return FROM; } FROM { return FROM; }
SEQUENCE { return SEQUENCE; } SEQUENCE { return SEQUENCE; }
CHOICE { return CHOICE; }
OF { return OF; } OF { return OF; }
OCTET { return OCTET; } OCTET { return OCTET; }
STRING { return STRING; } STRING { return STRING; }

7
lib/asn1/parse.y
View File

@@ -61,7 +61,7 @@ static void append (Member *l, Member *r);
char *defval; char *defval;
} }
%token INTEGER SEQUENCE OF OCTET STRING GeneralizedTime GeneralString %token INTEGER SEQUENCE CHOICE OF OCTET STRING GeneralizedTime GeneralString
%token BIT APPLICATION OPTIONAL EEQUAL TBEGIN END DEFINITIONS ENUMERATED %token BIT APPLICATION OPTIONAL EEQUAL TBEGIN END DEFINITIONS ENUMERATED
%token UTF8String NULLTYPE %token UTF8String NULLTYPE
%token EXTERNAL DEFAULT %token EXTERNAL DEFAULT
@@ -163,6 +163,11 @@ type : INTEGER { $$ = new_type(TInteger); }
$$ = new_type(TSequence); $$ = new_type(TSequence);
$$->members = $3; $$->members = $3;
} }
| CHOICE '{' memberdecls '}'
{
$$ = new_type(TChoice);
$$->members = $3;
}
| BIT STRING '{' bitdecls '}' | BIT STRING '{' bitdecls '}'
{ {
$$ = new_type(TBitString); $$ = new_type(TBitString);