From 132541ce2fa2a910a4241da6955805c5734781f5 Mon Sep 17 00:00:00 2001 From: xleroy Date: Sun, 18 May 2014 07:21:46 +0000 Subject: Typo in struct_declaration_list causing conflicts. git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2497 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e --- cparser/pre_parser.mly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cparser') diff --git a/cparser/pre_parser.mly b/cparser/pre_parser.mly index 5135d60..e53ccba 100644 --- a/cparser/pre_parser.mly +++ b/cparser/pre_parser.mly @@ -359,7 +359,7 @@ struct_or_union: struct_declaration_list: | (* empty *) -| struct_declaration_list? struct_declaration +| struct_declaration_list struct_declaration {} struct_declaration: -- cgit v1.2.3