handle void return types

1 files changed, 6 insertions, 3 deletions

diff --git a/c2haskell.hs b/c2haskell.hs
index 9c910ef..ed287cf 100644
--- a/c2haskell.hs
+++ b/c2haskell.hs
@@ -574,13 +574,11 @@ changeArgList3 f (Just (CDeclr a x b c d)) = Just (CDeclr a (f x) b c d)
 changeArgList f (CFDefExt (CFunDef xs ys zs c d)) = CFDefExt (CFunDef xs (changeArgList1 f ys) zs c d)
 changeArgList f (CDeclExt (CDecl xs ys pos)) = (CDeclExt (CDecl xs (changeArgList2 f ys) pos))
 
-{-
 setPosOfNode :: Position -> NodeInfo -> NodeInfo
 setPosOfNode pos n = maybe (mkNodeInfoOnlyPos pos) (mkNodeInfo pos) $ nameOfNode n
 
 setPos pos (CFDefExt (CFunDef xs ys zs c n)) = (CFDefExt (CFunDef xs ys zs c $ setPosOfNode pos n))
 setPos pos (CDeclExt (CDecl xs ys n))        = (CDeclExt (CDecl xs ys $ setPosOfNode pos n))
--}
 
 getArgList1 (CDeclr a xs b c d) = xs
 
@@ -594,6 +592,9 @@ getArgList (CDeclExt (CDecl xs ys pos))      = getArgList2 ys
 changeReturnValue f (CFDefExt (CFunDef xs ys zs c d)) = (CFDefExt (CFunDef (f xs) ys zs c d))
 changeReturnValue f (CDeclExt (CDecl xs ys pos)) = (CDeclExt (CDecl (f xs) ys pos))
 
+getReturnValue (CFDefExt (CFunDef xs ys zs c d)) = xs
+getReturnValue (CDeclExt (CDecl xs ys pos))      = xs
+
 voidReturnType = [ CTypeSpec (CVoidType undefNode) ]
 
 setBody bdy (CFDefExt (CFunDef xs ys zs c d)) = (CFDefExt (CFunDef xs ys zs bdy d))
@@ -603,7 +604,9 @@ setBody bdy (CDeclExt (CDecl xs ys pos)) = (CFDefExt (CFunDef xs v [] bdy pos))
                 _              -> CDeclr Nothing [] Nothing [] pos
 
 makeStub d = -- @(CDeclExt (CDecl xs ys pos)) =
-    let rval = True -- todo: Set False for void function.
+    let rval = case getReturnValue d of
+            [ CTypeSpec (CVoidType _) ] -> False -- void function.
+            _                           -> True
         name = concatMap identToString $ take 1 $ catMaybes $ sym d
         msg = "undefined: " ++ HS.prettyPrint (makeAcceptableDecl $ head $ sig d) ++ "\n"
     in case getArgList d of