asn1: Fix last remaining shift/reduce conflict

2022-01-22 03:47:51 -06:00
parent 563964ce96
commit dfc26ae8c1
1 changed files with 13 additions and 3 deletions
--- a/lib/asn1/asn1parse.y
+++ b/lib/asn1/asn1parse.y
@@ -297,7 +297,6 @@ static unsigned long idcounter;
 %type <constraint_spec> ComponentRelationConstraint


-%expect 1
 %start ModuleDefinition

 %%
@@ -914,9 +913,20 @@ ParamGovernor   : DefinedObjectClass
 	     /* | Type */
 		;

-UnconstrainedType : BuiltinType | ReferencedType;
+UnconstrainedType : BitStringType
+                  | BooleanType
+                  | CharacterStringType
+                  | ChoiceType
+                  | EnumeratedType
+                  | IntegerType
+                  | NullType
+                  | ObjectIdentifierType
+                  | OctetStringType
+                  | SequenceType
+                  | SetType
+                  | ObjectClassFieldType; /* X.681 */

-Type		: UnconstrainedType | ConstrainedType ;
+Type		: BuiltinType | ReferencedType | ConstrainedType ;

 BuiltinType	: BitStringType
 		| BooleanType