diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-05-18 07:21:46 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-05-18 07:21:46 +0000 |
| commit | 132541ce2fa2a910a4241da6955805c5734781f5 (patch) | |
| tree | ec5b259faf3d0a8cd9fb0fa3afb07b8066eeb879 | |
| parent | 0528a4d9b360b32a8473df1a92991a2ed4261b2d (diff) | |
Typo in struct_declaration_list causing conflicts.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2497 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
| -rw-r--r-- | cparser/pre_parser.mly | 2 |
1 files changed, 1 insertions, 1 deletions
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: |