From 3b8a094dafdeea5499239adadaf24d2b8bdb1f76 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Tue, 30 Dec 2014 17:10:43 +0100
Subject: PR#6: fix handling of wchar_t and assignments from wide string
 literals.

- cparser/Machine indicates whether wchar_t is signed or not
  (it is signed int in Linux and BSD, but unsigned short in Win32)
- The type of a wide string literal is "wchar_t *" if the typedef "wchar_t"
  exists in the environment (e.g. after #include <stddef.h>).  Only if
  wchar_t is not defined do we use the default from Machine.
- Permit initialization of any integer array from a wide string literal,
  not just an array of wchar_t.
---
 cparser/Machine.ml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'cparser/Machine.ml')

diff --git a/cparser/Machine.ml b/cparser/Machine.ml
index d8c55756..6a7f5054 100644
--- a/cparser/Machine.ml
+++ b/cparser/Machine.ml
@@ -29,6 +29,7 @@ type t = {
   sizeof_void: int option;
   sizeof_fun: int option;
   sizeof_wchar: int;
+  wchar_signed: bool;
   sizeof_size_t: int;
   sizeof_ptrdiff_t: int;
   alignof_ptr: int;
@@ -60,6 +61,7 @@ let ilp32ll64 = {
   sizeof_void = None;
   sizeof_fun = None;
   sizeof_wchar = 4;
+  wchar_signed = true;
   sizeof_size_t = 4;
   sizeof_ptrdiff_t = 4;
   alignof_ptr = 4;
@@ -91,6 +93,7 @@ let i32lpll64 = {
   sizeof_void = None;
   sizeof_fun = None;
   sizeof_wchar = 4;
+  wchar_signed = true;
   sizeof_size_t = 8;
   sizeof_ptrdiff_t = 8;
   alignof_ptr = 8;
@@ -122,6 +125,7 @@ let il32pll64 = {
   sizeof_void = None;
   sizeof_fun = None;
   sizeof_wchar = 4;
+  wchar_signed = true;
   sizeof_size_t = 8;
   sizeof_ptrdiff_t = 8;
   alignof_ptr = 8;
@@ -148,8 +152,12 @@ let x86_32 =
                    sizeof_longdouble = 12; alignof_longdouble = 4 }
 let x86_64 =
   { i32lpll64 with name = "x86_64"; char_signed = true }
+let win32 =
+  { ilp32ll64 with name = "win32"; char_signed = true;
+                   sizeof_wchar = 2; wchar_signed = false }
 let win64 =
-  { il32pll64 with name = "x86_64"; char_signed = true }
+  { il32pll64 with name = "win64"; char_signed = true;
+                   sizeof_wchar = 2; wchar_signed = false }
 let ppc_32_bigendian =
   { ilp32ll64 with name = "powerpc";
                    bigendian = true;
@@ -169,6 +177,6 @@ let gcc_extensions c =
 
 let config =
   ref (match Sys.word_size with
-           | 32 -> ilp32ll64
-           | 64 -> if Sys.os_type = "Win32" then il32pll64 else i32lpll64
+           | 32 -> if Sys.os_type = "Win32" then win32 else ilp32ll64
+           | 64 -> if Sys.os_type = "Win32" then win64 else i32lpll64
            | _  -> assert false)
-- 
cgit