Handle special case (void) argument list.

1 files changed, 8 insertions, 3 deletions

diff --git a/c2haskell.hs b/c2haskell.hs
index ce33666..41d9ba0 100644
--- a/c2haskell.hs
+++ b/c2haskell.hs
@@ -621,9 +621,11 @@ parameterIdent (CDecl _ xs n) = listToMaybe $ do
     (Just (CDeclr (Just x) _ _ _ _),_,_) <- xs
     return x
 
+
 makeParameterNames :: CDerivedDeclarator NodeInfo -> (CDerivedDeclarator NodeInfo,[CExpression NodeInfo])
-makeParameterNames (CFunDeclr (Right (ps, flg)) z2 z3)
-                = ( CFunDeclr (Right (qs, flg)) z2 z3 , map expr qs )
+makeParameterNames (CFunDeclr (Right (ps, flg)) z2 z3) = case ps of
+    [CDecl [CTypeSpec (CVoidType _)] [] _] -> ( CFunDeclr (Right (ps, flg)) z2 z3 , []) -- void argument list.
+    _                                      -> ( CFunDeclr (Right (qs, flg)) z2 z3 , map expr qs )
  where
     -- TODO: ensure uniqueness of generated parameter names
     qs = zipWith mkp [0..] ps
@@ -787,11 +789,14 @@ sanitizeArgs ("-o":args)        = sanitizeArgs $ drop 1 args
 sanitizeArgs (arg:args)         = arg : sanitizeArgs args
 sanitizeArgs []                 = []
 
+isModule :: FilePath -> Bool
+isModule fname = (".c" `isSuffixOf` fname) || (".o" `isSuffixOf` fname)
+
 usage :: [String] -> Maybe (C2HaskellOptions, [String], [FilePath])
 usage args =
     case break (=="--") args of
         (targs,_:cargs0) -> do
-            let (rfs,ropts) = span (".c" `isSuffixOf`) cargs0
+            let (rfs,ropts) = span isModule cargs0
                 opts = reverse ropts
                 cargs = (sanitizeArgs opts)
                 hopts = parseOptions targs defopts