diff --git a/ChangeLog b/ChangeLog new file mode 100644 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,35 @@ +Changes in 1.0.19 + +* Add a change log. + +* Support unsafe calls with experimental #ccall_unsafe. + +Changes in 1.0.18 (This version has a bug. Marked as such in Hackage) + +* Introduce a silly bug to solve a problem that does not exist. + +Changes in 1.0.17 + +* Add Bindings.Utilities module for general utilities. + +* Change repository to git. + +* Don't underestimate size of field arrays with dimension >= 2. + +* Change #callback to #callback_t. + +* Keep source of bindings-* libraries with bindings-DSL. + +* Add examples used in tutorial. + +Changes in 1.0.16 + +* Use correct value for Storable alignment instead of copying sizeOf. + +Changes in 1.0.15 + +* New hsc2hs template doesn't include some headers, so include it ourselves. + +Changes in 1.0.14 + +* Add functions to get pointers to fields from pointers to structures. diff --git a/bindings-DSL.cabal b/bindings-DSL.cabal --- a/bindings-DSL.cabal +++ b/bindings-DSL.cabal @@ -17,7 +17,7 @@ . The extra module Bindings.Utilities will contain tools that may be convenient when working with FFI. -version: 1.0.19 +version: 1.0.20 license: BSD3 license-file: LICENSE maintainer: Maurício C. Antunes @@ -26,6 +26,7 @@ build-type: Simple bug-reports: http://bitbucket.org/mauricio/bindings-dsl/issues category: FFI +extra-source-files: ChangeLog library install-includes: bindings.dsl.h , bindings.cmacros.h build-depends: base >= 0 && < 1000 @@ -37,4 +38,4 @@ source-repository this type: git location: ssh://git@bitbucket.org/mauricio/bindings-dsl - tag: 1.0.19 + tag: 1.0.20 diff --git a/bindings.dsl.h b/bindings.dsl.h --- a/bindings.dsl.h +++ b/bindings.dsl.h @@ -11,7 +11,12 @@ #include #include #include + +#ifdef __cplusplus +#include +#else #include +#endif #define hsc_strict_import(dummy) printf( \ "import Foreign.Ptr (Ptr,FunPtr,plusPtr)\n" \ @@ -73,10 +78,10 @@ #define bc_dynamic(name) {printf("mK'");bc_word(name);}; \ #define bc_decimal(name) (name) > 0 \ - ? printf("%"PRIuMAX,(uintmax_t)(name)) \ - : printf("%"PRIdMAX,(intmax_t)(name)) \ + ? printf("%" PRIuMAX,(uintmax_t)(name)) \ + : printf("%" PRIdMAX,(intmax_t)(name)) \ -#define bc_wordptr(name) printf("%"PRIuPTR,(uintptr_t)(name)) \ +#define bc_wordptr(name) printf("%" PRIuPTR,(uintptr_t)(name)) \ #define bc_float(name) printf("%Le",(long double)(name)) \ @@ -144,7 +149,7 @@ if (size==sizeof(int)) printf("%s",sign?"CInt":"CUInt"); \ else if (size==sizeof(char)) printf("%s", \ (char)(-1)<0?(sign?"CChar":"CUChar"):(sign?"CSChar":"CChar")); \ - else printf("%s%"PRIuMAX,sign?"Int":"Word",(uintmax_t)(8*size)); \ + else printf("%s%" PRIuMAX,sign?"Int":"Word",(uintmax_t)(8*size)); \ printf("\n"); \ } \ @@ -256,7 +261,7 @@ for (i=0; i < bc_fielddata.n; i++) \ { \ bc_fieldoffset(typename,bc_fielddata.fname[i]); \ - printf(" p = plusPtr p %"PRIuMAX"\n",bc_fielddata.offset[i]); \ + printf(" p = plusPtr p %" PRIuMAX "\n",bc_fielddata.offset[i]); \ bc_fieldoffset(typename,bc_fielddata.fname[i]); \ printf(" :: Ptr (");bc_conid(typename);printf(") -> "); \ printf("Ptr (");bc_typemarkup(bc_fielddata.ftype[i]);printf(")\n"); \ @@ -275,14 +280,14 @@ printf(" poke p v\n"); \ if (bc_fielddata.array_size[i] > 0) \ { \ - printf(" let s = div %"PRIuMAX" $ sizeOf $ (undefined :: ", \ + printf(" let s = div %" PRIuMAX " $ sizeOf $ (undefined :: ", \ bc_fielddata.array_size[i]); \ bc_typemarkup(bc_fielddata.ftype[i]); \ - printf(")\n pokeArray (plusPtr p %"PRIuMAX") $ take s vf", \ + printf(")\n pokeArray (plusPtr p %" PRIuMAX ") $ take s vf", \ bc_fielddata.offset[i]); \ } \ else \ - printf(" pokeByteOff p %"PRIuMAX" vf", \ + printf(" pokeByteOff p %" PRIuMAX " vf", \ bc_fielddata.offset[i]); \ printf("\n"); \ printf(" vu <- peek p\n"); \ @@ -297,7 +302,7 @@ } \ printf("instance Storable "); \ bc_conid(typename);printf(" where\n"); \ - printf(" sizeOf _ = %"PRIuMAX"\n alignment _ = %"PRIuMAX"\n", \ + printf(" sizeOf _ = %" PRIuMAX "\n alignment _ = %" PRIuMAX "\n", \ (uintmax_t)(typesize),(uintmax_t)(typealign)); \ printf(" peek p = do\n"); \ for (i=0; i < bc_fielddata.n; i++) \ @@ -307,14 +312,14 @@ printf("return []"); \ else if (bc_fielddata.array_size[i] > 0) \ { \ - printf ("let s = div %"PRIuMAX" $ sizeOf $ (undefined :: ", \ + printf ("let s = div %" PRIuMAX " $ sizeOf $ (undefined :: ", \ bc_fielddata.array_size[i]); \ bc_typemarkup(bc_fielddata.ftype[i]); \ - printf(") in peekArray s (plusPtr p %"PRIuMAX")", \ + printf(") in peekArray s (plusPtr p %" PRIuMAX ")", \ bc_fielddata.offset[i]); \ } \ else \ - printf("peekByteOff p %"PRIuMAX"", bc_fielddata.offset[i]); \ + printf("peekByteOff p %" PRIuMAX "", bc_fielddata.offset[i]); \ printf("\n"); \ } \ printf(" return $ ");bc_conid(typename); \ @@ -326,18 +331,18 @@ for (i=0; i < bc_fielddata.n; i++) \ { \ if (bc_fielddata.is_fam[i]) \ - printf(" pokeArray (plusPtr p %"PRIuMAX") v%d", \ + printf(" pokeArray (plusPtr p %" PRIuMAX ") v%d", \ bc_fielddata.offset[i],i); \ else if (bc_fielddata.array_size[i] > 0) \ { \ - printf(" let s = div %"PRIuMAX" $ sizeOf $ (undefined :: ", \ + printf(" let s = div %" PRIuMAX " $ sizeOf $ (undefined :: ", \ bc_fielddata.array_size[i]); \ bc_typemarkup(bc_fielddata.ftype[i]); \ - printf(")\n pokeArray (plusPtr p %"PRIuMAX") (take s v%d)", \ + printf(")\n pokeArray (plusPtr p %" PRIuMAX ") (take s v%d)", \ bc_fielddata.offset[i], i); \ } \ else \ - printf(" pokeByteOff p %"PRIuMAX" v%d", \ + printf(" pokeByteOff p %" PRIuMAX " v%d", \ bc_fielddata.offset[i],i); \ printf("\n"); \ } \