Commit 749300ce authored by Michael Hanus 's avatar Michael Hanus

html replaced by html2

parent 6d6fb13a
......@@ -12,14 +12,14 @@
"cass-analysis" : ">= 3.0.0, < 4.0.0",
"cass" : ">= 3.0.0, < 4.0.0",
"cdbi" : ">= 3.0.0, < 4.0.0",
"containers" : ">= 3.0.0, < 4.0.0",
"contracts" : ">= 3.0.0, < 4.0.0",
"currycheck" : ">= 3.0.0, < 4.0.0",
"currypath" : ">= 3.0.0, < 4.0.0",
"finite-map" : ">= 3.0.0, < 4.0.0",
"fl-parser" : ">= 3.0.0, < 4.0.0",
"flatcurry" : ">= 3.0.0, < 4.0.0",
"frontend-exec" : ">= 3.0.0, < 4.0.0",
"html" : ">= 3.0.0, < 4.0.0",
"html2" : ">= 3.0.0, < 4.0.0",
"printf" : ">= 3.0.0, < 4.0.0",
"regexp" : ">= 3.0.0, < 4.0.0",
"searchtree" : ">= 3.0.0, < 4.0.0",
......
......@@ -5,7 +5,8 @@
module CPP.CompileWithFrontend
where
import Language.Curry.Distribution ( curryCompiler )
import Control.Monad ( when )
import Curry.Compiler.Distribution ( curryCompiler )
import System.FrontendExec
......@@ -32,7 +33,7 @@ compileImportedModule verb modname = do
compileModuleTo :: Int -> String -> FrontendTarget -> IO ()
compileModuleTo verb modname target = do
when (verb > 2) $ putStrLn $
"Compiling '" ++ modname ++ "' to '" ++ showFrontendTarget target ++ "'..."
"Compiling '" ++ modname ++ "' to '" ++ show target ++ "'..."
callFrontendWithParams target (setQuiet True defaultParams) modname
------------------------------------------------------------------------------
......@@ -79,7 +79,7 @@ parserL1 p s = parserL1Iter "" p p s
parserL1Iter :: String -> Pos -> Pos -> String -> PM [L1Token]
parserL1Iter acc accP _ "" =
cleanPM (if_then_else (null acc) [] [Normal accP (reverse acc)])
cleanPM (ifThenElse (null acc) [] [Normal accP (reverse acc)])
parserL1Iter acc accP p s@(c:cs)
-- Parse Quotations
| c == '\"' = passThrough parseQuotation (movePosByChar p '\"') cs
......
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