logic-classes 1.5.1 → 1.5.2

raw patch · 7 files changed

+12/−29 lines, 7 filessetup-changedPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

Data/Logic/Resolution.hs +2/−2
Data/Logic/Types/Harrison/Equal.hs +5/−5
Data/Logic/Types/Harrison/FOL.hs +2/−2
Data/Logic/Types/Harrison/Prop.hs +1/−1
Setup.hs +1/−12
changelog +0/−6
logic-classes.cabal +1/−1

Data/Logic/Resolution.hs view

@@ -205,7 +205,7 @@       tryUnify :: (Literal lit atom, Ord lit) =>                   S.Set lit -> S.Set lit -> Maybe ((S.Set lit, Map.Map v term), (S.Set lit, Map.Map v term))       tryUnify lhs rhs = tryUnify' lhs rhs S.empty-                         +       tryUnify' :: (Literal lit atom, Ord lit) =>                    S.Set lit -> S.Set lit -> S.Set lit -> Maybe ((S.Set lit, Map.Map v term), (S.Set lit, Map.Map v term))       tryUnify' lhss _ _ | S.null lhss = Nothing@@ -331,7 +331,7 @@           (\ x -> Just (atomic (applyEq (fromBool x) [] :: atom)))           (foldAtomEq (\ p ts -> Just (atomic (applyEq p (map (\ t -> replaceTerm' t) ts))))                       (\ x -> Just (atomic (applyEq (fromBool x) [] :: atom)))-                      (\ t1 t2 -> +                      (\ t1 t2 ->                            let t1' = replaceTerm' t1                                t2' = replaceTerm' t2 in                            if t1' == t2' then Nothing else Just (atomic (t1' `equals` t2'))))

Data/Logic/Types/Harrison/Equal.hs view

@@ -2,11 +2,11 @@ {-# OPTIONS_GHC -Wall #-} module Data.Logic.Types.Harrison.Equal where --- ========================================================================= --- First order logic with equality.                                          ---                                                                           --- Copyright (co) 2003-2007, John Harrison. (See "LICENSE.txt" for details.)  --- ========================================================================= +-- =========================================================================+-- First order logic with equality.+--+-- Copyright (co) 2003-2007, John Harrison. (See "LICENSE.txt" for details.)+-- =========================================================================  import Data.Generics (Data, Typeable) import Data.List (intersperse)

Data/Logic/Types/Harrison/FOL.hs view

@@ -26,7 +26,7 @@ import Text.PrettyPrint (text, cat)  -- ---------------------------------------------------------------------------- Terms.                                                                   +-- Terms. -- -------------------------------------------------------------------------  data TermType@@ -52,7 +52,7 @@ instance Constants String where     fromBool True = "true"     fromBool False = "false"-    asBool x +    asBool x         | x == fromBool True = Just True         | x == fromBool False = Just False         | True = Nothing

Data/Logic/Types/Harrison/Prop.hs view

@@ -13,7 +13,7 @@ import Text.PrettyPrint (text)  -- =========================================================================--- Basic stuff for propositional logic: datatype, parsing and printing.     +-- Basic stuff for propositional logic: datatype, parsing and printing. -- =========================================================================  newtype Prop = P {pname :: String} deriving (Read, Data, Typeable, Eq, Ord)

Setup.hs view

@@ -3,19 +3,8 @@ module Main where  import Distribution.Simple-import Distribution.Simple.LocalBuildInfo (LocalBuildInfo(buildDir))-import Distribution.Simple.Program-import System.Cmd import System.Directory (copyFile)-import System.Exit  main :: IO () main = copyFile "debian/changelog" "changelog" >>-       defaultMainWithHooks simpleUserHooks {-         postBuild = \ _ _ _ lbi -> runTestScript lbi-       , runTests = \ _ _ _ lbi -> runTestScript lbi-       }--runTestScript lbi =-    system (buildDir lbi ++ "/tests/tests") >>= \ code ->-    if code == ExitSuccess then return () else error "Test Failure"+       defaultMainWithHooks simpleUserHooks

changelog view

@@ -1,9 +1,3 @@-haskell-logic-classes (1.5.1) unstable; urgency=low--  * Update Homepage and Bug-Reports fields in cabal file-- -- David Fox <dsf@seereason.com>  Mon, 13 Apr 2015 14:16:10 -0700- haskell-logic-classes (1.5) unstable; urgency=low    * Move the pApp* functions from Data.Logic.Classes.FirstOrder to

logic-classes.cabal view

@@ -1,5 +1,5 @@ Name:             logic-classes-Version:          1.5.1+Version:          1.5.2 Synopsis:         Framework for propositional and first order logic, theorem proving Description:      Package to support Propositional and First Order Logic.  It includes classes                   representing the different types of formulas and terms, some instances of