diff --git a/CHANGELOG.md b/CHANGELOG.md index 5816c6f6c365f9998bf87d622e9380c4b6092501..693345d62e7496b1689c7b8174487c7fdce967b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/src/Base/Messages.hs b/src/Base/Messages.hs index 00be64d6793e115be4db4e8439755e46fb6cff8f..b682f2b15db2845b0d44fd67c1c4c9f844c88595 100644 --- a/src/Base/Messages.hs +++ b/src/Base/Messages.hs @@ -1,6 +1,6 @@ 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) diff --git a/src/CompilerOpts.hs b/src/CompilerOpts.hs index f2abc5bad2a48b9f959e128098b4ab85d7e3e15d..bc17782b4c8204150cdf55bd3f7d4fe9fa5bef06 100644 --- a/src/CompilerOpts.hs +++ b/src/CompilerOpts.hs @@ -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 diff --git a/src/Generators/GenFlatCurry.hs b/src/Generators/GenFlatCurry.hs index 58b26b86e2534090964a6677faa1ef6a7a28e275..8c24013367eb4b5f16e70c91a4fd279cc484e3be 100644 --- a/src/Generators/GenFlatCurry.hs +++ b/src/Generators/GenFlatCurry.hs @@ -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