various refactoring; GHC 9.4 support

.github/workflows/haskell.yml

@@ -13,9 +13,9 @@ jobs:
     strategy:
       matrix:
         cabal: ["3.6"]
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.3"]
+        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.3", "9.4.2"]
     env:
-      CONFIG: "--enable-tests --enable-benchmarks"
+      CONFIG: "--enable-tests --enable-benchmarks --flags llvm"
     steps:
       - uses: actions/checkout@v2.3.4
       - uses: actions/cache@v2

bench/Bench.hs

@@ -10,7 +10,7 @@ import qualified Data.ByteString.Char8 as B
 import qualified Attoparsec
 import qualified Megaparsec
 import qualified Parsec
-import qualified FPStateful
+--import qualified FPStateful
 import qualified FPBasic
 import qualified ReadInteger
 
@@ -31,23 +31,23 @@ main :: IO ()
 main = defaultMain [
   bgroup "sexp" [
     bench "fpbasic"     $ whnf FPBasic.runSexp    sexpInp,
-    bench "fpstateful"  $ whnf FPStateful.runSexp sexpInp,
+    --bench "fpstateful"  $ whnf FPStateful.runSexp sexpInp,
     bench "attoparsec"  $ whnf Attoparsec.runSexp sexpInp,
     bench "megaparsec"  $ whnf Megaparsec.runSexp sexpInp,
     bench "parsec"      $ whnf Parsec.runSexp     sexpInp
   ],
 
   bgroup "long keyword" [
     bench "fpbasic"    $ whnf FPBasic.runLongws    longwsInp,
-    bench "fpstateful" $ whnf FPStateful.runLongws longwsInp,
+    --bench "fpstateful" $ whnf FPStateful.runLongws longwsInp,
     bench "attoparsec" $ whnf Attoparsec.runLongws longwsInp,
     bench "megaparsec" $ whnf Megaparsec.runLongws longwsInp,
     bench "parsec"     $ whnf Parsec.runLongws     longwsInp
   ],
 
   bgroup "numeral csv" [
     bench "fpbasic"    $ whnf FPBasic.runNumcsv    numcsvInp,
-    bench "fpstateful" $ whnf FPStateful.runNumcsv numcsvInp,
+    --bench "fpstateful" $ whnf FPStateful.runNumcsv numcsvInp,
     bench "attoparsec" $ whnf Attoparsec.runNumcsv numcsvInp,
     bench "megaparsec" $ whnf Megaparsec.runNumcsv numcsvInp,
     bench "parsec"     $ whnf Parsec.runNumcsv     numcsvInp

bench/FPBasic.hs

@@ -7,18 +7,18 @@ module FPBasic (
 import FlatParse.Basic
 
 ws      = many_ $(switch [| case _ of " " -> pure (); "\n" -> pure () |])
-open    = $(char '(') >> ws
-close   = $(char ')') >> ws
+open    = $(getCharOf '(') >> ws
+close   = $(getCharOf ')') >> ws
 ident   = some_ (satisfyASCII_ isLatinLetter) >> ws
 sexp    = branch open (some_ sexp >> close) ident
 src     = sexp >> eof
 runSexp = runParser src
 
-longw     = $(string "thisisalongkeyword")
+longw     = $(getStringOf "thisisalongkeyword")
 longws    = some_ (longw >> ws) >> eof
 runLongws = runParser longws
 
 numeral   = some_ (satisfyASCII_ isDigit) >> ws
-comma     = $(char ',') >> ws
+comma     = $(getCharOf ',') >> ws
 numcsv    = numeral >> many_ (comma >> numeral) >> eof
 runNumcsv = runParser numcsv

bench/FPStateful.hs

@@ -1,4 +1,4 @@
-
+{-
 module FPStateful (
     runSexp
   , runLongws
@@ -25,3 +25,6 @@ numeral   = some_ (satisfyASCII_ isDigit) >> ws
 comma     = $(char ',') >> ws
 numcsv    = numeral >> many_ (comma >> numeral) >> eof
 runNumcsv = runParser numcsv () 0
+-}
+
+module FPStateful where

bench/ReadInteger.hs

@@ -3,5 +3,5 @@ module ReadInteger where
 
 import FlatParse.Basic as FPBasic
 
-readInt     = runParser FPBasic.readInt
-readInteger = runParser FPBasic.readInteger
+readInt     = runParser FPBasic.getAsciiDecimalInt
+readInteger = runParser FPBasic.getAsciiDecimalInteger

flatparse.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -44,11 +44,21 @@ flag llvm
 library
   exposed-modules:
       FlatParse.Basic
+      FlatParse.Basic.Addr
+      FlatParse.Basic.Base
+      FlatParse.Basic.Integers
+      FlatParse.Basic.Integers.Varints
+      FlatParse.Basic.Other
+      FlatParse.Basic.Parser
+      FlatParse.Basic.Position
+      FlatParse.Basic.Strings
+      FlatParse.BasicString
+      FlatParse.Common.Assorted
+      FlatParse.Common.Numbers
+      FlatParse.Common.Position
+      FlatParse.Common.Trie
       FlatParse.Examples.BasicLambda.Lexer
       FlatParse.Examples.BasicLambda.Parser
-      FlatParse.Internal
-      FlatParse.Internal.UnboxedNumerics
-      FlatParse.Stateful
   other-modules:
       Paths_flatparse
   hs-source-dirs:
@@ -71,11 +81,11 @@ library
     , containers
     , integer-gmp
     , template-haskell
+  default-language: Haskell2010
   if flag(dump)
     ghc-options: -ddump-simpl -ddump-stg-final -ddump-cmm -dsuppress-all -dno-suppress-type-signatures -ddump-to-file
   if flag(llvm)
     ghc-options: -fllvm
-  default-language: Haskell2010
 
 test-suite spec
   type: exitcode-stdio-1.0
@@ -105,11 +115,11 @@ test-suite spec
     , flatparse
     , hspec
     , quickcheck-instances
+  default-language: Haskell2010
   if flag(dump)
     ghc-options: -ddump-simpl -ddump-stg-final -ddump-cmm -dsuppress-all -dno-suppress-type-signatures -ddump-to-file
   if flag(llvm)
     ghc-options: -fllvm
-  default-language: Haskell2010
 
 benchmark bench
   type: exitcode-stdio-1.0
@@ -146,8 +156,8 @@ benchmark bench
     , megaparsec
     , parsec
     , primitive
+  default-language: Haskell2010
   if flag(dump)
     ghc-options: -ddump-simpl -ddump-stg-final -ddump-cmm -dsuppress-all -dno-suppress-type-signatures -ddump-to-file
   if flag(llvm)
     ghc-options: -fllvm
-  default-language: Haskell2010