2c99b2b · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Merge branch 'master' of github.com:idris-lang/Idris-dev

commit2c99b2b81d433cc73d840e8bf9875dc78279a2b3 authorEdwin Brady <ecb10@st-andrews.ac.uk> dateThu 1 May 2014, 15:13 (12 years ago) parentd6a3eae ac95edb

3 files changed+3−3

compare with master

unifiedsplit

config.mk+1−1 src/Idris/Core/Elaborate.hs+1−1 src/Idris/Core/ProofState.hs+1−1

config.mk+1−1

@@ -1,4 +1,4 @@

1−CC :=cc

1+CC ?=cc

22CABAL :=cabal

33CFLAGS :=-O2 -Wall $(CFLAGS)

44#CABALFLAGS :=

src/Idris/Core/Elaborate.hs+1−1

@@ -64,7 +64,7 @@ loadState :: Elab' aux ()

6464loadState = do (ES p s e) <- get

6565 case e of

6666 Just st -> put st

67− _ -> fail "Nothing to undo"

67+ _ -> lift $ Error . Msg $ "Nothing to undo"

6868

6969getNameFrom :: Name -> Elab' aux Name

7070getNameFrom n = do (ES (p, a) s e) <- get

src/Idris/Core/ProofState.hs+1−1

@@ -872,7 +872,7 @@ processTactic QED ps = case holes ps of

872872 _ -> fail "Still holes to fill."

873873processTactic ProofState ps = return (ps, showEnv [] (pterm ps))

874874processTactic Undo ps = case previous ps of

875− Nothing -> fail "Nothing to undo."

875+ Nothing -> Error . Msg $ "Nothing to undo."

876876 Just pold -> return (pold, "")

877877processTactic EndUnify ps

878878 = let (h, ns_in) = unified ps