hash slices

fragnix.cabal

@@ -35,7 +35,8 @@ executable fragnix
                        tagged >=0.7.2 && <0.8,
                        aeson >=0.8.0.0 && <0.9,
                        bytestring >=0.10.4.0 && <0.11,
-                       hashable >=1.2.2.0 && <1.3
+                       hashable >=1.2.2.0 && <1.3,
+                       transformers >=0.3.0.0 && <0.4
   hs-source-dirs:      src
   default-language:    Haskell2010
 
@@ -59,5 +60,6 @@ test-suite test
                        aeson >=0.8.0.0 && <0.9,
                        bytestring >=0.10.4.0 && <0.11,
                        hashable >=1.2.2.0 && <1.3,
+                       transformers >=0.3.0.0 && <0.4,
                        tasty >= 0.8.1.3 && <0.9,
                        tasty-golden >= 2.2.2.4 && <2.3

src/Fragnix/Resolver.hs

@@ -20,6 +20,8 @@ import Distribution.HaskellSuite.Packages (getInstalledPackages)
 import Distribution.Simple.Compiler (PackageDB(GlobalPackageDB))
 import Data.Proxy (Proxy(Proxy))
 
+import Data.Hashable (hash)
+
 import Control.Exception (Exception,throwIO)
 import Data.Typeable (Typeable)
 import Data.Data (Data)
@@ -70,8 +72,23 @@ extractSlices scopedModule = do
         return (Slice key (Fragment [pack source]) usages))
 
 computeHashes :: [Slice] -> IO [Slice]
-computeHashes slices = forM slices (\slice -> do
-    return slice)
+computeHashes tempSlices = return (map (computeHash tempSliceMap) tempSlices) where
+    tempSliceMap = Map.fromList [(tempSliceID,tempSlice) | tempSlice@(Slice tempSliceID _ _) <- tempSlices]
+
+computeHash :: Map TempID Slice -> Slice -> Slice
+computeHash tempSliceMap (Slice _ fragment tempUsages) = Slice sliceID fragment usages where
+    sliceID = fromIntegral (hash (fragment,usages))
+    usages = map f tempUsages
+    f (Usage qualification usedName (OtherSlice tempID)) = (Usage qualification usedName (OtherSlice otherSliceID)) where
+        Just tempSlice = Map.lookup tempID tempSliceMap
+        Slice otherSliceID _ _ = computeHash tempSliceMap tempSlice
+    f usage = usage
+
+replaceUsageID :: Map TempID SliceID -> Usage -> Maybe Usage
+replaceUsageID sliceIDMap (Usage qualification usedName (OtherSlice tempID)) = do
+    sliceID <- Map.lookup tempID sliceIDMap
+    return (Usage qualification usedName (OtherSlice sliceID))
+replaceUsageID _ usage = Just usage
 
 type TempID = Integer
 

src/Fragnix/Slice.hs

@@ -1,10 +1,13 @@
-{-# LANGUAGE OverloadedStrings,StandaloneDeriving #-}
+{-# LANGUAGE OverloadedStrings,StandaloneDeriving,DeriveGeneric #-}
 module Fragnix.Slice where
 
 import Data.Aeson (
     ToJSON(toJSON),object,(.=),
     FromJSON(parseJSON),withObject,(.:))
 
+import GHC.Generics (Generic)
+import Data.Hashable (Hashable)
+
 import Data.Text (Text)
 
 import Control.Applicative ((<$>),(<*>),(<|>))
@@ -43,15 +46,19 @@ instance FromJSON Slice where
 
 
 deriving instance Show Fragment
+deriving instance Generic Fragment
 
 instance ToJSON Fragment where
     toJSON (Fragment declarations) = toJSON declarations
 
 instance FromJSON Fragment where
     parseJSON = fmap Fragment . parseJSON
 
+instance Hashable Fragment
+
 
 deriving instance Show Usage
+deriving instance Generic Usage
 
 instance ToJSON Usage where
     toJSON (Usage qualification usedName reference) = object [
@@ -63,10 +70,13 @@ instance FromJSON Usage where
     parseJSON = withObject "usage" (\o ->
         Usage <$> o .: "qualification" <*> o .: "usedName" <*> o .: "reference")
 
+instance Hashable Usage
+
 
 deriving instance Show UsedName
 deriving instance Eq UsedName
 deriving instance Ord UsedName
+deriving instance Generic UsedName
 
 instance ToJSON UsedName  where
     toJSON (VarId name) = object ["varId" .= name]
@@ -81,8 +91,11 @@ instance FromJSON UsedName where
         VarSym <$> o .: "varSym" <|>
         ConSym <$> o .: "conSym")
 
+instance Hashable UsedName
+
 
 deriving instance Show Reference
+deriving instance Generic Reference
 
 instance ToJSON Reference where
     toJSON (OtherSlice sliceID) = object ["otherSlice" .= sliceID]
@@ -93,5 +106,5 @@ instance FromJSON Reference where
         OtherSlice <$> o .: "otherSlice" <|>
         Primitive <$> o .: "originalModule")
 
-
+instance Hashable Reference
 

src/Main.hs

@@ -5,6 +5,6 @@ import Fragnix.Nest (writeSlice)
 import Fragnix.Compiler (compile)
 
 main :: IO ()
-main = resolve "tests/examples/HelloFragnix.hs" >>= mapM writeSlice >> compile 1 >>= print
+main = resolve "tests/examples/HelloFragnix.hs" >>= mapM writeSlice >> compile 5980034736339281833 >>= print