rospkg 0.2.2.1 → 0.2.3.0

raw patch · 3 files changed

+20/−5 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• LICENSE +1/−1
• rospkg.cabal +6/−2
• src/Robotics/ROS/Pkg/Parser.hs +13/−2

@@ -13,7 +13,7 @@       disclaimer in the documentation and/or other materials provided       with the distribution. -    * Neither the name of Author name here nor the names of other+    * Neither the name of Alexander Krupenkin here nor the names of other       contributors may be used to endorse or promote products derived       from this software without specific prior written permission. 

@@ -1,5 +1,5 @@ name:                rospkg-version:             0.2.2.1+version:             0.2.3.0 synopsis:            ROS package system information  description:         Please see README.md homepage:            https://github.com/RoboticsHS/rospkg#readme@@ -31,13 +31,17 @@                      , filepath     >= 1.4  && < 2                      , directory    >= 1.2  && < 2                      , bytestring   >= 0.10 && < 1-                     , fast-tagsoup >= 1.0  && < 2   other-modules:       Robotics.ROS.Pkg.Finder                      , Robotics.ROS.Pkg.Types                      , Robotics.ROS.Pkg.Msgs   default-language:    Haskell2010   ghc-options:         -Wall   default-extensions:  OverloadedStrings++  if !os(windows)+    -- Using fast-tagsoup (avg 200% speedup)+    build-depends:     fast-tagsoup >= 1.0  && < 2+    cpp-options:       -DFAST_PARSER  test-suite rospkg-test   type:                exitcode-stdio-1.0

@@ -11,17 +11,28 @@ -- It used for parsing @package.xml@ file with common -- ROS package information. --+{-# LANGUAGE CPP #-} module Robotics.ROS.Pkg.Parser (parse) where +import Text.StringLike (StringLike, toString) import Data.ByteString as BS (readFile) import System.Directory (doesFileExist) import System.FilePath (takeDirectory)-import Text.HTML.TagSoup.Fast import Text.HTML.TagSoup import Data.Text (Text)-import Text.StringLike  import Robotics.ROS.Pkg.Types++#ifdef FAST_PARSER+import Text.HTML.TagSoup.Fast+#else+import Data.Text.Encoding (decodeUtf8)+import Data.ByteString (ByteString)++-- | Parse with default UTF8 encoding+parseTagsT :: ByteString -> [Tag Text]+parseTagsT = fmap (fmap decodeUtf8) . parseTags+#endif  -- | Parse package.xml file parse :: FilePath -> IO (Either String Package)