Commit a286178c authored by Björn Peemöller 's avatar Björn Peemöller
Browse files

Build failures solved

parent b7bb161e
......@@ -43,13 +43,13 @@ makeCurry opts deps1 targetFile = mapM_ (compile . snd) deps1 where
compile (Interface _) = return ()
compile Unknown = return ()
compile (Source file mods) =
compile (Source file mods)
-- target file
| dropExtension targetFile == dropExtension file = do
flatIntfExists <- doesModuleExist (flatIntName file)
if flatIntfExists && not (force opts) && null (dump opts)
then smake (targetNames file)
(file': (catMaybes (map flatInterface mods)))
(targetFile: (catMaybes (map flatInterface mods)))
(generateFile file)
(skipFile file)
else generateFile file
......
......@@ -9,6 +9,7 @@ import Curry.Files.PathUtils
(readModule, writeModule, getCurryPath, dropExtension, takeFileName)
import Curry.Syntax (lexFile)
import CurryCompilerOpts (Options(..))
import Frontend (parse, typingParse, fullParse)
import Html.SyntaxColoring
......@@ -16,7 +17,7 @@ import Html.SyntaxColoring
--- @param outputfilename
--- @param sourcefilename
source2html :: Options -> String -> IO ()
source2html imports outputfilename sourcefilename = do
source2html opts sourcefilename = do
let imports = importPaths opts
outputfilename = fromMaybe "" $ output opts
sourceprogname = dropExtension sourcefilename
......@@ -125,19 +126,19 @@ replace :: Char -> String -> String -> String
replace old new = foldr (\ x -> if x == old then (new ++) else ([x] ++)) ""
addHtmlAnchor :: String -> QualIdent -> String
addHtmlAnchor html qualIdent = "<a name=\"" ++
addHtmlAnchor str qualIdent = "<a name=\"" ++
string2urlencoded (show (unqualify qualIdent)) ++
"\"></a>" ++ html
"\"></a>" ++ str
addHtmlLink :: String -> QualIdent -> String
addHtmlLink html qualIdent =
addHtmlLink str qualIdent =
let (maybeModIdent, ident) = (qualidMod qualIdent, qualidId qualIdent) in
"<a href=\"" ++
maybe "" (\ x -> show x ++ "_curry.html") maybeModIdent ++
"#" ++
string2urlencoded (show ident) ++
"\">" ++
html ++
str ++
"</a>"
isCall :: Code -> Bool
......
......@@ -8,7 +8,7 @@
-}
module Main (main) where
import Data.Maybe (fromMaybe, isJust)
import Data.Maybe (isJust)
import System.Environment (getArgs, getProgName)
import CurryBuilder (buildCurry)
......
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