Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use xmlbf for XML parsing #67

Merged
merged 44 commits into from
Jun 3, 2019
Merged
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
1a3b60e
Hlint cleanups
jrp2014 Jan 23, 2019
287b017
replace some data with newtype
jrp2014 Jan 23, 2019
4fd2edf
Merge pull request #63 from jrp2014/master
robstewart57 Jan 23, 2019
6dc6379
Add support for Algebraic Graphs. Fix #59
wismill May 22, 2019
79aa1f4
hlint
wismill May 22, 2019
c8f61f8
Replace `++` with `<>`
wismill May 22, 2019
a19f164
hlint fmap
wismill May 22, 2019
cd46e94
Fix algebraic-graphs version's bound
wismill May 22, 2019
8ab7a1d
Travis: add lts-13 and drop lts-7
wismill May 22, 2019
b447e4b
Fix issue with Haddock
wismill May 22, 2019
fbf8431
Fix issue with Haddock
wismill May 22, 2019
d32650a
Fix tests when path contains characters that must be escaped.
wismill May 23, 2019
bf7112c
Fix Xeno
wismill May 23, 2019
51a013d
Tidying
wismill May 23, 2019
721a1ff
Make `pPredicateObject` easier to read
wismill May 23, 2019
896e21e
Merge pull request #66 from wismill/wip/hlint
robstewart57 May 23, 2019
56553dd
Merge remote-tracking branch 'origin/master' into wip/Alga
wismill May 23, 2019
fcc08fb
Merge pull request #65 from wismill/wip/Alga
robstewart57 May 23, 2019
b30c7a3
Merge remote-tracking branch 'origin/master' into wip/xmlbf
wismill May 23, 2019
4d312a6
Tidying
wismill May 24, 2019
8fccd87
Use a monad transformer to manage the state
wismill May 24, 2019
acefeea
Improvements
wismill May 24, 2019
d44b348
Move some definitions to ParserUtils
wismill May 25, 2019
7d318d3
Improvements
wismill May 25, 2019
bce4300
Improvements
wismill May 25, 2019
d3f3c73
Collection
wismill May 25, 2019
a348010
Fix typo in XML
wismill May 27, 2019
aa23978
Improvements
wismill May 27, 2019
84af8a9
Fix doc uri
wismill May 27, 2019
eb2159f
Improvements
wismill May 28, 2019
7af4f69
Add Semigroup and Monoid instances to PrefixMappings
wismill May 28, 2019
137d0fe
Improvements
wismill May 28, 2019
93a39c2
Improvements
wismill May 30, 2019
c04d8e4
Update W3C repository
wismill May 30, 2019
f6664cd
Update stack to use the proper version of Xmlbf.
wismill May 30, 2019
d5ab655
Some more cleaning
wismill May 30, 2019
1f8bdb8
Fix test suite for Turtle
wismill May 30, 2019
b22f89c
Fix test-00.ttl
wismill May 30, 2019
4052d1a
Update latest changes of Xmlbf
wismill May 31, 2019
f1a04e9
Improve the Cabal file
wismill Jun 1, 2019
1ad58fc
Documentation
wismill Jun 3, 2019
3ed61db
Add benchmark for XML parsers
wismill Jun 3, 2019
6485b27
Update stack.yaml to the latest commit of the official repo
wismill Jun 3, 2019
8bf9f1f
Documentation
wismill Jun 3, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve the Cabal file
wismill committed Jun 1, 2019
commit f1a04e92e271b353188b431e72be3f51636b4d21
50 changes: 39 additions & 11 deletions rdf4h.cabal
Original file line number Diff line number Diff line change
@@ -19,12 +19,25 @@ cabal-version: >= 1.8
build-type: Simple
category: RDF
stability: Experimental
tested-with: GHC==7.10.2, GHC==8.0.2
tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.8.2, GHC==8.4.3, GHC==8.6.5
extra-tmp-files: test
extra-source-files: examples/ParseURLs.hs
, examples/ESWC.hs


source-repository head
type: git
location: https://github.com/robstewart57/rdf4h.git


flag dev
description: Developer build
manual: True
default: False


library
hs-source-dirs: src
exposed-modules: Data.RDF
, Data.RDF.IRI
, Data.RDF.Namespace
@@ -68,8 +81,12 @@ library
if !impl(ghc >= 8.0)
build-depends: semigroups == 0.18.*

hs-source-dirs: src
ghc-options: -Wall -funbox-strict-fields
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
if flag(dev)
ghc-options: -O0
else
ghc-options: -O2 -funbox-strict-fields


executable rdf4h
main-is: src/Rdf4hParseMain.hs
@@ -81,21 +98,27 @@ executable rdf4h
if impl(ghc < 7.6)
build-depends: ghc-prim

ghc-options: -Wall -funbox-strict-fields
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
if flag(dev)
ghc-options: -O0
else
ghc-options: -O2 -funbox-strict-fields


test-suite test-rdf4h
type: exitcode-stdio-1.0
main-is: Test.hs
hs-source-dirs: testsuite/tests
other-modules: Data.RDF.PropertyTests
Data.RDF.GraphImplTests
Data.RDF.IRITests
Text.RDF.RDF4H.TurtleParser_ConformanceTest
Text.RDF.RDF4H.XmlParser_Test
W3C.Manifest
W3C.NTripleTest
W3C.TurtleTest
W3C.RdfXmlTest
W3C.W3CAssertions
ghc-options: -Wall -fno-warn-orphans -funbox-strict-fields
build-depends: base >= 4.8.0.0 && < 6
, rdf4h
, tasty
@@ -114,8 +137,12 @@ test-suite test-rdf4h
if !impl(ghc >= 8.0)
build-depends: semigroups == 0.18.*

other-modules: W3C.TurtleTest
hs-source-dirs: testsuite/tests
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
if flag(dev)
ghc-options: -O0
else
ghc-options: -O2 -funbox-strict-fields


benchmark rdf4h-bench
type: exitcode-stdio-1.0
@@ -126,11 +153,12 @@ benchmark rdf4h-bench
criterion,
rdf4h,
text >= 1.2.1.0
ghc-options: -Wall

if !impl(ghc >= 8.0)
build-depends: semigroups == 0.18.*

source-repository head
type: git
location: https://github.com/robstewart57/rdf4h.git
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints
if flag(dev)
ghc-options: -O0
else
ghc-options: -O2 -funbox-strict-fields