sifflet-lib 1.1 → 1.2

raw patch · 3 files changed

+15/−15 lines, 3 filesdep ~hxtPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hxt

API changes (from Hackage documentation)

Files

• Sifflet/Language/SiffML.hs +5/−4
• Sifflet/UI/Window.hs +5/−6
• sifflet-lib.cabal +5/−5

@@ -15,7 +15,8 @@  where -import Text.XML.HXT.Arrow+-- import Text.XML.HXT.Arrow+import Text.XML.HXT.Core  import Data.Number.Sifflet import Sifflet.Language.Expr@@ -30,8 +31,8 @@ -- | An XMLConsumer consumes XML type XMLConsumer a b = IOSLA (XIOState ()) a b -defaultOptions :: [(String, String)]-defaultOptions = [(a_indent, v_yes), (a_validate, v_no)]+defaultOptions :: SysConfigList+defaultOptions = [withIndent yes, withValidate no ]  produceSiffMLFile :: (ToXml a) => a -> FilePath -> IO () produceSiffMLFile src path = @@ -414,7 +415,7 @@   {     produceSiffMLFile src "test.xml"   ; results <- runX (readDocument -                     (defaultOptions ++ [(a_trace, show traceLevel)])+                    (defaultOptions ++ [withTrace traceLevel])                      "test.xml" >>>                      isElem >>> -- document root                      getChildren >>>

@@ -56,6 +56,10 @@  import Sifflet.Util ++import Data.Version+import Paths_sifflet_lib as Paths+ -- --------------------------------------------------------------------- -- | Finding, creating, and initializing windows (VPUIWindow) @@ -647,7 +651,7 @@ -- | Text for the About dialog aboutText :: String aboutText =-    unlines ["Sifflet version " ++ siffletVersionString,+    unlines ["Sifflet version " ++ showVersion Paths.version,              "Copyright (C) 2010 Gregory D. Weber",              "",              "BSD3 License",@@ -656,11 +660,6 @@              "http://mypage.iu.edu/~gdweber/software/sifflet/"             ] --- | The software version number.--- See ACTION: RELEASE CHECKLIST for a list of--- places where this version number needs to be synchronized.-siffletVersionString :: String-siffletVersionString = "1.0"  showAboutDialog :: MenuItemAction showAboutDialog vpui = showInfoMessage "About Sifflet" aboutText >> return vpui

@@ -1,6 +1,6 @@ name: sifflet-lib-version: 1.1-cabal-version: >= 1.6+version: 1.2+cabal-version: >= 1.8 build-type: Simple license: BSD3 license-file: LICENSE@@ -42,7 +42,7 @@     filepath >= 1.1 && < 1.2,     fgl >= 5.4 && < 5.5,     haskell98 >= 1.0.1 && < 1.0.2,-    hxt >= 8.3 && < 8.6,+    hxt >= 9.0 && < 9.1,     mtl >= 1.1 && < 1.2,     parsec >= 2.1.0.1 && < 2.3,      process >= 1.0 && < 1.1@@ -51,8 +51,8 @@   buildable: True   extensions: ForeignFunctionInterface CPP   ghc-options: -Wall-  includes: gtk-2.0/gtk/gtk.h, gtk-2.0/gdk/gdk.h-  extra-libraries: gdk-x11-2.0 gtk-x11-2.0+--  includes: gtk-2.0/gtk/gtk.h, gtk-2.0/gdk/gdk.h+--  extra-libraries: gdk-x11-2.0 gtk-x11-2.0   exposed-modules:        Data.Number.Sifflet     , Sifflet.Data.Geometry