diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-05-08 07:52:46 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2014-05-08 07:52:46 +0000 |
| commit | 329b44b4864eeefb5f935282c3fe6c025bc1c8bc (patch) | |
| tree | 7d155623b113cd85c309cb9dde6f4d72feed650c /cparser | |
| parent | b4200796aab1ec26288a1376c7dd99c0927b5ee9 (diff) | |
Fixed regression on initializers of the form T x[N] = "literal";
where T is a typedef for a character type.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2488 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'cparser')
| -rw-r--r-- | cparser/Elab.ml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cparser/Elab.ml b/cparser/Elab.ml index 871d545..95484b4 100644 --- a/cparser/Elab.ml +++ b/cparser/Elab.ml @@ -1664,22 +1664,24 @@ and elab_item zi item il = or wchar array = L"wide string literal" *) | (SINGLE_INIT (CONSTANT (CONST_STRING s)) | COMPOUND_INIT [_, SINGLE_INIT(CONSTANT (CONST_STRING s))]), - TArray(TInt(ik, _), sz, _) -> - begin match elab_string_literal loc s with - | CStr s -> - if ik <> IChar && ik <> IUChar && ik <> ISChar then - error loc "initialization of an array of non-char elements with a string literal"; + TArray(ty_elt, sz, _) -> + begin match elab_string_literal loc s, unroll env ty_elt with + | CStr s, TInt((IChar | ISChar | IUChar), _) -> if not (I.index_below (Int64.of_int(String.length s - 1)) sz) then warning loc "initializer string for array of chars %s is too long" (I.name zi); elab_list (I.set zi (init_char_array_string sz s)) il false - | CWStr s -> - if ik <> wchar_ikind then - error loc "initialization of an array of non-wchar_t elements with a wide string literal"; + | CStr _, _ -> + error loc "initialization of an array of non-char elements with a string literal"; + elab_list zi il false + | CWStr s, TInt(ik, _) when ik = wchar_ikind -> if not (I.index_below (Int64.of_int(List.length s - 1)) sz) then warning loc "initializer string for array of wide chars %s is too long" (I.name zi); elab_list (I.set zi (init_int_array_wstring sz s)) il false + | CWStr _, _ -> + error loc "initialization of an array of non-wchar_t elements with a wide string literal"; + elab_list zi il false | _ -> assert false end (* Brace-enclosed compound initializer *) |