Bryan O'Sullivan avatar Bryan O'Sullivan committed eae1526

Simplify (and probably speed up) some code a little

Comments (0)

Files changed (1)

Data/Aeson/Generic.hs

               | n > 1 = construct c (V.toList js)   -- no field names
           -- FIXME? We could allow reading an array into a constructor
           -- with field names.
-          go _ c fs@(_:_) (Object o) = selectFields (fromJSObject o) fs >>=
+          go _ c fs@(_:_) (Object o) = selectFields o fs >>=
                                        construct c -- field names
           go _ c _        jd         = modFail "parseJSON" $
                                        "bad decodeArgs data " ++ show (c, jd)
                          [] -> lift $ modFail "construct" "empty list"
                          (j':js') -> do put js'; lift $ parseJSON j'
 
-        -- Select the named fields from a JSON object.  FIXME? Should
-        -- this use a map?
+        -- Select the named fields from a JSON object.
         selectFields fjs = mapM sel
           where sel f = maybe (modFail "parseJSON" $ "field does not exist " ++
-                               f) return $ lookup f fjs
+                               f) return $ Map.lookup (pack f) fjs
 
         -- Count how many arguments a constructor has.  The value x is
         -- used to determine what type the constructor returns.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.