Commit 99cc1cdf authored by Jonas Oberschweiber's avatar Jonas Oberschweiber

Remove trace/Debug

parent dd470b4b
...@@ -11,7 +11,6 @@ module CPM.AbstractCurry ...@@ -11,7 +11,6 @@ module CPM.AbstractCurry
, applyModuleRenames , applyModuleRenames
) where ) where
import Debug (trace)
import Distribution (FrontendTarget (..), FrontendParams (..), defaultParams import Distribution (FrontendTarget (..), FrontendParams (..), defaultParams
, callFrontendWithParams, setQuiet, setFullPath , callFrontendWithParams, setQuiet, setFullPath
, curryCompiler, installDir, inCurrySubdir, modNameToPath , curryCompiler, installDir, inCurrySubdir, modNameToPath
......
...@@ -25,7 +25,6 @@ import AbstractCurry.Types (CurryProg (..), CFuncDecl (..), CVisibility (..) ...@@ -25,7 +25,6 @@ import AbstractCurry.Types (CurryProg (..), CFuncDecl (..), CVisibility (..)
, CTypeExpr (..), CPattern (..), CExpr (..) , CTypeExpr (..), CPattern (..), CExpr (..)
, CTypeDecl (..), CConsDecl (..), CFieldDecl (..) , CTypeDecl (..), CConsDecl (..), CFieldDecl (..)
, CVarIName) , CVarIName)
import Debug (trace)
import Directory (createDirectory, doesDirectoryExist, getTemporaryDirectory) import Directory (createDirectory, doesDirectoryExist, getTemporaryDirectory)
import FilePath ((</>), joinPath) import FilePath ((</>), joinPath)
import Function (both) import Function (both)
......
...@@ -5,7 +5,6 @@ module CPM.Diff.CurryComments ...@@ -5,7 +5,6 @@ module CPM.Diff.CurryComments
) where ) where
import Char import Char
import Debug (trace, traceShowId)
import List (isSuffixOf) import List (isSuffixOf)
-- This is adapted from the currydoc source code. -- This is adapted from the currydoc source code.
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
module CPM.Diff.Rename (prefixPackageAndDeps) where module CPM.Diff.Rename (prefixPackageAndDeps) where
import Debug (trace)
import Directory (doesDirectoryExist, getDirectoryContents, createDirectory) import Directory (doesDirectoryExist, getDirectoryContents, createDirectory)
import FilePath ((</>), joinPath, takeDirectory, takeBaseName, takeExtension) import FilePath ((</>), joinPath, takeDirectory, takeBaseName, takeExtension)
import List (splitOn) import List (splitOn)
......
...@@ -19,7 +19,6 @@ module CPM.LookupSet ...@@ -19,7 +19,6 @@ module CPM.LookupSet
, setLocallyIgnored , setLocallyIgnored
) where ) where
import Debug (trace)
import List (sortBy, delete, deleteBy) import List (sortBy, delete, deleteBy)
import TableRBT import TableRBT
import Test.EasyCheck import Test.EasyCheck
......
...@@ -4,7 +4,6 @@ import Either ...@@ -4,7 +4,6 @@ import Either
import List (intercalate, splitOn) import List (intercalate, splitOn)
import System (getArgs, setEnviron, system, unsetEnviron, exitWith) import System (getArgs, setEnviron, system, unsetEnviron, exitWith)
import FilePath ((</>)) import FilePath ((</>))
import Debug (trace)
import Directory (doesFileExist, getAbsolutePath, doesDirectoryExist import Directory (doesFileExist, getAbsolutePath, doesDirectoryExist
, createDirectory) , createDirectory)
import IO (hFlush, stdout) import IO (hFlush, stdout)
......
...@@ -22,7 +22,6 @@ module CPM.PackageCache.Global ...@@ -22,7 +22,6 @@ module CPM.PackageCache.Global
, emptyCache , emptyCache
) where ) where
import Debug (trace)
import Directory import Directory
import Either import Either
import List import List
......
...@@ -18,7 +18,6 @@ module CPM.Repository ...@@ -18,7 +18,6 @@ module CPM.Repository
, updateRepository , updateRepository
) where ) where
import Debug (trace)
import Directory import Directory
import Either import Either
import List import List
......
...@@ -15,7 +15,6 @@ module CPM.Resolution ...@@ -15,7 +15,6 @@ module CPM.Resolution
, resolveDependenciesFromLookupSet , resolveDependenciesFromLookupSet
) where ) where
import Debug
import Distribution (curryCompiler, curryCompilerMinorVersion import Distribution (curryCompiler, curryCompilerMinorVersion
, curryCompilerMajorVersion) , curryCompilerMajorVersion)
import Either import Either
...@@ -331,15 +330,6 @@ findDeepestNode = snd . maxNode . leaves . depthTree ...@@ -331,15 +330,6 @@ findDeepestNode = snd . maxNode . leaves . depthTree
depthTree = relabel 0 depthTree = relabel 0
relabel n (Node a cs) = Node (n, a) (map (relabel (n + 1)) cs) relabel n (Node a cs) = Node (n, a) (map (relabel (n + 1)) cs)
traceDepthTree :: Tree (Int, ConflictState) -> Tree (Int, ConflictState)
traceDepthTree v = trace (showTree $ mapTree label' v) v
where
mkActLabel = text . packageId . actPackage . fst
label' (n, (a, Nothing)) = text (show n) <+> colon <+> mkActLabel a
label' (n, (a, Just (CompilerConflict _))) = red $ text (show n) <+> colon <+> text "C" <+> mkActLabel a
label' (n, (a, Just (PrimaryConflict _))) = red $ text (show n) <+> colon <+> text "P" <+> mkActLabel a
label' (n, (a, Just (SecondaryConflict _ _))) = red $ text (show n) <+> colon <+> text "S" <+> mkActLabel a
findRelevantConflict :: Tree ConflictState -> Maybe ConflictState findRelevantConflict :: Tree ConflictState -> Maybe ConflictState
findRelevantConflict = maybeMostRelevant . map mostRelevant . map snd . minGroups . filter ((/= []) . snd) . findGroups . cutBelowConflict . relabel findRelevantConflict = maybeMostRelevant . map mostRelevant . map snd . minGroups . filter ((/= []) . snd) . findGroups . cutBelowConflict . relabel
where where
...@@ -447,7 +437,7 @@ packageSource :: Package -> LookupSet -> Maybe LookupSource ...@@ -447,7 +437,7 @@ packageSource :: Package -> LookupSet -> Maybe LookupSource
packageSource p ls = lookupSource ls p packageSource p ls = lookupSource ls p
allTransitiveDependencies' :: [String] -> LookupSet -> String -> [String] allTransitiveDependencies' :: [String] -> LookupSet -> String -> [String]
allTransitiveDependencies' seen ls pkg = trace pkg $ nub $ allDeps allTransitiveDependencies' seen ls pkg = nub $ allDeps
where where
allVersions = findAllVersions ls pkg True allVersions = findAllVersions ls pkg True
allDeps = foldl (\s d -> transitiveDependencies' s ls d) seen allVersions allDeps = foldl (\s d -> transitiveDependencies' s ls d) seen allVersions
......
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