Rename annotated FlatCurry to typed FlatCurry

src/Curry/Files/Filenames.hs

@@ -28,7 +28,7 @@ module Curry.Files.Filenames
   , curryExt, lcurryExt, icurryExt
 
     -- ** FlatCurry files
-  , annotatedFlatExt, flatExt, flatIntExt
+  , typedFlatExt, flatExt, flatIntExt
 
     -- ** AbstractCurry files
   , acyExt, uacyExt
@@ -37,7 +37,7 @@ module Curry.Files.Filenames
   , sourceRepExt, sourceExts, moduleExts
 
     -- * Functions for computing file names
-  , interfName, annotatedFlatName, flatName, flatIntName
+  , interfName, typedFlatName, flatName, flatIntName
   , acyName, uacyName, sourceRepName, tokensName, htmlName
   ) where
 
@@ -148,9 +148,9 @@ sourceExts = [curryExt, lcurryExt]
 moduleExts :: [String]
 moduleExts = sourceExts ++ [icurryExt]
 
--- |Filename extension for annotated flat-curry files
-annotatedFlatExt :: String
-annotatedFlatExt = ".afcy"
+-- |Filename extension for typed flat-curry files
+typedFlatExt :: String
+typedFlatExt = ".tfcy"
 
 -- |Filename extension for flat-curry files
 flatExt :: String
@@ -184,9 +184,9 @@ tokensExt = ".tokens"
 interfName :: FilePath -> FilePath
 interfName = replaceExtensionWith icurryExt
 
--- |Compute the filename of the annotated flat curry file for a source file
-annotatedFlatName :: FilePath -> FilePath
-annotatedFlatName = replaceExtensionWith annotatedFlatExt
+-- |Compute the filename of the typed flat curry file for a source file
+typedFlatName :: FilePath -> FilePath
+typedFlatName = replaceExtensionWith typedFlatExt
 
 -- |Compute the filename of the flat curry file for a source file
 flatName :: FilePath -> FilePath

src/Curry/FlatCurry/Files.hs

@@ -13,13 +13,13 @@
 -}
 
 module Curry.FlatCurry.Files
-  ( readAnnotatedFlatCurry, readFlatCurry, readFlatInterface, writeFlatCurry
+  ( readTypedFlatCurry, readFlatCurry, readFlatInterface, writeFlatCurry
   ) where
 
 import Control.Monad         (liftM)
 import Data.Char             (isSpace)
 
-import Curry.Files.Filenames (annotatedFlatName, flatName, flatIntName)
+import Curry.Files.Filenames (typedFlatName, flatName, flatIntName)
 import Curry.Files.PathUtils (writeModule, readModule)
 
 import Curry.FlatCurry.Type  (Prog)
@@ -30,10 +30,10 @@ import Curry.FlatCurry.Annotated.Type (AProg, TypeExpr)
 -- Functions for reading and writing FlatCurry terms
 -- ---------------------------------------------------------------------------
 
--- |Reads an annotated FlatCurry file (extension ".afcy") and eventually
+-- |Reads an typed FlatCurry file (extension ".tfcy") and eventually
 -- returns the corresponding FlatCurry program term (type 'AProg').
-readAnnotatedFlatCurry :: FilePath -> IO (Maybe (AProg TypeExpr))
-readAnnotatedFlatCurry = readFlat . annotatedFlatName
+readTypedFlatCurry :: FilePath -> IO (Maybe (AProg TypeExpr))
+readTypedFlatCurry = readFlat . typedFlatName
 
 -- |Reads a FlatCurry file (extension ".fcy") and eventually returns the
 -- corresponding FlatCurry program term (type 'Prog').