Add support for marshalling unsigned long long (CULLong)

src/C2HS/CHS.hs

@@ -524,13 +524,15 @@ showCHSModule (CHSModule fragments) pureHaskell  =
     showFrags _      _     []                           = id
     showFrags pureHs state (CHSVerb s      pos : frags) =
       let
-        (fname,line)     = (posFile pos, posRow pos)
         generated        = isBuiltinPos pos
         emitNow          = state == Emit ||
                            (state == Wait && not (null s) && head s == '\n')
         nextState        = if generated then Wait else NoLine
       in
-        (if emitNow then
+        (if emitNow && isSourcePos pos
+         then
+           let (fname,line) = (posFile pos, posRow pos)
+           in
            showString ("\n{-# LINE " ++ show (line `max` 0) ++ " " ++
                        show fname ++ " #-}\n")
          else id)

src/C2HS/Gen/Bind.hs

@@ -375,6 +375,8 @@ isIntegralHsType "CInt"    = True
 isIntegralHsType "CUInt"   = True
 isIntegralHsType "CLong"   = True
 isIntegralHsType "CULong"  = True
+isIntegralHsType "CLLong"  = True
+isIntegralHsType "CULLong" = True
 isIntegralHsType _         = False
 
 -- | check for floating Haskell types

tests/bugs/issue-242/Issue242.chs

@@ -0,0 +1,12 @@
+module Main where
+import Foreign.C.Types(CULLong)
+#include "issue242.h"
+
+{# fun echoCULLong as ^ {`CULLong'} -> `CULLong' #}
+
+main :: IO ()
+main = do
+  let input :: CULLong
+      input = 1
+  output <- echoCULLong input
+  putStrLn (show output)

tests/bugs/issue-242/issue242.c

@@ -0,0 +1,7 @@
+#include <stdlib.h>
+
+#include "issue242.h"
+
+unsigned long long int echoCULLong (unsigned long long int i) {
+  return i;
+}

tests/bugs/issue-242/issue242.h

@@ -0,0 +1 @@
+unsigned long long int echoCULLong (unsigned long long int i);

tests/test-bugs.hs

@@ -95,6 +95,7 @@ tests =
     , testCase "Issue #180" issue180
     , testCase "Issue #192" issue192
     , testCase "Issue #230" issue230
+    , testCase "Issue #242" issue242
     ] ++
     -- Some tests that won't work on Windows.
     if os /= "cygwin32" && os /= "mingw32"
@@ -115,6 +116,9 @@ call_capital = c2hsShelly $ chdir "tests/bugs/call_capital" $ do
   let expected = ["upper C();", "lower c();", "upper C();"]
   liftIO $ assertBool "" (T.lines res == expected)
 
+issue242 :: Assertion
+issue242 = expect_issue 242 ["1"]
+
 issue230 :: Assertion
 issue230 = expect_issue 230 ["1", "2", "3", "4.0", "5", "6", "True", "8.0"]