1 files changed, 43 insertions, 7 deletions

diff --git a/monkeypatch.hs b/monkeypatch.hs
index 461d3c1..ea97252 100644
--- a/monkeypatch.hs
+++ b/monkeypatch.hs
@@ -24,6 +24,7 @@ import qualified Data.IntMap           as IntMap
 import qualified Data.Map           as Map
          ;import Data.Map           (Map)
 import Data.Maybe
+import Data.Ord
 import qualified Data.Set           as Set
          ;import Data.Set           (Set)
 import Language.C.Data.Ident        as C
@@ -47,7 +48,7 @@ import Text.PrettyPrint             (Doc, doubleQuotes, empty, text, vcat, ($$),
                                      (<+>))
 import Text.Show.Pretty
 
-import Comments
+import GrepNested
 
 trace :: p -> a -> a
 trace _ = id
@@ -480,6 +481,31 @@ isFunctionDecl _ = False
 cleanTree :: (Functor f, Data (f b)) => f b -> f Ordering
 cleanTree d = fmap (const LT) $ everywhere (mkT eraseNodeInfo) $ d
 
+
+data SymbolExtent = SymbolExtent { startExtent :: Position, stopExtent :: Position }
+
+instance Show SymbolExtent where
+    show (SymbolExtent a b) = "sed -n "++show al++","++show bl++"p "++fn
+        where
+            fn = posFile a
+            al = posRow a
+            bl = posRow b
+
+getSymbolExtent :: (CNode a1, Data a2) =>
+                   SymbolInformation a2 -- ^ Symbol database record (symbolSource must have Postion data in it).
+                   -> [a1]              -- ^ function body (only used for filename)
+                   -> SymbolExtent
+getSymbolExtent sym bdy =
+    -- TODO: This could probably be a lot more efficient using NodeInfo's PosLength field.
+    let bdy_poss = map (posOfNode . nodeInfo) bdy
+        -- hpos = map (posOfNode . nodeInfo) (symbolSource sym)
+        cmodule = map posFile (take 1 $ filter isSourcePos $ bdy_poss) -- TODO: What if first statement is provided by macro?
+        allposss = listify (\p -> case cmodule of { [f] | isSourcePos p -> posFile p == f ; _ -> isSourcePos p }) (symbolSource sym) :: [Position]
+        start = minimumBy (comparing posRow) allposss
+        stop  = maximumBy (comparing posRow) allposss
+    in SymbolExtent start stop
+
+
 transpile :: C2HaskellOptions -> FilePath -> IncludeStack -> CTranslationUnit NodeInfo -> IO ()
 transpile o fname incs (CTranslUnit edecls _) = do
     let db = foldr update initTranspile edecls
@@ -529,6 +555,15 @@ transpile o fname incs (CTranslUnit edecls _) = do
 
                                         Nothing -> putStrLn $ "??: " ++ ppShow (cleanTree d)
                                     putStrLn ""
+                        let extent = getSymbolExtent sym bdy
+                        cs <- readComments (posFile $ startExtent extent)
+                        let (pcs,cs') = seekComment (startExtent extent) cs
+                            (cs'',ds) = seekComment (stopExtent extent) cs'
+                        -- lineOfComment
+                        forM_ cs' $ \(_,col,cmt) -> do
+                            putStrLn ""
+                            putStrLn $ replicate col ' ' ++ cmt
+                        print extent
     return ()
 
 isHeaderDecl :: CNode a => a -> Bool
@@ -895,8 +930,9 @@ enumCases (CDeclExt (CDecl xs _ ni)) = do
 lineOfComment :: (Int, b, String) -> Int
 lineOfComment (l,_,s) = l + length (lines s)
 
-seekComment :: NodeInfo -> [(Int,Int,String)] -> ([(Int,Int,String)],[(Int,Int,String)])
-seekComment ni cs = break (\c -> lineOfComment c>=posRow (posOfNode ni)) cs
+-- Break a comment list into comments preceding the given node and comments that come after it.
+seekComment :: Position -> [(Int,Int,String)] -> ([(Int,Int,String)],[(Int,Int,String)])
+seekComment pos cs = break (\c -> lineOfComment c>=posRow pos) cs
 
 strip :: [Char] -> [Char]
 strip = reverse . dropWhile isSpace . reverse . dropWhile isSpace
@@ -955,13 +991,13 @@ c2haskell opts cs cmodname missings incs (CTranslUnit edecls _) = do
                         cs <- maybe (return []) readComments symfile
                         -- mapM_ (hPutStrLn haskmod . commented . ppShow) $ cs
                         -- mapM_ (hPutStrLn haskmod . commented . ppShow) $ symbolSource si
-                        let (_,cs') = seekComment eni cs
+                        let (_,cs') = seekComment (posOfNode eni) cs
                         forM_ (take 1 cs') $ \(_,c,s) ->
                             when (c==1) $ hPutStr haskmod $ commented $ "| " ++ strip s
                         hPutStrLn haskmod $ unwords ["newtype",t,"=",t,"CInt"]
                         forM_ (zip es [0..]) $ \((e,_),n) -> do
                             let r = posRow . posOfNode . nodeInfo $ e
-                            case seekComment (nodeInfo e) cs' of
+                            case seekComment (posOfNode $ nodeInfo e) cs' of
                                 (_,(lno,cno,s):_) | lno==r-1 && cno==1
                                                     || cno>1 && lno == r
                                   -> hPutStr haskmod $ commented $ "| " ++ strip s
@@ -1356,8 +1392,8 @@ goMissing haskmod db cfun = do
                     htyp -> hPutStr haskmod $ commented $ "Unsupported haskell type: " ++ HS.prettyPrint htyp
 
 
-readComments :: (Num lin, Num col) => FilePath -> IO [(lin, col, [Char])]
-readComments fname = parseComments 1 1 <$> readFile fname
+readComments :: Num lin => FilePath -> IO [(lin, Int, [Char])]
+readComments fname = grepCComments 1 1 <$> readFile fname
 
 sanitizeArgs :: [String] -> [String]
 sanitizeArgs (('-':'M':_):args) = sanitizeArgs args