Commit 9d685919 authored by Bernd Brassel's avatar Bernd Brassel
Browse files

Merge branch 'IORef' into cabal

* IORef:
  intermediate state

Conflicts:

	src/Curry/RunTimeSystem/BaseCurry.hs
parent c1a6873c
......@@ -168,6 +168,10 @@ op_EqEqEq ::
op_EqEqEq x0 x1
= hook_op_EqEqEq x0 x1 (x0 `eqeq` x1)
strict_prim_negateFloat :: (DM.DM dm) => Float -> dm Float
strict_prim_negateFloat x0@(Float f)
= hook_strict_prim_negateFloat x0 (return (Float (-f)))
-- & :: Success -> Success -> Success (TODO)
op_And ::
(DM.DM dm) => Success -> Success -> dm Success
......@@ -185,6 +189,14 @@ op_GtGtEq a1@(IO a) k
IO f <- curryApply k r
DM.popOracle
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
(c,_) <- func World
Prelude.return c
-- return :: a -> IO a
strict_return ::
......
......@@ -19,7 +19,7 @@ import Curry.Files.KiCSPath
import Curry.Files.ProphecyPath
withLibs :: Bool
withLibs = False
withLibs = False--True
kics, cymake, prophecy :: IO Program
kics = mkProg getKiCS
......@@ -131,7 +131,7 @@ myPostConf args confFlags descrs lbi = do
require prophecy
postConf simpleUserHooks args confFlags descrs lbi
badlibs =
badlibs = take 0
[
-- mkstrict fails
"Traversal"
......
......@@ -9,10 +9,10 @@ module Make (
ModuleName,
Path,
FileName,
make, makeWithFrontendParams, obsolete, unless,
make, makeWithFrontendParams, obsolete, unless,
parseArgs,Parameter,
quiet,force,modulename,output) where
main,quiet,force,modulename,output) where
import FlatCurry
import FlatCurryGoodies (progImports)
......@@ -176,4 +176,4 @@ unless False act = act
\ No newline at end of file
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