swish 0.10.0.0 → 0.10.0.1
raw patch · 3 files changed
+7/−3 lines, 3 filesdep ~polyparsePVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: polyparse
API changes (from Hackage documentation)
- Data.Ord.Partial: partCompareEq :: (Eq a) => PartCompare a
+ Data.Ord.Partial: partCompareEq :: Eq a => PartCompare a
- Data.Ord.Partial: partCompareListMaybe :: (Eq a) => [Maybe a] -> [Maybe a] -> Maybe Ordering
+ Data.Ord.Partial: partCompareListMaybe :: Eq a => [Maybe a] -> [Maybe a] -> Maybe Ordering
- Data.Ord.Partial: partCompareListSubset :: (Eq a) => [a] -> [a] -> Maybe Ordering
+ Data.Ord.Partial: partCompareListSubset :: Eq a => [a] -> [a] -> Maybe Ordering
- Swish.Datatype: Datatype :: (DatatypeVal ex vt lb vn) -> Datatype ex lb vn
+ Swish.Datatype: Datatype :: DatatypeVal ex vt lb vn -> Datatype ex lb vn
- Swish.Datatype: DatatypeMap :: Text -> Maybe vt -> vt -> Maybe Text -> DatatypeMap vt
+ Swish.Datatype: DatatypeMap :: (Text -> Maybe vt) -> (vt -> Maybe Text) -> DatatypeMap vt
- Swish.Datatype: DatatypeSub :: DatatypeVal ex supvt lb vn -> DatatypeVal ex subvt lb vn -> subvt -> supvt -> supvt -> Maybe subvt -> DatatypeSub ex lb vn supvt subvt
+ Swish.Datatype: DatatypeSub :: DatatypeVal ex supvt lb vn -> DatatypeVal ex subvt lb vn -> (subvt -> supvt) -> (supvt -> Maybe subvt) -> DatatypeSub ex lb vn supvt subvt
- Swish.Datatype: DatatypeVal :: ScopedName -> Ruleset ex -> ex -> [Rule ex] -> [OpenVarBindingModify lb vn] -> DatatypeMap vt -> [DatatypeRel vt] -> [DatatypeMod vt lb vn] -> DatatypeVal ex vt lb vn
+ Swish.Datatype: DatatypeVal :: ScopedName -> Ruleset ex -> (ex -> [Rule ex]) -> [OpenVarBindingModify lb vn] -> DatatypeMap vt -> [DatatypeRel vt] -> [DatatypeMod vt lb vn] -> DatatypeVal ex vt lb vn
- Swish.Datatype: altArgs :: (Eq vt) => DatatypeRelPr vt -> [(vt -> Bool, [b])] -> ((vt -> Bool) -> b -> [Maybe vt] -> Maybe [vt]) -> DatatypeRelFn vt
+ Swish.Datatype: altArgs :: Eq vt => DatatypeRelPr vt -> [(vt -> Bool, [b])] -> ((vt -> Bool) -> b -> [Maybe vt] -> Maybe [vt]) -> DatatypeRelFn vt
- Swish.GraphClass: addGraphs :: (LDGraph lg lb, (Ord lb)) => lg lb -> lg lb -> lg lb
+ Swish.GraphClass: addGraphs :: (LDGraph lg lb, Ord lb) => lg lb -> lg lb -> lg lb
- Swish.GraphClass: delete :: (LDGraph lg lb, (Ord lb)) => lg lb -> lg lb -> lg lb
+ Swish.GraphClass: delete :: (LDGraph lg lb, Ord lb) => lg lb -> lg lb -> lg lb
- Swish.GraphClass: extract :: (LDGraph lg lb, (Ord lb)) => Selector lb -> lg lb -> lg lb
+ Swish.GraphClass: extract :: (LDGraph lg lb, Ord lb) => Selector lb -> lg lb -> lg lb
- Swish.GraphClass: hasLabel :: (Eq lb) => lb -> Arc lb -> Bool
+ Swish.GraphClass: hasLabel :: Eq lb => lb -> Arc lb -> Bool
- Swish.GraphClass: labels :: (LDGraph lg lb, (Ord lb)) => lg lb -> Set lb
+ Swish.GraphClass: labels :: (LDGraph lg lb, Ord lb) => lg lb -> Set lb
- Swish.GraphClass: nodes :: (LDGraph lg lb, (Ord lb)) => lg lb -> Set lb
+ Swish.GraphClass: nodes :: (LDGraph lg lb, Ord lb) => lg lb -> Set lb
- Swish.GraphMatch: LabelMap :: Word32 -> (Map lb lv) -> GenLabelMap lb lv
+ Swish.GraphMatch: LabelMap :: Word32 -> Map lb lv -> GenLabelMap lb lv
- Swish.GraphMatch: assignLabelMap :: (Label lb) => Set lb -> LabelMap lb -> LabelMap lb
+ Swish.GraphMatch: assignLabelMap :: Label lb => Set lb -> LabelMap lb -> LabelMap lb
- Swish.GraphMatch: emptyMap :: (Label lb) => LabelMap lb
+ Swish.GraphMatch: emptyMap :: Label lb => LabelMap lb
- Swish.GraphMatch: equivalenceClasses :: (Label lb) => LabelMap lb -> Set lb -> [EquivalenceClass lb]
+ Swish.GraphMatch: equivalenceClasses :: Label lb => LabelMap lb -> Set lb -> [EquivalenceClass lb]
- Swish.GraphMatch: graphLabels :: (Label lb) => ArcSet lb -> Set lb
+ Swish.GraphMatch: graphLabels :: Label lb => ArcSet lb -> Set lb
- Swish.GraphMatch: graphMatch :: (Label lb) => (lb -> lb -> Bool) -> ArcSet lb -> ArcSet lb -> (Bool, LabelMap (ScopedLabel lb))
+ Swish.GraphMatch: graphMatch :: Label lb => (lb -> lb -> Bool) -> ArcSet lb -> ArcSet lb -> (Bool, LabelMap (ScopedLabel lb))
- Swish.GraphMatch: graphMatch1 :: (Label lb) => Bool -> (lb -> lb -> Bool) -> ArcSet lb -> ArcSet lb -> LabelMap lb -> [(EquivalenceClass lb, EquivalenceClass lb)] -> (Bool, LabelMap lb)
+ Swish.GraphMatch: graphMatch1 :: Label lb => Bool -> (lb -> lb -> Bool) -> ArcSet lb -> ArcSet lb -> LabelMap lb -> [(EquivalenceClass lb, EquivalenceClass lb)] -> (Bool, LabelMap lb)
- Swish.GraphMatch: graphMatch2 :: (Label lb) => (lb -> lb -> Bool) -> ArcSet lb -> ArcSet lb -> LabelMap lb -> [(EquivalenceClass lb, EquivalenceClass lb)] -> (Bool, LabelMap lb)
+ Swish.GraphMatch: graphMatch2 :: Label lb => (lb -> lb -> Bool) -> ArcSet lb -> ArcSet lb -> LabelMap lb -> [(EquivalenceClass lb, EquivalenceClass lb)] -> (Bool, LabelMap lb)
- Swish.GraphMatch: makeScopedArc :: (Label lb) => Int -> Arc lb -> Arc (ScopedLabel lb)
+ Swish.GraphMatch: makeScopedArc :: Label lb => Int -> Arc lb -> Arc (ScopedLabel lb)
- Swish.GraphMatch: makeScopedLabel :: (Label lb) => Int -> lb -> ScopedLabel lb
+ Swish.GraphMatch: makeScopedLabel :: Label lb => Int -> lb -> ScopedLabel lb
- Swish.GraphMatch: mapLabelIndex :: (Label lb) => LabelMap lb -> lb -> LabelIndex
+ Swish.GraphMatch: mapLabelIndex :: Label lb => LabelMap lb -> lb -> LabelIndex
- Swish.GraphMatch: newGenerationMap :: (Label lb) => LabelMap lb -> LabelMap lb
+ Swish.GraphMatch: newGenerationMap :: Label lb => LabelMap lb -> LabelMap lb
- Swish.GraphMatch: newLabelMap :: (Label lb) => LabelMap lb -> [(lb, Word32)] -> LabelMap lb
+ Swish.GraphMatch: newLabelMap :: Label lb => LabelMap lb -> [(lb, Word32)] -> LabelMap lb
- Swish.GraphMatch: reclassify :: (Label lb) => ArcSet lb -> ArcSet lb -> LabelMap lb -> [(EquivalenceClass lb, EquivalenceClass lb)] -> (LabelMap lb, [(EquivalenceClass lb, EquivalenceClass lb)], Bool, Bool)
+ Swish.GraphMatch: reclassify :: Label lb => ArcSet lb -> ArcSet lb -> LabelMap lb -> [(EquivalenceClass lb, EquivalenceClass lb)] -> (LabelMap lb, [(EquivalenceClass lb, EquivalenceClass lb)], Bool, Bool)
- Swish.GraphMatch: setLabelHash :: (Label lb) => LabelMap lb -> (lb, Word32) -> LabelMap lb
+ Swish.GraphMatch: setLabelHash :: Label lb => LabelMap lb -> (lb, Word32) -> LabelMap lb
- Swish.GraphMem: addGraphs :: (LDGraph lg lb, (Ord lb)) => lg lb -> lg lb -> lg lb
+ Swish.GraphMem: addGraphs :: (LDGraph lg lb, Ord lb) => lg lb -> lg lb -> lg lb
- Swish.GraphMem: delete :: (LDGraph lg lb, (Ord lb)) => lg lb -> lg lb -> lg lb
+ Swish.GraphMem: delete :: (LDGraph lg lb, Ord lb) => lg lb -> lg lb -> lg lb
- Swish.GraphMem: extract :: (LDGraph lg lb, (Ord lb)) => Selector lb -> lg lb -> lg lb
+ Swish.GraphMem: extract :: (LDGraph lg lb, Ord lb) => Selector lb -> lg lb -> lg lb
- Swish.GraphMem: labels :: (LDGraph lg lb, (Ord lb)) => lg lb -> Set lb
+ Swish.GraphMem: labels :: (LDGraph lg lb, Ord lb) => lg lb -> Set lb
- Swish.GraphMem: matchGraphMem :: (Label lb) => GraphMem lb -> GraphMem lb -> (Bool, LabelMap (ScopedLabel lb))
+ Swish.GraphMem: matchGraphMem :: Label lb => GraphMem lb -> GraphMem lb -> (Bool, LabelMap (ScopedLabel lb))
- Swish.GraphPartition: PartSub :: lb -> (NonEmpty (lb, GraphPartition lb)) -> GraphPartition lb
+ Swish.GraphPartition: PartSub :: lb -> NonEmpty (lb, GraphPartition lb) -> GraphPartition lb
- Swish.GraphPartition: comparePartitions :: (Label lb) => PartitionedGraph lb -> PartitionedGraph lb -> [(Maybe (GraphPartition lb), Maybe (GraphPartition lb))]
+ Swish.GraphPartition: comparePartitions :: Label lb => PartitionedGraph lb -> PartitionedGraph lb -> [(Maybe (GraphPartition lb), Maybe (GraphPartition lb))]
- Swish.GraphPartition: partitionGraph :: (Label lb) => [Arc lb] -> PartitionedGraph lb
+ Swish.GraphPartition: partitionGraph :: Label lb => [Arc lb] -> PartitionedGraph lb
- Swish.GraphPartition: partitionShowP :: (Label lb) => String -> GraphPartition lb -> String
+ Swish.GraphPartition: partitionShowP :: Label lb => String -> GraphPartition lb -> String
- Swish.Proof: showProof :: (ShowLines ex) => String -> Proof ex -> String
+ Swish.Proof: showProof :: ShowLines ex => String -> Proof ex -> String
- Swish.Proof: showsFormula :: (ShowLines ex) => String -> Formula ex -> ShowS
+ Swish.Proof: showsFormula :: ShowLines ex => String -> Formula ex -> ShowS
- Swish.Proof: showsProof :: (ShowLines ex) => String -> Proof ex -> ShowS
+ Swish.Proof: showsProof :: ShowLines ex => String -> Proof ex -> ShowS
- Swish.RDF.Graph: addArc :: (Label lb) => Arc lb -> NSGraph lb -> NSGraph lb
+ Swish.RDF.Graph: addArc :: Label lb => Arc lb -> NSGraph lb -> NSGraph lb
- Swish.RDF.Graph: addGraphs :: (LDGraph lg lb, (Ord lb)) => lg lb -> lg lb -> lg lb
+ Swish.RDF.Graph: addGraphs :: (LDGraph lg lb, Ord lb) => lg lb -> lg lb -> lg lb
- Swish.RDF.Graph: allLabels :: (Label lb) => (lb -> Bool) -> NSGraph lb -> Set lb
+ Swish.RDF.Graph: allLabels :: Label lb => (lb -> Bool) -> NSGraph lb -> Set lb
- Swish.RDF.Graph: allNodes :: (Label lb) => (lb -> Bool) -> NSGraph lb -> Set lb
+ Swish.RDF.Graph: allNodes :: Label lb => (lb -> Bool) -> NSGraph lb -> Set lb
- Swish.RDF.Graph: delete :: (LDGraph lg lb, (Ord lb)) => lg lb -> lg lb -> lg lb
+ Swish.RDF.Graph: delete :: (LDGraph lg lb, Ord lb) => lg lb -> lg lb -> lg lb
- Swish.RDF.Graph: extract :: (LDGraph lg lb, (Ord lb)) => Selector lb -> lg lb -> lg lb
+ Swish.RDF.Graph: extract :: (LDGraph lg lb, Ord lb) => Selector lb -> lg lb -> lg lb
- Swish.RDF.Graph: fmapNSGraph :: (Ord lb) => (lb -> lb) -> NSGraph lb -> NSGraph lb
+ Swish.RDF.Graph: fmapNSGraph :: Ord lb => (lb -> lb) -> NSGraph lb -> NSGraph lb
- Swish.RDF.Graph: getFormula :: (Label lb) => NSGraph lb -> lb -> Maybe (NSGraph lb)
+ Swish.RDF.Graph: getFormula :: Label lb => NSGraph lb -> lb -> Maybe (NSGraph lb)
- Swish.RDF.Graph: grEq :: (Label lb) => NSGraph lb -> NSGraph lb -> Bool
+ Swish.RDF.Graph: grEq :: Label lb => NSGraph lb -> NSGraph lb -> Bool
- Swish.RDF.Graph: grMatchMap :: (Label lb) => NSGraph lb -> NSGraph lb -> (Bool, LabelMap (ScopedLabel lb))
+ Swish.RDF.Graph: grMatchMap :: Label lb => NSGraph lb -> NSGraph lb -> (Bool, LabelMap (ScopedLabel lb))
- Swish.RDF.Graph: labels :: (LDGraph lg lb, (Ord lb)) => lg lb -> Set lb
+ Swish.RDF.Graph: labels :: (LDGraph lg lb, Ord lb) => lg lb -> Set lb
- Swish.RDF.Graph: maplist :: (Label lb) => [lb] -> [lb] -> (lb -> lb) -> [(lb, lb)] -> [(lb, lb)]
+ Swish.RDF.Graph: maplist :: Label lb => [lb] -> [lb] -> (lb -> lb) -> [(lb, lb)] -> [(lb, lb)]
- Swish.RDF.Graph: mapnode :: (Label lb) => [lb] -> [lb] -> (lb -> lb) -> lb -> lb
+ Swish.RDF.Graph: mapnode :: Label lb => [lb] -> [lb] -> (lb -> lb) -> lb -> lb
- Swish.RDF.Graph: merge :: (Label lb) => NSGraph lb -> NSGraph lb -> NSGraph lb
+ Swish.RDF.Graph: merge :: Label lb => NSGraph lb -> NSGraph lb -> NSGraph lb
- Swish.RDF.Graph: newNode :: (Label lb) => lb -> [lb] -> lb
+ Swish.RDF.Graph: newNode :: Label lb => lb -> [lb] -> lb
- Swish.RDF.Graph: newNodes :: (Label lb) => lb -> [lb] -> [lb]
+ Swish.RDF.Graph: newNodes :: Label lb => lb -> [lb] -> [lb]
- Swish.RDF.Graph: nodes :: (LDGraph lg lb, (Ord lb)) => lg lb -> Set lb
+ Swish.RDF.Graph: nodes :: (LDGraph lg lb, Ord lb) => lg lb -> Set lb
- Swish.RDF.Graph: remapLabelList :: (Label lb) => [lb] -> [lb] -> [(lb, lb)]
+ Swish.RDF.Graph: remapLabelList :: Label lb => [lb] -> [lb] -> [(lb, lb)]
- Swish.RDF.Graph: remapLabels :: (Label lb) => [lb] -> [lb] -> (lb -> lb) -> NSGraph lb -> NSGraph lb
+ Swish.RDF.Graph: remapLabels :: Label lb => [lb] -> [lb] -> (lb -> lb) -> NSGraph lb -> NSGraph lb
- Swish.RDF.Graph: setFormula :: (Label lb) => Formula lb -> NSGraph lb -> NSGraph lb
+ Swish.RDF.Graph: setFormula :: Label lb => Formula lb -> NSGraph lb -> NSGraph lb
- Swish.RDF.Parser.Utils: ignore :: (Applicative f) => f a -> f ()
+ Swish.RDF.Parser.Utils: ignore :: Applicative f => f a -> f ()
- Swish.Rule: Rule :: ScopedName -> [ex] -> [ex] -> ex -> [[ex]] -> [ex] -> ex -> Bool -> Rule ex
+ Swish.Rule: Rule :: ScopedName -> ([ex] -> [ex]) -> (ex -> [[ex]]) -> ([ex] -> ex -> Bool) -> Rule ex
- Swish.Rule: bwdCheckInference :: (Eq ex) => Rule ex -> [ex] -> ex -> Bool
+ Swish.Rule: bwdCheckInference :: Eq ex => Rule ex -> [ex] -> ex -> Bool
- Swish.Rule: fwdCheckInference :: (Eq ex) => Rule ex -> [ex] -> ex -> Bool
+ Swish.Rule: fwdCheckInference :: Eq ex => Rule ex -> [ex] -> ex -> Bool
- Swish.Rule: showsFormula :: (ShowLines ex) => String -> Formula ex -> ShowS
+ Swish.Rule: showsFormula :: ShowLines ex => String -> Formula ex -> ShowS
- Swish.Rule: showsFormulae :: (ShowLines ex) => String -> [Formula ex] -> String -> ShowS
+ Swish.Rule: showsFormulae :: ShowLines ex => String -> [Formula ex] -> String -> ShowS
- Swish.VarBinding: VarBinding :: a -> Maybe b -> Set (a, b) -> Bool -> VarBinding a b
+ Swish.VarBinding: VarBinding :: (a -> Maybe b) -> Set (a, b) -> Bool -> VarBinding a b
- Swish.VarBinding: VarBindingFilter :: ScopedName -> [a] -> VarBinding a b -> Bool -> VarBindingFilter a b
+ Swish.VarBinding: VarBindingFilter :: ScopedName -> [a] -> (VarBinding a b -> Bool) -> VarBindingFilter a b
- Swish.VarBinding: VarBindingModify :: ScopedName -> [VarBinding a b] -> [VarBinding a b] -> [a] -> [[a]] -> VarBindingModify a b
+ Swish.VarBinding: VarBindingModify :: ScopedName -> ([VarBinding a b] -> [VarBinding a b]) -> [a] -> [[a]] -> VarBindingModify a b
- Swish.VarBinding: composeSequence :: (Eq a) => [VarBindingModify a b] -> Maybe (VarBindingModify a b)
+ Swish.VarBinding: composeSequence :: Eq a => [VarBindingModify a b] -> Maybe (VarBindingModify a b)
- Swish.VarBinding: findComposition :: (Eq a) => [VarBindingModify a b] -> [a] -> Maybe (VarBindingModify a b)
+ Swish.VarBinding: findComposition :: Eq a => [VarBindingModify a b] -> [a] -> Maybe (VarBindingModify a b)
- Swish.VarBinding: findCompositions :: (Eq a) => [VarBindingModify a b] -> [a] -> [VarBindingModify a b]
+ Swish.VarBinding: findCompositions :: Eq a => [VarBindingModify a b] -> [a] -> [VarBindingModify a b]
- Swish.VarBinding: varFilterConjunction :: (Eq a) => [VarBindingFilter a b] -> VarBindingFilter a b
+ Swish.VarBinding: varFilterConjunction :: Eq a => [VarBindingFilter a b] -> VarBindingFilter a b
- Swish.VarBinding: varFilterDisjunction :: (Eq a) => [VarBindingFilter a b] -> VarBindingFilter a b
+ Swish.VarBinding: varFilterDisjunction :: Eq a => [VarBindingFilter a b] -> VarBindingFilter a b
- Swish.VarBinding: varFilterEQ :: (Eq b) => a -> a -> VarBindingFilter a b
+ Swish.VarBinding: varFilterEQ :: Eq b => a -> a -> VarBindingFilter a b
- Swish.VarBinding: varFilterNE :: (Eq b) => a -> a -> VarBindingFilter a b
+ Swish.VarBinding: varFilterNE :: Eq b => a -> a -> VarBindingFilter a b
- Swish.VarBinding: vbmCompatibility :: (Eq a) => VarBindingModify a b -> [a] -> Maybe [a]
+ Swish.VarBinding: vbmCompatibility :: Eq a => VarBindingModify a b -> [a] -> Maybe [a]
- Swish.VarBinding: vbmCompose :: (Eq a) => VarBindingModify a b -> VarBindingModify a b -> Maybe (VarBindingModify a b)
+ Swish.VarBinding: vbmCompose :: Eq a => VarBindingModify a b -> VarBindingModify a b -> Maybe (VarBindingModify a b)
Files
- CHANGELOG +4/−0
- stack.yaml +1/−1
- swish.cabal +2/−2
CHANGELOG view
@@ -1,3 +1,7 @@+0.10.0.1:++ Bump to support polyparse and its GHC 8.6 compatibility.+ 0.10.0.0: Updated packages to support building with ghc 8.6 (increase base
stack.yaml view
@@ -1,4 +1,4 @@ flags: {} packages: - '.'-resolver: lts-12.2+resolver: nightly-2018-11-02
swish.cabal view
@@ -1,5 +1,5 @@ Name: swish-Version: 0.10.0.0+Version: 0.10.0.1 Stability: experimental License: LGPL-2.1 License-file: LICENSE @@ -100,7 +100,7 @@ mtl >= 2 && < 3, -- old-locale is only needed if time < 1.5 old-locale == 1.0.*, - polyparse >= 1.6 && <= 1.12,+ polyparse >= 1.6 && <= 1.13, text >= 0.11 && < 1.3, -- I don't think 1.9.0 will work and it was quickly replaced -- so do not support it