c96561b · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

don't use a field in IOption and a field in IState, only one of them

c96561bHannes Mehnert13 years ago

src/Idris/AbsSyntax.hs+5−6

compare with master

unifiedsplit

@@ -312,12 +312,6 @@ setQuiet q = do i <- getIState

312 let opt' = opts { opt_quiet = q }

313 putIState $ i { idris_options = opt' }

314

315−setIdeSlave :: Bool -> Idris ()

316−setIdeSlave s = do i <- getIState

317− let opts = idris_options i

318− let opt' = opts { opt_ideslave = s }

319− putIState $ i { idris_options = opt' }

320−

321setTarget :: Target -> Idris ()

315setTarget :: Target -> Idris ()

322setTarget t = do i <- getIState

316setTarget t = do i <- getIState

323 let opts = idris_options i

317 let opts = idris_options i

@@ -338,6 +332,11 @@ outputTy :: Idris OutputType

338outputTy = do i <- getIState

332outputTy = do i <- getIState

339 return $ opt_outputTy $ idris_options i

333 return $ opt_outputTy $ idris_options i

340

334

335+setIdeSlave :: Bool -> Idris ()

336+setIdeSlave True = do i <- getIState

337+ putIState $ i { idris_outputmode = (IdeSlave 0) }

338+setIdeSlave False = return ()

339+

341verbose :: Idris Bool

340verbose :: Idris Bool

342verbose = do i <- getIState

341verbose = do i <- getIState

343 return (opt_verbose (idris_options i))

342 return (opt_verbose (idris_options i))

src/Idris/AbsSyntaxTree.hs+1−2

@@ -33,7 +33,6 @@ data IOption = IOption { opt_logLevel :: Int,

33 opt_repl :: Bool,

34 opt_verbose :: Bool,

35 opt_quiet :: Bool,

36− opt_ideslave :: Bool,

37 opt_target :: Target,

36 opt_target :: Target,

38 opt_outputTy :: OutputType,

37 opt_outputTy :: OutputType,

39 opt_ibcsubdir :: FilePath,

38 opt_ibcsubdir :: FilePath,

@@ -42,7 +41,7 @@ data IOption = IOption { opt_logLevel :: Int,

42 }

41 }

43 deriving (Show, Eq)

42 deriving (Show, Eq)

45−defaultOpts = IOption 0 False False True False False True True False False ViaC Executable "" [] []

44+defaultOpts = IOption 0 False False True False False True True False ViaC Executable "" [] []

47data LanguageExt = TypeProviders deriving (Show, Eq, Read, Ord)

46data LanguageExt = TypeProviders deriving (Show, Eq, Read, Ord)