diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-04-08 21:45:42 +0200 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-04-08 21:45:42 +0200 |
| commit | 63915fbebe707cc1de7c0ed5a24148cac45a742c (patch) | |
| tree | da503cba224f14281a2ee841930b8843459cb42b /cparser | |
| parent | f78d61faf3db94ac1704ce0d11291211b5307629 (diff) | |
| parent | e326ed9f28a2ed6869f0cb356ef9a8e189cb0a47 (diff) | |
| download | compcert-kvx-63915fbebe707cc1de7c0ed5a24148cac45a742c.tar.gz compcert-kvx-63915fbebe707cc1de7c0ed5a24148cac45a742c.zip | |
Merge remote-tracking branch 'origin/mppa-work' into mppa-thread
Diffstat (limited to 'cparser')
| -rw-r--r-- | cparser/Elab.ml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cparser/Elab.ml b/cparser/Elab.ml index c5295347..0504ad0b 100644 --- a/cparser/Elab.ml +++ b/cparser/Elab.ml @@ -469,7 +469,8 @@ let elab_constant loc = function let (v, fk) = elab_float_constant f in CFloat(v, fk) | CONST_CHAR(wide, s) -> - CInt(elab_char_constant loc wide s, IInt, "") + let ikind = if wide then wchar_ikind () else IInt in + CInt(elab_char_constant loc wide s, ikind, "") | CONST_STRING(wide, s) -> elab_string_literal loc wide s @@ -2457,8 +2458,8 @@ let enter_typedef loc env sto (s, ty, init) = env end else begin - error loc "typedef redefinition with different types (%a vs %a)" - (print_typ env) ty (print_typ env) ty'; + error loc "redefinition of typedef '%s' with different type (%a vs %a)" + s (print_typ env) ty (print_typ env) ty'; env end | _ -> |