[hoc-cvs] [hoc commit] r332 - trunk/hoc/InterfaceGenerator2

[<cod...@go...>]

Author: wol...@gm...
Date: Tue Oct  7 16:21:53 2008
New Revision: 332

Modified:
    trunk/hoc/InterfaceGenerator2/BuildEntities.hs

Log:
Minor cleanup: use System.FilePath.</>


Modified: trunk/hoc/InterfaceGenerator2/BuildEntities.hs
==============================================================================
--- trunk/hoc/InterfaceGenerator2/BuildEntities.hs	(original)
+++ trunk/hoc/InterfaceGenerator2/BuildEntities.hs	Tue Oct  7 16:21:53 2008
@@ -20,6 +20,7 @@
  import Data.List        ( groupBy, isPrefixOf )
  import Data.Maybe       ( fromMaybe )
  import System.Directory ( doesFileExist )
+import System.FilePath  ( (</>) )

  import qualified Data.ByteString.Char8 as BS
  import qualified Data.Map as Map
@@ -336,12 +337,12 @@
  --  
*****************************************************************************

  loadAdditionalCode :: String -> [String] -> EntityPile -> IO EntityPile
-loadAdditionalCode additionalCodePath0 modNames entityPile
+loadAdditionalCode additionalCodePath modNames entityPile
      = flip execStateT entityPile $ do
          flip mapM_ modNames $ \modName -> do
              let additionalCodeName
-                    = additionalCodePath -- ###
-                      ++ map (\c -> if c == '.' then '/' else c) modName
+                    = additionalCodePath
+                      </> map (\c -> if c == '.' then '/' else c) modName
                        ++ ".hs"

              exists <- lift $ doesFileExist additionalCodeName
@@ -387,7 +388,3 @@
                          eSrcPos = AutoGeneratedPos
                      }
                  return ()
-    where
-        additionalCodePath
-            | last additionalCodePath0 == '/' = additionalCodePath0
-            | otherwise = additionalCodePath0 ++ "/"