asn1: Fix last remaining shift/reduce conflict
This commit is contained in:
		| @@ -297,7 +297,6 @@ static unsigned long idcounter; | |||||||
| %type <constraint_spec> ComponentRelationConstraint | %type <constraint_spec> ComponentRelationConstraint | ||||||
|  |  | ||||||
|  |  | ||||||
| %expect 1 |  | ||||||
| %start ModuleDefinition | %start ModuleDefinition | ||||||
|  |  | ||||||
| %% | %% | ||||||
| @@ -914,9 +913,20 @@ ParamGovernor   : DefinedObjectClass | |||||||
| 	     /* | Type */ | 	     /* | 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 | BuiltinType	: BitStringType | ||||||
| 		| BooleanType | 		| BooleanType | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Nicolas Williams
					Nicolas Williams