Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
curry
curry-frontend
Commits
fa9909fd
Commit
fa9909fd
authored
Sep 11, 2012
by
Björn Peemöller
Browse files
Adapted renaming from MessageMonad
parent
e8788ca1
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/Base/Messages.hs
View file @
fa9909fd
...
...
@@ -11,7 +11,7 @@ import Control.Monad (unless)
import
System.IO
(
hPutStrLn
,
stderr
)
import
System.Exit
(
exitFailure
)
import
Curry.Base.Message
Monad
(
Message
,
posMessage
,
ppMessage
,
ppMessages
)
import
Curry.Base.Message
(
Message
,
posMessage
,
ppMessage
,
ppMessages
)
import
CompilerOpts
(
Options
(
optVerbosity
),
Verbosity
(
..
))
...
...
src/CurryDeps.hs
View file @
fa9909fd
...
...
@@ -29,7 +29,7 @@ import Data.List (intercalate, isSuffixOf, nub)
import
qualified
Data.Map
as
Map
(
Map
,
empty
,
insert
,
lookup
,
toList
)
import
Curry.Base.Ident
import
Curry.Base.Message
Monad
import
Curry.Base.Message
import
Curry.Files.Filenames
import
Curry.Files.PathUtils
import
Curry.Syntax
(
Module
(
..
),
ImportDecl
(
..
),
parseHeader
,
patchModuleId
)
...
...
src/Frontend.hs
View file @
fa9909fd
...
...
@@ -19,7 +19,7 @@ import Data.Maybe (mapMaybe)
import
qualified
Data.Map
as
Map
(
empty
)
import
Curry.Base.Message
Monad
import
Curry.Base.Message
import
Curry.Files.Filenames
import
Curry.Files.PathUtils
import
Curry.Syntax
(
Module
(
..
),
parseModule
)
...
...
@@ -34,7 +34,7 @@ import Modules (checkModule, checkModuleHeader, compileModule, loadModule)
The result is the syntax tree of the program (type 'Module'; see Module
"CurrySyntax").
-}
parse
::
FilePath
->
String
->
M
sgMonad
Module
parse
::
FilePath
->
String
->
M
essageM
Module
parse
fn
src
=
parseModule
True
fn
src
>>=
genCurrySyntax
where
genCurrySyntax
mod1
...
...
@@ -49,10 +49,10 @@ parse fn src = parseModule True fn src >>= genCurrySyntax
environment variable "PAKCSLIBPATH". Additional search paths can
be defined using the argument 'paths'.
-}
fullParse
::
Options
->
FilePath
->
String
->
IO
(
M
sgMonad
Module
)
fullParse
::
Options
->
FilePath
->
String
->
IO
(
M
essageM
Module
)
fullParse
opts
fn
src
=
genFullCurrySyntax
opts
fn
$
parse
fn
src
genFullCurrySyntax
::
Options
->
FilePath
->
M
sgMonad
Module
->
IO
(
M
sgMonad
Module
)
genFullCurrySyntax
::
Options
->
FilePath
->
M
essageM
Module
->
IO
(
M
essageM
Module
)
genFullCurrySyntax
opts
fn
m
=
runMsgIO
m
$
\
mod1
->
do
errs
<-
makeInterfaces
opts
fn
mod1
if
null
errs
...
...
src/Generators.hs
View file @
fa9909fd
...
...
@@ -12,7 +12,7 @@
-}
module
Generators
where
import
Curry.Base.Message
Monad
(
Message
)
import
Curry.Base.Message
(
Message
)
import
qualified
Curry.AbstractCurry
as
AC
(
CurryProg
)
import
qualified
Curry.ExtendedFlat.Type
as
EF
(
Prog
)
...
...
src/Generators/GenFlatCurry.hs
View file @
fa9909fd
...
...
@@ -18,7 +18,7 @@ import Data.Maybe (catMaybes, fromJust, fromMaybe, isJust)
import
Text.PrettyPrint
-- curry-base
import
Curry.Base.Message
Monad
import
Curry.Base.Message
import
Curry.Base.Ident
as
Id
import
Curry.ExtendedFlat.Type
import
Curry.ExtendedFlat.TypeInference
...
...
src/Html/CurryHtml.hs
View file @
fa9909fd
...
...
@@ -17,7 +17,7 @@ import Control.Exception (SomeException (..), catch)
import
Data.Maybe
(
fromMaybe
,
isJust
)
import
Curry.Base.Ident
(
QualIdent
(
..
),
unqualify
)
import
Curry.Base.Message
Monad
(
MsgMonad
,
failWith
,
runMsg
)
import
Curry.Base.Message
(
MessageM
,
failWith
,
runMsg
)
import
Curry.Files.PathUtils
(
readModule
,
writeModule
,
lookupCurryFile
,
dropExtension
,
takeFileName
)
import
Curry.Syntax
(
lexFile
)
...
...
@@ -70,7 +70,7 @@ filename2program opts filename = do
-- FIXME This is ugly. Avoid exceptions and report failure via MsgMonad
-- instead! (hsi)
catchError
::
Show
a
=>
IO
(
M
sgMonad
a
)
->
IO
(
M
sgMonad
a
)
catchError
::
Show
a
=>
IO
(
M
essageM
a
)
->
IO
(
M
essageM
a
)
catchError
toDo
=
Control
.
Exception
.
catch
(
toDo
>>=
returnNF
)
handler
where
handler
(
SomeException
e
)
=
return
(
failWith
(
show
e
))
...
...
src/Html/SyntaxColoring.hs
View file @
fa9909fd
...
...
@@ -12,7 +12,7 @@ import Debug.Trace (trace)
import
Curry.Base.Ident
import
Curry.Base.Position
import
Curry.Base.Message
Monad
import
Curry.Base.Message
import
Curry.Syntax
hiding
(
infixOp
)
import
Base.Messages
...
...
@@ -77,7 +77,7 @@ data FunctionKind
--- e.g. [typingParse, fullParse, parse]
--- @param lex-Result
--- @return program
genProgram
::
String
->
[
M
sgMonad
Module
]
->
M
sgMonad
[(
Position
,
Token
)]
->
Program
genProgram
::
String
->
[
M
essageM
Module
]
->
M
essageM
[(
Position
,
Token
)]
->
Program
genProgram
plainText
parseResults
m
=
case
runMsg
m
of
(
Left
e
,
msgs
)
->
buildMessagesIntoPlainText
(
e
:
msgs
)
plainText
(
Right
posNtokList
,
mess
)
->
...
...
@@ -151,7 +151,7 @@ flatCode code = code
-- ----------Message---------------------------------------
getMessages
::
M
sgMonad
a
->
[
Message
]
getMessages
::
M
essageM
a
->
[
Message
]
getMessages
=
snd
.
runMsg
--(Result mess _) = mess
-- getMessages (Failure mess) = mess
...
...
@@ -193,7 +193,7 @@ buildMessagesIntoPlainText messages text =
isLeq
_
=
True
--- @param parse-Modules [typingParse,fullParse,parse]
catIdentifiers
::
[
M
sgMonad
Module
]
->
([(
ModuleIdent
,
ModuleIdent
)],[
Code
])
catIdentifiers
::
[
M
essageM
Module
]
->
([(
ModuleIdent
,
ModuleIdent
)],[
Code
])
catIdentifiers
=
catIds
.
rights_sc
.
map
(
fst
.
runMsg
)
where
catIds
[]
=
(
[]
,
[]
)
...
...
src/Modules.hs
View file @
fa9909fd
...
...
@@ -22,7 +22,7 @@ import Control.Monad (unless, when)
import
Data.Maybe
(
fromMaybe
)
import
Text.PrettyPrint
import
Curry.Base.Message
Monad
import
Curry.Base.Message
import
Curry.Base.Position
import
Curry.Base.Ident
import
Curry.ExtendedFlat.InterfaceEquality
(
eqInterface
)
...
...
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