38ddde3 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

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

commit38ddde3e22746dee631a92a58bfb1356ba91eafe authorEdwin Brady <ecb10@st-andrews.ac.uk> dateTue 22 Oct 2013, 14:09 (13 years ago) parentf54c665 ef09640

2 files changed+5−5

compare with master

unifiedsplit

src/Idris/ParseHelpers.hs+1−1 src/Idris/REPL.hs+4−4

src/Idris/ParseHelpers.hs+1−1

@@ -152,7 +152,7 @@ idrisStyle = IdentifierStyle _styleName _styleStart _styleLetter _styleReserved

152152 "case", "of", "total", "partial", "mutual",

153153 "infix", "infixl", "infixr", "rewrite",

154154 "where", "with", "syntax", "proof", "postulate",

155− "using", "namespace", "class", "instance",

155+ "using", "namespace", "class", "instance", "parameters",

156156 "public", "private", "abstract", "implicit",

157157 "quoteGoal",

158158 "Int", "Integer", "Float", "Char", "String", "Ptr",

src/Idris/REPL.hs+4−4

@@ -125,12 +125,12 @@ ideslave orig mods

125125 Failure err -> iPrintError $ show (fixColour c err)

126126 Success (Prove n') -> do iPrintResult ""

127127 idrisCatch

128− (do process fn (Prove n'))

129− (\e -> do iPrintError $ show e)

128+ (process fn (Prove n'))

129+ (\e -> getIState >>= iPrintError . flip pshow e)

130130 isetPrompt (mkPrompt mods)

131131 Success cmd -> idrisCatch

132− (do ideslaveProcess fn cmd)

133− (\e -> do iPrintError $ show e)

132+ (ideslaveProcess fn cmd)

133+ (\e -> getIState >>= iPrintError . flip pshow e)

134134 Just (REPLCompletions str) ->

135135 do (unused, compls) <- replCompletion (reverse str, "")

136136 let good = SexpList [SymbolAtom "ok", toSExp (map replacement compls, reverse unused)]