Commit 6878f8aa authored by Björn Peemöller 's avatar Björn Peemöller

Merge branch '0.3-stable'

Conflicts:
	src/CurryBuilder.hs
parents 5e92b361 ffb0f15c
......@@ -39,6 +39,9 @@ Version 0.3.10
Version 0.3.9
=============
* Simplified verbosity options by merging options "-v1" and "-v2".
Now only "-v0" and "-v1" are supported.
* Fixed bug in non-exhaustive pattern matching check which occured
when retrieving the siblings of a constructor imported using an alias.
......
module Base.Messages
( -- * Output of user information
info, status, warn, putErrLn, putErrsLn
status, warn, putErrLn, putErrsLn
-- * program abortion
, abortWith, abortWithMessage, abortWithMessages
, internalError, errorMessage, errorMessages
......@@ -30,9 +30,6 @@ runEitherCYIO act = do
Left errs -> abortWithMessages errs
Right val -> return val
info :: MonadIO m => Options -> String -> m ()
info opts msg = unless (optVerbosity opts < VerbInfo) (putMsg msg)
status :: MonadIO m => Options -> String -> m ()
status opts msg = unless (optVerbosity opts < VerbStatus) (putMsg msg)
......
......@@ -129,14 +129,12 @@ data CymakeMode
data Verbosity
= VerbQuiet -- ^ be quiet
| VerbStatus -- ^ show status of compilation
| VerbInfo -- ^ also show additional info
deriving (Eq, Ord, Show)
-- |Description and flag of verbosities
verbosities :: [(Verbosity, String, String)]
verbosities = [ ( VerbQuiet , "0", "quiet" )
, ( VerbStatus, "1", "status")
, ( VerbInfo , "2", "info" )
]
-- |Type of the target file
......
......@@ -22,7 +22,6 @@ import Curry.Base.Message
import Curry.Base.Pretty
import Curry.ExtendedFlat.Type
import Curry.ExtendedFlat.TypeInference
import qualified Curry.Syntax as CS
-- Base
......@@ -56,7 +55,7 @@ genFlatCurry :: Options -> ModuleSummary.ModuleSummary -> InterfaceEnv
genFlatCurry opts modSum mEnv tyEnv tcEnv mdl = (prog', messages)
where
(prog, messages) = run opts modSum mEnv tyEnv tcEnv False (visitModule mdl)
prog' = {- eraseTypes $ -} adjustTypeInfo $ patchPrelude prog
prog' = patchPrelude prog -- eraseTypes $ adjustTypeInfo $
-- transforms intermediate language code (IL) to FlatCurry interfaces
genFlatInterface :: Options -> ModuleSummary.ModuleSummary -> InterfaceEnv
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment