Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
curry
curry-frontend
Commits
57825e5f
Commit
57825e5f
authored
Aug 12, 2014
by
Jan Rasmus Tikovsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed remaining occurrences of Control.Monad.Trans.Either
parent
450f3ced
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
curry-frontend.cabal
curry-frontend.cabal
+1
-3
src/Html/CurryHtml.hs
src/Html/CurryHtml.hs
+1
-2
src/Imports.hs
src/Imports.hs
+2
-3
No files found.
curry-frontend.cabal
View file @
57825e5f
...
...
@@ -31,9 +31,7 @@ Executable cymake
hs-source-dirs: src
Main-is: cymake.hs
Build-Depends: base == 4.*, curry-base == 0.3.10
, containers, directory, either, mtl, process, transformers, syb
if impl(ghc < 7.4)
Build-Depends: either < 4, contravariant < 0.5, semigroupoids < 3.0.3, transformers < 0.3
, containers, directory, mtl, process, transformers, syb
ghc-options: -Wall
Other-Modules:
Base.CurryTypes
...
...
src/Html/CurryHtml.hs
View file @
57825e5f
...
...
@@ -14,7 +14,6 @@
module
Html.CurryHtml
(
source2html
)
where
import
Control.Monad.Writer
import
Control.Monad.Trans.Either
import
Data.Maybe
(
fromMaybe
,
isJust
)
import
System.FilePath
((
</>
),
dropFileName
,
takeBaseName
)
...
...
@@ -51,7 +50,7 @@ filename2program :: Options -> String -> CYIO [Code]
filename2program
opts
f
=
do
mbModule
<-
liftIO
$
readModule
f
case
mbModule
of
Nothing
->
left
[
message
$
text
$
"Missing file: "
++
f
]
Nothing
->
failMessages
[
message
$
text
$
"Missing file: "
++
f
]
Just
src
->
do
toks
<-
liftCYM
$
lexSource
f
src
typed
<-
fullParse
opts
f
src
...
...
src/Imports.hs
View file @
57825e5f
...
...
@@ -17,7 +17,6 @@ module Imports (importInterfaces, importModules, qualifyEnv) where
import
Control.Monad
(
liftM
,
unless
)
import
qualified
Control.Monad.State
as
S
(
State
,
gets
,
modify
,
runState
)
import
Control.Monad.Trans.Either
import
qualified
Data.Map
as
Map
import
Data.Maybe
import
qualified
Data.Set
as
Set
...
...
@@ -48,8 +47,8 @@ import CompilerOpts
importModules
::
Monad
m
=>
Options
->
Module
->
InterfaceEnv
->
CYT
m
CompilerEnv
importModules
opts
mdl
@
(
Module
_
mid
_
imps
_
)
iEnv
=
case
foldl
importModule
(
initEnv
,
[]
)
imps
of
(
e
,
[]
)
->
right
$
expandTCValueEnv
opts
$
importUnifyData
e
(
_
,
errs
)
->
left
errs
(
e
,
[]
)
->
ok
$
expandTCValueEnv
opts
$
importUnifyData
e
(
_
,
errs
)
->
failMessages
errs
where
initEnv
=
(
initCompilerEnv
mid
)
{
aliasEnv
=
importAliases
imps
-- import module aliases
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment