Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix haddock and release script errors

darcs-hash:20080709123925-974a0-414eed3735f822627eecc7e7ca5ea58a19126ce7.gz
  • Loading branch information...
commit 1881a6b95d1f1329c4d380fdbce3fb0afa673690 1 parent 02adf3c
eb authored
View
2  Ivor/Nobby.lhs
@@ -138,7 +138,7 @@ Remove a name from the middle of the context - should only be valid
if it's a partial definition or an axiom which is about to be replaced.
> remove :: (Ord n, Eq n) => n -> Gamma n -> Gamma n
-> remove n (Gam xs) = Gam $ Map.delete n xs where
+> remove n (Gam xs) = Gam $ Map.delete n xs
Insert a name into the context. If the name is already there, this
is an error *unless* the old definition was 'Undefined', in which case
View
2  Ivor/Typecheck.lhs
@@ -111,7 +111,7 @@ constraints and applying it to the term and type.
> ++ (map (\x -> (False,x)) (reverse cs))
> let tm' = papp subst tm
> let ty' = papp subst ty
-> return {- $ trace (show nms ++ "\n" ++ show (tm',ty')) -} (Ind tm',Ind ty')
+> return (Ind tm',Ind ty')
> where mkSubst xs = mkSubst' (P,[]) xs
> mkSubst' acc [] = return acc
View
1  Ivor/Unify.lhs
@@ -81,7 +81,6 @@ Collect names which do unify, and ignore errors
> | x == y = return acc
> | loc x envl == loc y envr && loc x envl >=0
> = return acc
-> -- | ignore = trace (show (x,y)) $ return sentinel -- broken, forget acc, but move on
> un envl envr (P x) t acc | hole envl x = return ((x,t):acc)
> un envl envr t (P x) acc | hole envl x = return ((x,t):acc)
> un envl envr (Bind x b@(B Hole ty) (Sc sc)) t acc
View
1  Ivor/ViewTerm.lhs
@@ -279,7 +279,6 @@
> dbgshow (MN (n,i)) = "MN [" ++ show n ++ "," ++ show i ++ "]"
> -- |Substitute a name n with a value v in a term f
-> -- (ie implement f[v/n]
> subst :: Name -> ViewTerm -> ViewTerm -> ViewTerm
> subst n v nm@(Name _ p) | p == n = v
> | otherwise = nm
View
4 release/Release.lhs
@@ -11,6 +11,7 @@ and upload it.
> import System.Process
> import Distribution.PackageDescription
> import Distribution.Package
+> import Distribution.Verbosity
> import Data.Version
> repo = "http://www-fp.dcs.st-and.ac.uk/~eb/darcs/Ivor/"
@@ -30,7 +31,8 @@ and upload it.
> release :: String -> IO ()
> release dest = do
> shell $ "darcs get --partial " ++ repo
-> pkg <- readPackageDescription "Ivor/ivor.cabal"
+> gpkg <- readPackageDescription verbose "Ivor/ivor.cabal"
+> let pkg = flattenPackageDescription gpkg
> let pkgver = pkgVersion (package pkg)
> let ver = getVer (versionBranch pkgver)
> putStrLn $ "Making a release of Ivor version " ++ ver
Please sign in to comment.
Something went wrong with that request. Please try again.