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

asn1: Fix last remaining shift/reduce conflict

Browse Source
This commit is contained in:
Nicolas Williams
2022-01-22 03:47:51 -06:00
parent 563964ce96
commit dfc26ae8c1
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/asn1/asn1parse.y
View File

@@ -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