Add Finite and change run.sh to use 'tail -r'

haskell/BufwiseFiniteBS/BufwiseFiniteBS.hs

@@ -12,14 +12,14 @@ import System.IO (stdin)
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as C
 
-
+-- counton
 import qualified Finite as H
 
 
 main :: IO ()
 main = do
-  t <- H.new 128000
-  let incr = H.count t
+  t <- H.new 48017 100003
+  let incr = H.countOn H.ascii t
   flip fix B.empty $ \rec b -> do
     bs <- B.hGet stdin (64 * 1024)
     if B.null bs

haskell/countwordsHS.cabal

@@ -24,7 +24,6 @@ source-repository head
 library
   exposed-modules:
       Data.FastChar
-      Finite
   other-modules:
       Paths_countwordsHS
   hs-source-dirs:
@@ -34,6 +33,7 @@ library
     , bytestring
     , clutter
     , containers
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -59,6 +59,7 @@ executable BufwiseClutter
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -84,6 +85,7 @@ executable BufwiseFiniteBS
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -108,6 +110,7 @@ executable BufwiseVHBS
     , bytestring
     , clutter
     , containers
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -133,6 +136,7 @@ executable LazyHMBS
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -158,6 +162,7 @@ executable LazyHMRef
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -183,6 +188,7 @@ executable LazyMap
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -208,6 +214,7 @@ executable LazyVH
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -233,6 +240,7 @@ executable LinewiseClutter
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -258,6 +266,7 @@ executable LinewiseVH
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -282,6 +291,7 @@ executable StreamingHMBS
     , bytestring
     , clutter
     , containers
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -307,6 +317,7 @@ executable StreamlyHMRef
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -332,6 +343,7 @@ executable StreamlyThreadedHMRef
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive
@@ -357,6 +369,7 @@ executable StreamlyVH
     , clutter
     , containers
     , countwordsHS
+    , finite
     , fusion-plugin
     , hashable
     , primitive

haskell/package.yaml

@@ -32,6 +32,7 @@ dependencies:
 - streaming
 - streaming-bytestring
 - clutter
+- finite
 - hashable
 
 library:

haskell/run.sh

@@ -4,7 +4,7 @@ stack build || exit 1
 
 normalize () {
     # tac on a sponge at the end to avoid BrokenPipeError from diff's short-circuiting
-    grep -v '^ ' | python3 ../normalize.py | tac | tac
+    grep -v '^ ' | python3 ../normalize.py  | tail -r | tail -r
 }
 
 stack --bash-completion-index 2 --bash-completion-word stack --bash-completion-word build --bash-completion-word countwordsHS:exe: \

haskell/stack.yaml

@@ -1,5 +1,3 @@
-# This file was automatically generated by 'stack init'
-#
 # Some commonly used options have been documented as comments in this file.
 # For advanced use and comprehensive documentation of the format, please see:
 # https://docs.haskellstack.org/en/stable/yaml_configuration/
@@ -47,6 +45,8 @@ extra-deps:
 - vector-hashtables-0.1.1.1@sha256:cb4ba4af6b83b6956278bbfe8d0f779a40928728e82977e566c0103fe8d6c867,2725
 - git: https://github.com/noughtmare/clutter.git
   commit: a8364c0adf377501a2b012336db57edae380c49f
+- git: https://github.com/kalhauge/finite.git
+  commit: 15e33d411fd7ae9ba12a9971fe2ab5528a1d2036
 - compact-0.2.0.0@sha256:75ef98cb51201b4a0d6de95cbbb62be6237c092a3d594737346c70c5d56c2380,2413
 - git: https://github.com/haskell/text.git
   commit: 8ae2888a340911e088ad9507f22464dc383c944b