From 322b4a8a3eaa82d2be6753cb55a32c2379ff5a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 7 Mar 2004 12:42:55 +0000
Subject: [PATCH] added dummy parsing of CHOICE

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13434 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/asn1/lex.l   | 1 +
 lib/asn1/parse.y | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/asn1/lex.l b/lib/asn1/lex.l
index 0c117e4ba..b22f76d85 100644
--- a/lib/asn1/lex.l
+++ b/lib/asn1/lex.l
@@ -65,6 +65,7 @@ BOOLEAN			{ return BOOLEAN; }
 IMPORTS			{ return IMPORTS; }
 FROM			{ return FROM; }
 SEQUENCE		{ return SEQUENCE; }
+CHOICE			{ return CHOICE; }
 OF			{ return OF; }
 OCTET			{ return OCTET; }
 STRING			{ return STRING; }
diff --git a/lib/asn1/parse.y b/lib/asn1/parse.y
index e350f7c53..c83a15b3d 100644
--- a/lib/asn1/parse.y
+++ b/lib/asn1/parse.y
@@ -61,7 +61,7 @@ static void append (Member *l, Member *r);
   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 UTF8String NULLTYPE
 %token EXTERNAL DEFAULT
@@ -163,6 +163,11 @@ type		: INTEGER     { $$ = new_type(TInteger); }
 		  $$ = new_type(TSequence);
 		  $$->members = $3;
 		}
+		| CHOICE '{' memberdecls '}'
+		{
+		  $$ = new_type(TChoice);
+		  $$->members = $3;
+		}
 		| BIT STRING '{' bitdecls '}'
 		{
 		  $$ = new_type(TBitString);