ref: f68cd92fd6cf67edf58129a14032a40827d6740b
parent: 87db4936560982b998f768822469cd837caf54f0
author: Lennart Augustsson <lennart@augustsson.net>
date: Sun Oct 29 19:10:34 EDT 2023
Make cabal build work again
--- a/MicroHs.cabal
+++ b/MicroHs.cabal
@@ -22,8 +22,7 @@
Tools/convertY.sh
Tools/Addcombs.hs
comb/*.comb
- ghc/Primitives.hs
- ghc/Data/Bool_Type.hs
+ ghc/**/*.hs
lib/**/*.hs
src/runtime/eval.c
tests/Makefile
@@ -51,7 +50,6 @@
MicroHs.StateIO
MicroHs.IdentMap
MicroHs.Interactive
- MicroHs.State
MicroHs.TCMonad
MicroHs.Translate
MicroHs.TypeCheck
@@ -58,6 +56,7 @@
PreludeNoIO
Text.ParserComb
System.Console.SimpleReadline
+ Control.Alternative
Data.Double
Compat
CompatIO
--- a/src/System/Console/SimpleReadline.hs
+++ b/src/System/Console/SimpleReadline.hs
@@ -9,6 +9,7 @@
) where
import Primitives
import Prelude
+import Control.Monad
import Data.Char
import System.IO
--Ximport Compat
@@ -101,7 +102,7 @@
case ms of
Nothing -> []
Just "" -> []
- Just s | not (null o) && eqString s (last o) -> []
+ Just s | not (null o) && s == last o -> []
| otherwise -> [s]
h = o ++ l
return (h, ms)
--
⑨