Commit 0f77ddb2 authored by Bernd Brassel's avatar Bernd Brassel
Browse files

merged patch by cwu

parent 9d685919
......@@ -55,9 +55,16 @@ strToHStr :: List Char -> Prelude.String
strToHStr listChar = Prelude.map charToHChar (listToHList listChar)
data Float = Float Prelude.Float | FloatUnderscore deriving (Data.Generics.Typeable, Data.Generics.Data)
data Float = FloatFail
| FloatOr DM.OrRef [Float]
| FloatUnderscore
| Float Prelude.Float deriving (Data.Generics.Typeable, Data.Generics.Data)
data Char = Char Prelude.Char | CharUnderscore deriving (Data.Generics.Typeable, Data.Generics.Data)
data Char = CharFail
| CharOr DM.OrRef [Char]
| CharUnderscore
| Char Prelude.Char deriving (Data.Generics.Typeable, Data.Generics.Data)
-- data (DM.DM dm) => IO a = IO (Prelude.IO a) | IOUnderscore
-- data (DM.DM dm) => IO a = IO a | IOUnderscore
......@@ -65,7 +72,10 @@ data Char = Char Prelude.Char | CharUnderscore deriving (Data.Generics.Typeable,
-- data IO a = IO (DM.Func dm (Unit) (a,Unit))
data World = World
data (DM.DM dm) => IO dm a = IO (World -> dm (a,World)) | IOUnderscore -- (dm :: * -> *)
data (DM.DM dm) => IO dm a = IOFail
| IOOr DM.OrRef [IO dm a]
| IOUnderscore
| IO (World -> dm (a,World)) | -- (dm :: * -> *)
instance Data.Generics.Typeable (IO dm a)
instance Data.Generics.Data (IO dm a)
......@@ -191,7 +201,6 @@ op_GtGtEq a1@(IO a) k
f w')))
-- runs debbugging of a strict IO expression
--runIO :: (DM.DM dm) => IO dm e ->
runIO sexpr = do
IO func <- DM.eval sexpr
DM.popOracle
......
......@@ -12,7 +12,7 @@ module Make (
make, makeWithFrontendParams, obsolete, unless,
parseArgs,Parameter,
main,quiet,force,modulename,output) where
quiet,force,modulename,output,main) where
import FlatCurry
import FlatCurryGoodies (progImports)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment