Rename stubs file to <Module>_patch.c

1 files changed, 11 insertions, 8 deletions

diff --git a/c2haskell.hs b/c2haskell.hs
index e55e9a9..8b1d843 100644
--- a/c2haskell.hs
+++ b/c2haskell.hs
@@ -207,21 +207,23 @@ notKnown "Int16" = False
 notKnown "Int32" = False
 notKnown "Int64" = False
 notKnown "Bool"   = False
+notKnown "Word"   = False
 notKnown "Int"    = False
 notKnown "Char"   = False
 notKnown "()"     = False
 notKnown _        = True
 
 hsTypeSpec :: CDeclarationSpecifier t -> [Either Ident String]
-hsTypeSpec (CTypeSpec (CVoidType _)) = [ Right "()" ]
+hsTypeSpec (CTypeSpec (CVoidType _))                                       = [ Right "()" ]
+hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "size_t" _ _) _))                 = [ Right "Word"]
 hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "uint8_t" _ _) _))                = [ Right "Word8"]
 hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "uint16_t" _ _) _))               = [ Right "Word16"]
 hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "uint32_t" _ _) _))               = [ Right "Word32"]
 hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "uint64_t" _ _) _))               = [ Right "Word64"]
-hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int8_t" _ _) _))                = [ Right "Int8"]
-hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int16_t" _ _) _))               = [ Right "Int16"]
-hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int32_t" _ _) _))               = [ Right "Int32"]
-hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int64_t" _ _) _))               = [ Right "Int64"]
+hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int8_t" _ _) _))                 = [ Right "Int8"]
+hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int16_t" _ _) _))                = [ Right "Int16"]
+hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int32_t" _ _) _))                = [ Right "Int32"]
+hsTypeSpec (CTypeSpec (CTypeDef (C.Ident "int64_t" _ _) _))                = [ Right "Int64"]
 hsTypeSpec (CTypeSpec (CTypeDef ctyp _))                                   = [ Left ctyp ]
 hsTypeSpec (CTypeSpec (CBoolType _))                                       = [ Right "Bool"]
 hsTypeSpec (CTypeSpec (CIntType  _))                                       = [ Right "Int"]
@@ -253,7 +255,8 @@ hsTransField ctyps vars
         var <- vars
         trace ("var="++show var) $ return ()
         -- CDeclr (Just fident) ptrdeclr Nothing [] _ <- maybeToList var
-        let CDeclr mfident ptrdeclr Nothing [] _ = var
+        let CDeclr mfident ptrdeclr Nothing [] _ = var -- TODO: Look into: Irrefutable pattern failed (ctox/toxcore/DHT.c)
+        -- let CDeclr mfident ptrdeclr _ _ _ = var
         trace ("fident="++show mfident) $ return ()
         trace ("ptrdeclr="++show ptrdeclr) $ return ()
         let btyp = HS.TyCon () typname
@@ -462,7 +465,7 @@ c2haskell opts cs cmodname missings incs (CTranslUnit edecls _) = do
                 (ext,_:rname) -> reverse rname
                 (rname,_)     -> reverse rname
               modname = capitalize $ basename cmodname
-              stubsname = "MonkeyPatch/t_stubs.c" -- todo
+              stubsname = "MonkeyPatch/" ++ modname ++ "_patch.c"
           putStrLn $ "writing " ++ fname
           withFile fname  WriteMode $ \haskmod -> do
           hPutStrLn haskmod $ "module MonkeyPatch." ++ modname ++" where"
@@ -485,12 +488,12 @@ c2haskell opts cs cmodname missings incs (CTranslUnit edecls _) = do
             hPutStrLn haskmod $ "data " ++ t
           forM_ sigs $ \(_,(k,hs,d)) -> do
             forM_ hs $ \hdecl -> do
+                {-
                 hPutStr haskmod (commented k)
                 hPutStr haskmod (commented $ show $ pretty d)
                 hPutStr haskmod (commented $ show $ getReturnValue d)
                 hPutStr haskmod (commented $ show hdecl)
                 -- hPutStr haskmod $ commented $ show $ length $ symbolSource si
-                {-
                 forM_ (take 1 $ symbolSource si) $ \d -> do
                     let ts = filter notKnown $ map tname $ pointers $ concatMap types $ sigf hsTransSig d
                     -- putStr $ commented (ppShow (fmap (const ()) d))