diff --git a/Language/SQL/SimpleSQL/Dialect.lhs b/Language/SQL/SimpleSQL/Dialect.lhs index 1aabb2f..05ab39f 100644 --- a/Language/SQL/SimpleSQL/Dialect.lhs +++ b/Language/SQL/SimpleSQL/Dialect.lhs @@ -49,7 +49,10 @@ Data types to represent different dialect options > -- In the code, all special syntax which looks identical to regular > -- identifiers or function calls (apart from the name), is treated > -- like a regular identifier or function call. -> +> -- +> -- It's easy to break the parser by removing the wrong words from +> -- the keywords list or adding the wrong words to the other lists. +> > data Dialect = Dialect > { -- | reserved keywords > diKeywords :: [String] diff --git a/changelog b/changelog index f2fcb1c..060028d 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,5 @@ 0.6.0 - checked with ghc 8.8.1 - but because of pretty-show, the - executable doesn't work with this ghc yet + tested with ghc 8.8.1 also change the dialect handling - now a dialect is a bunch of flags plus a keyword list, and custom dialects are now feasible (still incomplete) diff --git a/website/index.asciidoc b/website/index.asciidoc index 9a9866f..28e9733 100644 --- a/website/index.asciidoc +++ b/website/index.asciidoc @@ -391,5 +391,3 @@ request. There is a related tutorial on implementing a SQL parser here: http://jakewheat.github.io/intro_to_parsing/ - - diff --git a/website/make_website.sh b/website/make_website.sh index b550e36..8ede5a1 100755 --- a/website/make_website.sh +++ b/website/make_website.sh @@ -14,15 +14,15 @@ cp website/main.css build cp website/ocean.css build # index -asciidoctor website/index.asciidoc -o - | cabal -v0 exec runhaskell website/AddLinks.lhs > build/index.html +asciidoctor website/index.asciidoc -o - | cabal -v0 v2-exec runhaskell website/AddLinks.lhs > build/index.html -asciidoctor website/supported_sql.asciidoc -o - | cabal -v0 exec runhaskell website/AddLinks.lhs > build/supported_sql.html +asciidoctor website/supported_sql.asciidoc -o - | cabal -v0 v2-exec runhaskell website/AddLinks.lhs > build/supported_sql.html # tpch sql file # pandoc src/tpch.sql -s --highlight-style kate -o tpch.sql.html # rendered test cases # build the parserexe target first to fix the package database -cabal -v0 exec runhaskell -- --ghc-arg=-package=pretty-show -itools website/RenderTestCases.lhs > build/test_cases.asciidoc +cabal -v0 v2-exec runhaskell -- --ghc-arg=-package=pretty-show -itools website/RenderTestCases.lhs > build/test_cases.asciidoc asciidoctor build/test_cases.asciidoc -o - | \ sed -e "s/max-width:62\.5em//g" \ @@ -34,7 +34,7 @@ asciidoctor build/test_cases.asciidoc -o - | \ rm build/test_cases.asciidoc # haddock -cabal v2-haddock +cabal v2-haddock --haddock-option="--hyperlinked-source" rm -Rf build/haddock mkdir build/haddock/