git.iko.soy/Idris-dev
on master help sign in
Merge branch 'master' of github.com:edwinb/Idris-dev
38ddde3Edwin Brady
src/Idris/ParseHelpers.hs+1−1
compare with master
unifiedsplit
@@ -152,7 +152,7 @@ idrisStyle = IdentifierStyle _styleName _styleStart _styleLetter _styleReserved
152 "case", "of", "total", "partial", "mutual",
152 "case", "of", "total", "partial", "mutual",
153 "infix", "infixl", "infixr", "rewrite",
153 "infix", "infixl", "infixr", "rewrite",
154 "where", "with", "syntax", "proof", "postulate",
154 "where", "with", "syntax", "proof", "postulate",
155− "using", "namespace", "class", "instance",
155+ "using", "namespace", "class", "instance", "parameters",
156 "public", "private", "abstract", "implicit",
156 "public", "private", "abstract", "implicit",
157 "quoteGoal",
157 "quoteGoal",
158 "Int", "Integer", "Float", "Char", "String", "Ptr",
158 "Int", "Integer", "Float", "Char", "String", "Ptr",
src/Idris/REPL.hs+4−4
@@ -125,12 +125,12 @@ ideslave orig mods
125 Failure err -> iPrintError $ show (fixColour c err)
125 Failure err -> iPrintError $ show (fixColour c err)
126 Success (Prove n') -> do iPrintResult ""
126 Success (Prove n') -> do iPrintResult ""
127 idrisCatch
127 idrisCatch
128− (do process fn (Prove n'))
128+ (process fn (Prove n'))
129− (\e -> do iPrintError $ show e)
129+ (\e -> getIState >>= iPrintError . flip pshow e)
130 isetPrompt (mkPrompt mods)
130 isetPrompt (mkPrompt mods)
131 Success cmd -> idrisCatch
131 Success cmd -> idrisCatch
132− (do ideslaveProcess fn cmd)
132+ (ideslaveProcess fn cmd)
133− (\e -> do iPrintError $ show e)
133+ (\e -> getIState >>= iPrintError . flip pshow e)
134 Just (REPLCompletions str) ->
134 Just (REPLCompletions str) ->
135 do (unused, compls) <- replCompletion (reverse str, "")
135 do (unused, compls) <- replCompletion (reverse str, "")
136 let good = SexpList [SymbolAtom "ok", toSExp (map replacement compls, reverse unused)]
136 let good = SexpList [SymbolAtom "ok", toSExp (map replacement compls, reverse unused)]