git.iko.soy/Idris-dev
on master help sign in
rename abort -> error, emacs-rex -> idris
0abbd53Hannes Mehnert
src/Idris/IdeSlave.hs+1−1
compare with master
unifiedsplit
@@ -108,7 +108,7 @@ sendMessage :: SExpable a => Integer -> Either a a -> IO ()
108sendMessage id s =
108sendMessage id s =
109 -- TODO: get real output here!!!
109 -- TODO: get real output here!!!
110 case s of
110 case s of
111− Left err -> putStrLn $ conv (List [SymbolAtom "abort", toSExp err])
111+ Left err -> putStrLn $ conv (List [SymbolAtom "error", toSExp err])
112 Right succ -> putStrLn $ conv (List [SymbolAtom "ok", toSExp succ])
112 Right succ -> putStrLn $ conv (List [SymbolAtom "ok", toSExp succ])
113 where conv sexp =
113 where conv sexp =
114 let str = sExpToString (List [SymbolAtom "return", sexp, IntegerAtom id]) in (getHexLength str) ++ str
114 let str = sExpToString (List [SymbolAtom "return", sexp, IntegerAtom id]) in (getHexLength str) ++ str
src/Idris/REPL.hs+1−1
@@ -87,7 +87,7 @@ ideslave orig mods
87 = do idrisCatch
87 = do idrisCatch
88 (do x <- liftIO $ receiveMessage
88 (do x <- liftIO $ receiveMessage
89 case x of
89 case x of
90− (List [(SymbolAtom "emacs-rex"), cmd, (IntegerAtom id)]) ->
90+ (List [(SymbolAtom "idris"), cmd, (IntegerAtom id)]) ->
91 case sexpToCommand cmd of
91 case sexpToCommand cmd of
92 Just (Interpret cmd) ->
92 Just (Interpret cmd) ->
93 do i <- getIState
93 do i <- getIState