Removed nullBuilder agument (obsoleted by Rank2.fmap).

author: Joe Crayne <joe@jerkface.net> 2019-06-14 20:45:38 -0400
committer: Joe Crayne <joe@jerkface.net> 2019-06-14 20:45:38 -0400
commit: f3d1dd211b47d784b562a2251c5cd090ef06f8e9 (patch)
tree: 007a39b8ec1bb309c40dca5501b2ab206204839e
parent: 98aa7d7177aaf46171b095bbb28e2f1e868323c5 (diff)
3 files changed, 49 insertions, 49 deletions
diff --git a/src/Wavefront.hs b/src/Wavefront.hs
index 1fc8ec3..0da9f41 100644
--- a/src/Wavefront.hs
+++ b/src/Wavefront.hs
@@ -79,7 +79,7 @@ modifyFirst :: MonadState (c, d) m => (c -> c) -> m ()
 modifyFirst = modify' . first
 buildOBJ :: ObjBuilder (State (OBJ DList,Element ()))
-buildOBJ = (nullBuilder $ pure ())
+buildOBJ = nullBuilder
    { vertex = \xs -> modifyFirst $ \o -> o { objLocations = objLocations o `DList.snoc` mkv xs }
    , vertexT = \xs -> modifyFirst $ \o -> o { objTexCoords = objTexCoords o `DList.snoc` mkt xs }
    , vertexN = \xs -> modifyFirst $ \o -> o { objNormals = objNormals o `DList.snoc` mkn xs }
diff --git a/src/Wavefront/Lex.hs b/src/Wavefront/Lex.hs
index 78c6f1d..05a6595 100644
--- a/src/Wavefront/Lex.hs
+++ b/src/Wavefront/Lex.hs
@@ -110,53 +110,53 @@ instance Rank2.Functor ObjBuilder where
        }
-nullBuilder :: Applicative m => m () -> ObjBuilder m
+nullBuilder :: Applicative m => ObjBuilder m
-nullBuilder def = ObjBuilder
+nullBuilder = ObjBuilder
-    { vertex           = \vs             -> def
+    { vertex           = \vs             -> pure ()
-    , vertexT          = \vs             -> def
+    , vertexT          = \vs             -> pure ()
-    , vertexN          = \vs             -> def
+    , vertexN          = \vs             -> pure ()
-    , vertexP          = \vs             -> def
+    , vertexP          = \vs             -> pure ()
-    , face             = \is             -> def
+    , face             = \is             -> pure ()
-    , line             = \is             -> def
+    , line             = \is             -> pure ()
-    , cstype           = \isRat typ      -> def
+    , cstype           = \isRat typ      -> pure ()
-    , curv2            = \is             -> def
+    , curv2            = \is             -> pure ()
-    , curv             = \u0 v0 is       -> def
+    , curv             = \u0 v0 is       -> pure ()
-    , parm             = \uv is          -> def
+    , parm             = \uv is          -> pure ()
-    , specialPoints    = \is             -> def
+    , specialPoints    = \is             -> pure ()
-    , endFreeForm      =                    def
+    , endFreeForm      =                    pure ()
-    , ctech            = \approx         -> def
+    , ctech            = \approx         -> pure ()
-    , stech            = \approx         -> def
+    , stech            = \approx         -> pure ()
-    , deg              = \is             -> def
+    , deg              = \is             -> pure ()
-    , surf             = \u0 u1 v0 v1 ts -> def
+    , surf             = \u0 u1 v0 v1 ts -> pure ()
-    , trim             = \ss             -> def
+    , trim             = \ss             -> pure ()
-    , hole             = \ss             -> def
+    , hole             = \ss             -> pure ()
-    , specialCurves    = \ss             -> def
+    , specialCurves    = \ss             -> pure ()
-    , equivalentCurves = \ccs            -> def
+    , equivalentCurves = \ccs            -> pure ()
-    , groups           = \gs             -> def
+    , groups           = \gs             -> pure ()
-    , smoothingGroup   = \sg             -> def
+    , smoothingGroup   = \sg             -> pure ()
-    , mergingGroup     = \mg δ           -> def
+    , mergingGroup     = \mg δ           -> pure ()
-    , usemtl           = \mtl            -> def
+    , usemtl           = \mtl            -> pure ()
-    , deprecated_cdc   = \is             -> def
+    , deprecated_cdc   = \is             -> pure ()
-    , deprecated_cdp   = \is             -> def
+    , deprecated_cdp   = \is             -> pure ()
-    , deprecated_bzp   = \is             -> def
+    , deprecated_bzp   = \is             -> pure ()
-    , deprecated_bsp   = \is             -> def
+    , deprecated_bsp   = \is             -> pure ()
-    , mtllib           = \fns            -> def
+    , mtllib           = \fns            -> pure ()
-    , objectName       = \obn            -> def
+    , objectName       = \obn            -> pure ()
-    , bmat             = \uv fs          -> def
+    , bmat             = \uv fs          -> pure ()
-    , step             = \is             -> def
+    , step             = \is             -> pure ()
-    , points           = \is             -> def
+    , points           = \is             -> pure ()
-    , usemap           = \map            -> def
+    , usemap           = \map            -> pure ()
-    , maplib           = \fns            -> def
+    , maplib           = \fns            -> pure ()
-    , c_interp         = \b              -> def
+    , c_interp         = \b              -> pure ()
-    , d_interp         = \b              -> def
+    , d_interp         = \b              -> pure ()
-    , trace_obj        = \obj            -> def
+    , trace_obj        = \obj            -> pure ()
-    , shadow_obj       = \obj            -> def
+    , shadow_obj       = \obj            -> pure ()
-    , deprecated_res   = \is             -> def
+    , deprecated_res   = \is             -> pure ()
-    , bevel            = \b              -> def
+    , bevel            = \b              -> pure ()
-    , lod              = \lvl            -> def
+    , lod              = \lvl            -> pure ()
-    , call             = \obj args       -> def
+    , call             = \obj args       -> pure ()
-    , command          = \b cmd          -> def *> pure L.empty
+    , command          = \b cmd          -> pure L.empty
-    , badToken         = \bs             -> def
+    , badToken         = \bs             -> pure ()
    }
diff --git a/test/bench.hs b/test/bench.hs
index a8ba239..e610e84 100644
--- a/test/bench.hs
+++ b/test/bench.hs
@@ -61,7 +61,7 @@ countVerticesSundqvist ts = List.length vs
 countVerticesCrayne :: L.ByteString -> Int
 countVerticesCrayne bs = execState (parseOBJ builder (ObjConfig IntMap.empty) bs) 0
 where
-    builder = (nullBuilder $ return ())
+    builder = nullBuilder
        { vertex = \_ -> modify succ
        }
author	Joe Crayne <joe@jerkface.net>	2019-06-14 20:45:38 -0400
committer	Joe Crayne <joe@jerkface.net>	2019-06-14 20:45:38 -0400
commit	f3d1dd211b47d784b562a2251c5cd090ef06f8e9 (patch)
tree	007a39b8ec1bb309c40dca5501b2ab206204839e
parent	98aa7d7177aaf46171b095bbb28e2f1e868323c5 (diff)

diff --git a/src/Wavefront.hs b/src/Wavefront.hs index 1fc8ec3..0da9f41 100644 --- a/src/Wavefront.hs +++ b/src/Wavefront.hs
@@ -79,7 +79,7 @@ modifyFirst :: MonadState (c, d) m => (c -> c) -> m ()
79	modifyFirst = modify' . first	79	modifyFirst = modify' . first
80		80
81	buildOBJ :: ObjBuilder (State (OBJ DList,Element ()))	81	buildOBJ :: ObjBuilder (State (OBJ DList,Element ()))
82	buildOBJ = (nullBuilder $ pure ())	82	buildOBJ = nullBuilder
83	{ vertex = \xs -> modifyFirst $ \o -> o { objLocations = objLocations o `DList.snoc` mkv xs }	83	{ vertex = \xs -> modifyFirst $ \o -> o { objLocations = objLocations o `DList.snoc` mkv xs }
84	, vertexT = \xs -> modifyFirst $ \o -> o { objTexCoords = objTexCoords o `DList.snoc` mkt xs }	84	, vertexT = \xs -> modifyFirst $ \o -> o { objTexCoords = objTexCoords o `DList.snoc` mkt xs }
85	, vertexN = \xs -> modifyFirst $ \o -> o { objNormals = objNormals o `DList.snoc` mkn xs }	85	, vertexN = \xs -> modifyFirst $ \o -> o { objNormals = objNormals o `DList.snoc` mkn xs }


diff --git a/src/Wavefront/Lex.hs b/src/Wavefront/Lex.hs index 78c6f1d..05a6595 100644 --- a/src/Wavefront/Lex.hs +++ b/src/Wavefront/Lex.hs
@@ -110,53 +110,53 @@ instance Rank2.Functor ObjBuilder where
110	}	110	}
111		111
112		112
113	nullBuilder :: Applicative m => m () -> ObjBuilder m	113	nullBuilder :: Applicative m => ObjBuilder m
114	nullBuilder def = ObjBuilder	114	nullBuilder = ObjBuilder
115	{ vertex = \vs -> def	115	{ vertex = \vs -> pure ()
116	, vertexT = \vs -> def	116	, vertexT = \vs -> pure ()
117	, vertexN = \vs -> def	117	, vertexN = \vs -> pure ()
118	, vertexP = \vs -> def	118	, vertexP = \vs -> pure ()
119	, face = \is -> def	119	, face = \is -> pure ()
120	, line = \is -> def	120	, line = \is -> pure ()
121	, cstype = \isRat typ -> def	121	, cstype = \isRat typ -> pure ()
122	, curv2 = \is -> def	122	, curv2 = \is -> pure ()
123	, curv = \u0 v0 is -> def	123	, curv = \u0 v0 is -> pure ()
124	, parm = \uv is -> def	124	, parm = \uv is -> pure ()
125	, specialPoints = \is -> def	125	, specialPoints = \is -> pure ()
126	, endFreeForm = def	126	, endFreeForm = pure ()
127	, ctech = \approx -> def	127	, ctech = \approx -> pure ()
128	, stech = \approx -> def	128	, stech = \approx -> pure ()
129	, deg = \is -> def	129	, deg = \is -> pure ()
130	, surf = \u0 u1 v0 v1 ts -> def	130	, surf = \u0 u1 v0 v1 ts -> pure ()
131	, trim = \ss -> def	131	, trim = \ss -> pure ()
132	, hole = \ss -> def	132	, hole = \ss -> pure ()
133	, specialCurves = \ss -> def	133	, specialCurves = \ss -> pure ()
134	, equivalentCurves = \ccs -> def	134	, equivalentCurves = \ccs -> pure ()
135	, groups = \gs -> def	135	, groups = \gs -> pure ()
136	, smoothingGroup = \sg -> def	136	, smoothingGroup = \sg -> pure ()
137	, mergingGroup = \mg δ -> def	137	, mergingGroup = \mg δ -> pure ()
138	, usemtl = \mtl -> def	138	, usemtl = \mtl -> pure ()
139	, deprecated_cdc = \is -> def	139	, deprecated_cdc = \is -> pure ()
140	, deprecated_cdp = \is -> def	140	, deprecated_cdp = \is -> pure ()
141	, deprecated_bzp = \is -> def	141	, deprecated_bzp = \is -> pure ()
142	, deprecated_bsp = \is -> def	142	, deprecated_bsp = \is -> pure ()
143	, mtllib = \fns -> def	143	, mtllib = \fns -> pure ()
144	, objectName = \obn -> def	144	, objectName = \obn -> pure ()
145	, bmat = \uv fs -> def	145	, bmat = \uv fs -> pure ()
146	, step = \is -> def	146	, step = \is -> pure ()
147	, points = \is -> def	147	, points = \is -> pure ()
148	, usemap = \map -> def	148	, usemap = \map -> pure ()
149	, maplib = \fns -> def	149	, maplib = \fns -> pure ()
150	, c_interp = \b -> def	150	, c_interp = \b -> pure ()
151	, d_interp = \b -> def	151	, d_interp = \b -> pure ()
152	, trace_obj = \obj -> def	152	, trace_obj = \obj -> pure ()
153	, shadow_obj = \obj -> def	153	, shadow_obj = \obj -> pure ()
154	, deprecated_res = \is -> def	154	, deprecated_res = \is -> pure ()
155	, bevel = \b -> def	155	, bevel = \b -> pure ()
156	, lod = \lvl -> def	156	, lod = \lvl -> pure ()
157	, call = \obj args -> def	157	, call = \obj args -> pure ()
158	, command = \b cmd -> def *> pure L.empty	158	, command = \b cmd -> pure L.empty
159	, badToken = \bs -> def	159	, badToken = \bs -> pure ()
160	}	160	}
161		161
162		162


diff --git a/test/bench.hs b/test/bench.hs index a8ba239..e610e84 100644 --- a/test/bench.hs +++ b/test/bench.hs
@@ -61,7 +61,7 @@ countVerticesSundqvist ts = List.length vs
61	countVerticesCrayne :: L.ByteString -> Int	61	countVerticesCrayne :: L.ByteString -> Int
62	countVerticesCrayne bs = execState (parseOBJ builder (ObjConfig IntMap.empty) bs) 0	62	countVerticesCrayne bs = execState (parseOBJ builder (ObjConfig IntMap.empty) bs) 0
63	where	63	where
64	builder = (nullBuilder $ return ())	64	builder = nullBuilder
65	{ vertex = \_ -> modify succ	65	{ vertex = \_ -> modify succ
66	}	66	}
67		67