hylolib 1.5.0 → 1.5.1
raw patch · 4 files changed
+30/−39 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- dist/build/HyLo/InputFile/Lexer.hs +13/−17
- dist/build/HyLo/InputFile/OldLexer.hs +13/−17
- hylolib.cabal +2/−3
- src/HyLo/Model/PrettyPrint.hs +2/−2
dist/build/HyLo/InputFile/Lexer.hs view
@@ -83,7 +83,6 @@ - {-# LINE 9 "<command-line>" #-} {-# LINE 1 "/usr/lib/ghc/include/ghcversion.h" #-} @@ -111,13 +110,11 @@ -- This code is in the PUBLIC DOMAIN; you may copy it freely and use -- it for any purpose whatsoever. -----+import Control.Applicative (Applicative (..))+import qualified Control.Monad (ap) import Data.Word (Word8)-{-# LINE 28 "templates/wrappers.hs" #-}+import Data.Int (Int64)+{-# LINE 25 "templates/wrappers.hs" #-} import Data.Char (ord) import qualified Data.Bits@@ -170,11 +167,11 @@ in p' `seq` Just (b, (p', c, bs, s)) -{-# LINE 101 "templates/wrappers.hs" #-}+{-# LINE 98 "templates/wrappers.hs" #-} -{-# LINE 119 "templates/wrappers.hs" #-}+{-# LINE 116 "templates/wrappers.hs" #-} -{-# LINE 137 "templates/wrappers.hs" #-}+{-# LINE 134 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Token positions@@ -202,27 +199,27 @@ -- ----------------------------------------------------------------------------- -- Default monad -{-# LINE 271 "templates/wrappers.hs" #-}+{-# LINE 268 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Monad (with ByteString input) -{-# LINE 374 "templates/wrappers.hs" #-}+{-# LINE 371 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Basic wrapper -{-# LINE 401 "templates/wrappers.hs" #-}+{-# LINE 398 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Basic wrapper, ByteString version -{-# LINE 421 "templates/wrappers.hs" #-}+{-# LINE 418 "templates/wrappers.hs" #-} -{-# LINE 437 "templates/wrappers.hs" #-}+{-# LINE 434 "templates/wrappers.hs" #-} -- -----------------------------------------------------------------------------@@ -245,7 +242,7 @@ -- ----------------------------------------------------------------------------- -- Posn wrapper, ByteString version -{-# LINE 470 "templates/wrappers.hs" #-}+{-# LINE 467 "templates/wrappers.hs" #-} -- -----------------------------------------------------------------------------@@ -399,7 +396,6 @@ # 1 "/usr/include/stdc-predef.h" 1 3 4 # 17 "/usr/include/stdc-predef.h" 3 4-
dist/build/HyLo/InputFile/OldLexer.hs view
@@ -80,7 +80,6 @@ - {-# LINE 9 "<command-line>" #-} {-# LINE 1 "/usr/lib/ghc/include/ghcversion.h" #-} @@ -108,13 +107,11 @@ -- This code is in the PUBLIC DOMAIN; you may copy it freely and use -- it for any purpose whatsoever. -----+import Control.Applicative (Applicative (..))+import qualified Control.Monad (ap) import Data.Word (Word8)-{-# LINE 28 "templates/wrappers.hs" #-}+import Data.Int (Int64)+{-# LINE 25 "templates/wrappers.hs" #-} import Data.Char (ord) import qualified Data.Bits@@ -167,11 +164,11 @@ in p' `seq` Just (b, (p', c, bs, s)) -{-# LINE 101 "templates/wrappers.hs" #-}+{-# LINE 98 "templates/wrappers.hs" #-} -{-# LINE 119 "templates/wrappers.hs" #-}+{-# LINE 116 "templates/wrappers.hs" #-} -{-# LINE 137 "templates/wrappers.hs" #-}+{-# LINE 134 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Token positions@@ -199,27 +196,27 @@ -- ----------------------------------------------------------------------------- -- Default monad -{-# LINE 271 "templates/wrappers.hs" #-}+{-# LINE 268 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Monad (with ByteString input) -{-# LINE 374 "templates/wrappers.hs" #-}+{-# LINE 371 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Basic wrapper -{-# LINE 401 "templates/wrappers.hs" #-}+{-# LINE 398 "templates/wrappers.hs" #-} -- ----------------------------------------------------------------------------- -- Basic wrapper, ByteString version -{-# LINE 421 "templates/wrappers.hs" #-}+{-# LINE 418 "templates/wrappers.hs" #-} -{-# LINE 437 "templates/wrappers.hs" #-}+{-# LINE 434 "templates/wrappers.hs" #-} -- -----------------------------------------------------------------------------@@ -242,7 +239,7 @@ -- ----------------------------------------------------------------------------- -- Posn wrapper, ByteString version -{-# LINE 470 "templates/wrappers.hs" #-}+{-# LINE 467 "templates/wrappers.hs" #-} -- -----------------------------------------------------------------------------@@ -339,7 +336,6 @@ # 1 "/usr/include/stdc-predef.h" 1 3 4 # 17 "/usr/include/stdc-predef.h" 3 4-
hylolib.cabal view
@@ -1,10 +1,10 @@ Name: hylolib-Version: 1.5.0+Version: 1.5.1 Synopsis: Tools for hybrid logics related programs License: GPL License-file: LICENSE Author: Daniel Gorin-Maintainer: dgorin@dc.uba.ar+Maintainer: guillaumh@gmail.com Build-Type: Simple Cabal-Version: >= 1.22 Category: Theorem Provers@@ -49,4 +49,3 @@ TypeFamilies hs-source-dirs: src ghc-options: -Wall -O2- ghc-prof-options: -auto-all
src/HyLo/Model/PrettyPrint.hs view
@@ -26,8 +26,8 @@ nodeDef w = textSN w <+> (brackets $ text "label = " <> (doubleQuotes $- (braces . hsep . punctuate comma $ map textSN $ namesOf w m) <> text "\\n" <>- (braces . hsep . punctuate comma $ map textSP $ propsOf w m) )) <>+ (hsep . punctuate comma $ map textSN $ namesOf w m) <> text "\\n" <>+ (hsep . punctuate comma $ map textSP $ propsOf w m) )) <> semi relDef w r v = textSN w <+> text "->" <+> textSN v <+> labIfNeeded r <> semi