Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge take two #292

Closed
wants to merge 611 commits into from
Closed

Merge take two #292

wants to merge 611 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 25, 2012

  1. Used realToFrac instead of toRational . fromRational.

    Clark Gaebel committed Oct 25, 2012
    Copy the full SHA
    558d4b7 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2012

  1. Copy the full SHA
    7b049f6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    36b70c1 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2012

  1. Copy the full SHA
    8f78ea2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2012

  1. Merge

    bos committed Nov 20, 2012
    Copy the full SHA
    f2bb853 View commit details
    Browse the repository at this point in the history
  2. Add a test case for haskellgh-72

    bos committed Nov 20, 2012
    Copy the full SHA
    80e5147 View commit details
    Browse the repository at this point in the history
  3. Merge

    bos committed Nov 20, 2012
    Copy the full SHA
    48a750f View commit details
    Browse the repository at this point in the history
  4. Merge pull request haskell#89 from wowus/master

    Added an instance for the 'Fixed' class.
    bos committed Nov 20, 2012
    Copy the full SHA
    69130db View commit details
    Browse the repository at this point in the history
  5. Merge pull request haskell#64 from mike-burns/iso-8601

    parseJSON for the variations on ISO-8601 dates as listed in ECMA-262.
    bos committed Nov 20, 2012
    Copy the full SHA
    4529c6a View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    bb57444 View commit details
    Browse the repository at this point in the history
  7. Match prevailing coding style

    bos committed Nov 20, 2012
    Copy the full SHA
    2f1d5cf View commit details
    Browse the repository at this point in the history
  8. Merge pull request haskell#90 from basvandijk/with

    Add functions for inspecting Values
    bos committed Nov 20, 2012
    Copy the full SHA
    32e0c2d View commit details
    Browse the repository at this point in the history
  9. Merge pull request haskell#69 from basvandijk/eitherDecode

    Added eitherDecode and eitherDecode'
    bos committed Nov 20, 2012
    Copy the full SHA
    1fd60bc View commit details
    Browse the repository at this point in the history
  10. Merge pull request haskell#91 from chrisdone/master

    Add elaborate guide to Data.Aeson's Haddock documentation
    bos committed Nov 20, 2012
    Copy the full SHA
    4a3d1a1 View commit details
    Browse the repository at this point in the history
  11. Update Chris's docs

    bos committed Nov 20, 2012
    Copy the full SHA
    d6c61a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2012

  1. Improve introductionary documentation

    De-emphasize working directly with the Value type as this is not the
    common (or recommended) way to use the library, but still include
    documentation on how to use it when it's called for.
    
    Since the documentation on using generics is documented in the FromJSON
    and ToJSON classes, refer to that documentation instead of only
    documenting one method (which is not the preferred method anymore with
    default signatures I believe).
    tibbe committed Nov 30, 2012
    1
    Copy the full SHA
    ed16167 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2012

  1. Copy the full SHA
    b990998 View commit details
    Browse the repository at this point in the history
  2. Update release notes

    bos committed Dec 7, 2012
    Copy the full SHA
    f21a88b View commit details
    Browse the repository at this point in the history
  3. Bump version number

    bos committed Dec 7, 2012
    Copy the full SHA
    54752df View commit details
    Browse the repository at this point in the history
  4. Update copyright years

    bos committed Dec 7, 2012
    Copy the full SHA
    26d57ef View commit details
    Browse the repository at this point in the history
  5. Merge pull request haskell#96 from tibbe/docs

    Improve introductionary documentation
    bos committed Dec 7, 2012
    Copy the full SHA
    83a2433 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2012

  1. Copy the full SHA
    2dff7be View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2012

  1. Complex doc merge

    bos committed Dec 13, 2012
    Copy the full SHA
    2539e74 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2012

  1. Copy the full SHA
    cc5526f View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2012

  1. Copy the full SHA
    3dc1c44 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    f7e4916 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2013

  1. modifyFailure (haskell#104)

    snoyberg committed Jan 1, 2013
    Copy the full SHA
    34d4636 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2013

  1. Copy the full SHA
    4e299b6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request haskell#97 from basvandijk/th-encoding

    Add support for specifying how to encode datatypes in Data.Aeson.TH
    bos committed Jan 2, 2013
    Copy the full SHA
    4607d7d View commit details
    Browse the repository at this point in the history
  3. Fix imports

    bos committed Jan 2, 2013
    Copy the full SHA
    09c8e43 View commit details
    Browse the repository at this point in the history
  4. Fix build on GHC 6.12

    bos committed Jan 2, 2013
    Copy the full SHA
    48546d9 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2013

  1. Merge pull request haskell#102 from nikita-volkov/master

    Fix the Maybe being treated as ADT in Generics bug
    bos committed Jan 15, 2013
    Copy the full SHA
    72ae354 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    fb81fbf View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2013

  1. Copy the full SHA
    260ade6 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    fea32fd View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    10dbaba View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    613480c View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2013

  1. Update benchmarks

    bos committed Jan 30, 2013
    Copy the full SHA
    aaed056 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2013

  1. Vary block size when parsing

    bos committed Jan 31, 2013
    Copy the full SHA
    2102972 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2013

  1. Copy the full SHA
    8354c97 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2013

  1. Copy the full SHA
    5f308dc View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    bcc1dd1 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2013

  1. Copy the full SHA
    8a73214 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2013

  1. Tweaklet

    bos committed Feb 12, 2013
    Copy the full SHA
    61dab8f View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2013

  1. Copy the full SHA
    eca6450 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2013

  1. Merge pull request haskell#110 from pheaver/topic/graceful-utf8-decode

    detect invalid UTF-8 encoding in JSON strings, throw appropriate error
    bos committed Apr 2, 2013
    Copy the full SHA
    9d76a74 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2013

  1. Merge

    bos committed Apr 3, 2013
    Copy the full SHA
    80ceb7a View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2013

  1. Copy the full SHA
    88fcb55 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    2edf7d0 View commit details
    Browse the repository at this point in the history
  3. Resolved conflict

    basvandijk committed Apr 7, 2013
    Copy the full SHA
    4e224d0 View commit details
    Browse the repository at this point in the history
  4. Added tests/Options.hs

    basvandijk committed Apr 7, 2013
    Copy the full SHA
    a4c3833 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    ed6dcc7 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2013

  1. Copy the full SHA
    85e1753 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    68cb3b1 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2013

  1. Fix doc braino

    bos committed Apr 19, 2013
    Copy the full SHA
    0af65e2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request haskell#115 from cliffordbeshers/master

    Tiny documentation patch, resolving small ambiguity.
    bos committed Apr 19, 2013
    Copy the full SHA
    bba0739 View commit details
    Browse the repository at this point in the history
  3. Clarify the clarification

    bos committed Apr 19, 2013
    Copy the full SHA
    239c159 View commit details
    Browse the repository at this point in the history
  4. Split up the test modules

    bos committed Apr 19, 2013
    Copy the full SHA
    b0fc09d View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    e45bd82 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    f3aba21 View commit details
    Browse the repository at this point in the history
  7. Added the genericToJSON and genericParseJSON functions

    This makes it easier to parameterize the generic JSON encoding/decoding
    since users now don't need to import GHC.Generics
    and so don't need to depend on ghc-prim.
    basvandijk committed Apr 19, 2013
    Copy the full SHA
    ff580f8 View commit details
    Browse the repository at this point in the history
  8. Change default encoding options to include Nothing fields by default

    I think this is a more sensible default.
    basvandijk committed Apr 19, 2013
    Copy the full SHA
    9d9a73e View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    85eb4ce View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2013

  1. Merged master

    basvandijk committed Apr 20, 2013
    Copy the full SHA
    6b8f317 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    2a15982 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    43ba793 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2013

  1. Refactored Data.Aeson.Types.Generic

    - Better naming
    - Clearer sectioning
    - Some documentation
    - Some implementation changes
    basvandijk committed Apr 21, 2013
    Copy the full SHA
    5d76c38 View commit details
    Browse the repository at this point in the history
  2. Add tests/Encoders.hs

    basvandijk committed Apr 21, 2013
    Copy the full SHA
    072311f View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    bcab228 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2013

  1. Merge

    bos committed Apr 22, 2013
    Copy the full SHA
    ed1da7b View commit details
    Browse the repository at this point in the history
  2. Deprecated Data.Aeson.Generic

    The module is deprecated for the following reasons:
    
    - It has issues: haskell#75, haskell#84, haskell#101, haskell#107.
    
    - It's slow compared to GHC Generics and very, very, very slow
      compared to TH. See some recent benchmark results in haskell#116.
    
    - The encoding/decoding can't currently be configured using the
      encoding Options.
    
    - Related to the previous point: GHC Generics and TH use compatible
      encoders/decoders (if the same Options have been
      used). Data.Aeson.Generic does things slightly differently.
    
    - The original author is not around to work on it.
    basvandijk committed Apr 22, 2013
    Copy the full SHA
    12ed274 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    fa61181 View commit details
    Browse the repository at this point in the history
  4. Renamed valueFieldName to contentsFieldName

    This reflects its purpose more accurately.
    basvandijk committed Apr 22, 2013
    Copy the full SHA
    fd7d174 View commit details
    Browse the repository at this point in the history
  5. Rename constructor name/type to constructor tag which is more accurate.

    - Rename "constructorNameModifier" to "constructorTagModifier".
    
    - Rename "ObjectWithType" to "TaggedObject".
    
    - Rename "typeFieldName" to "tagFieldName".
    
    - Rename "defaultObjectWithType" to "defaultTaggedObject".
    basvandijk committed Apr 22, 2013
    Copy the full SHA
    2a9d0e1 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    989af87 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    ef224a0 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    601a13d View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2013

  1. Remove unneeded import

    basvandijk committed Apr 23, 2013
    Copy the full SHA
    5c22ecc View commit details
    Browse the repository at this point in the history
  2. Firewall off tests for deprecated features

    --HG--
    rename : tests/Properties.hs => tests/Properties/Deprecated.hs
    bos committed Apr 23, 2013
    Copy the full SHA
    2ff8673 View commit details
    Browse the repository at this point in the history
  3. Fix fake-broken DotNetTime test

    bos committed Apr 23, 2013
    Copy the full SHA
    7e38a89 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2013

  1. Fix for GHC 7.8

    hamishmack committed Apr 30, 2013
    Copy the full SHA
    7e99dd1 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2013

  1. Added default time format that wasn't tried when parsing.

    --HG--
    extra : rebase_source : f086f5fb8c5249ec8c204d12d2856a79b40ebe5c
    Daniel-Diaz committed Jun 20, 2013
    Copy the full SHA
    c04bfff View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2013

  1. Copy the full SHA
    2a811eb View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2013

  1. Fixed typos. ('-' and 'Coord')

    * Is there supposed to be a "-" after Show? I had to remove it in order to compile my example.
    
    * Clearly "Coord" is from one of the example applications and got missed in a copy-paste. It should be an instance for Person.
    rietmann committed Jul 24, 2013
    Copy the full SHA
    c59fc9d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2013

  1. Update Aeson.hs

    Coord -> Person
    timthelion committed Aug 10, 2013
    Copy the full SHA
    71d622f View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2013

  1. Copy the full SHA
    406c3d4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request haskell#130 from Peaker/master

    Fix lazy I/O leak and trailing garbage ignore bug in decode functions
    bos committed Sep 4, 2013
    Copy the full SHA
    240215e View commit details
    Browse the repository at this point in the history
  3. 1
    Copy the full SHA
    b0e2424 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    825a8a9 View commit details
    Browse the repository at this point in the history
  5. Clarify decode docs

    bos committed Sep 4, 2013
    Copy the full SHA
    f8c6d33 View commit details
    Browse the repository at this point in the history
  6. Get the test suite working with GHC 7.0 again

    --HG--
    extra : rebase_source : 0fb1957085dc6026442518a0b76401b4b467e055
    extra : amend_source : 762f5cacca19cff3b35a8b2f8945d3581a828910
    bos committed Sep 4, 2013
    Copy the full SHA
    9fad623 View commit details
    Browse the repository at this point in the history
  7. Tweak cpp-options

    bos committed Sep 4, 2013
    Copy the full SHA
    280b8f3 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    5f313bb View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    0e3879d View commit details
    Browse the repository at this point in the history
  10. Simplify the previous commit

    bos committed Sep 4, 2013
    Copy the full SHA
    4d91532 View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    3568f6e View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2013

  1. Use the Builder from bytestring >= 0.10

    Allow building with blaze-builder and older versions of bytestring
    if the blaze-builder flag is specified.
    basvandijk committed Sep 15, 2013
    Copy the full SHA
    3d24094 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2013

  1. Merge pull request haskell#143 from basvandijk/bytestring-0.10

    Use the Builder from bytestring >= 0.10
    bos committed Sep 17, 2013
    Copy the full SHA
    d5a2ac3 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2013

  1. 1
    Copy the full SHA
    9ee73f3 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2013

  1. Provide {To,From}JSON instances for {5,6,7}-tuples

    Providing this instances is motived by the Haskell Report suggesting
    that libraries ought to support tuples up to a size of 7
    (see http://www.haskell.org/onlinereport/basic.html#basic-tuples):
    
    > The Prelude and libraries define tuple functions such as zip for
    > tuples up to a size of 7.
    
    This fixes haskell#144
    hvr committed Sep 22, 2013
    Copy the full SHA
    0fb0273 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2013

  1. Bump version to 0.7.0.0

    bos committed Sep 25, 2013
    Copy the full SHA
    735c52c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2013

  1. Drop even more ByteString related instances

    This follows up on 9ee73f3 by removing some more ByteString
    related instances as suggested by @basvandijk in haskell#126.
    hvr committed Sep 27, 2013
    Copy the full SHA
    eaee773 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2013

  1. Added FromJSON and ToJSON instances for Data.Tree.

    The instances reuse the instance code for tuples.
    Daniel Diaz committed Oct 13, 2013
    Copy the full SHA
    4925dba View commit details
    Browse the repository at this point in the history
  2. Adding functions to TH to make CamelCase to under_score easier.

    I have noticed in multiple places around hackage that people add
    these kinds of functions to get their JSON formatted keys (often
    underscore_formatted_strings) out of Haskell's CamelCase data
    properties (often withLongStringsOfCAPITALS).
    
    I have also added to the .gitignore those files generated by the new
    cabal 1.18 'sandbox' feature.
    
    I have a few outstanding questions:
    
    1) Should these functions live in another module with an isomorphic
    inverse function, like `underscoreToCamel`? Like Aeson.Properties?
    2) I am at something of a loss as to how to integrate testing into the
    suite. I've tested the out at the REPL, but what steps should be
    taken to integrate these into QuickCheck?
    Gabe McArthur committed Oct 13, 2013
    Copy the full SHA
    74e8b1b View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2013

  1. Try to fix stupid clang cpp incompatibility (haskellgh-154)

    --HG--
    extra : rebase_source : 4d92fc2b96527581ecba1a9d09e93a2c6ae31682
    extra : amend_source : f2b002e759d692bc9bca962484123a7857ebbb02
    bos committed Oct 14, 2013
    Copy the full SHA
    069d2f7 View commit details
    Browse the repository at this point in the history
  2. Bump version to 0.6.2.1

    bos committed Oct 14, 2013
    Copy the full SHA
    82a7340 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    592ef96 View commit details
    Browse the repository at this point in the history
  4. Merge

    bos committed Oct 14, 2013
    Copy the full SHA
    5246006 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    bee4191 View commit details
    Browse the repository at this point in the history
  6. Merge pull request haskell#153 from danidiaz/master

    Added FromJSON and ToJSON instances for Data.Tree.
    bos committed Oct 14, 2013
    Copy the full SHA
    651ce8d View commit details
    Browse the repository at this point in the history
  7. Merge

    bos committed Oct 14, 2013
    Copy the full SHA
    d7f3ef7 View commit details
    Browse the repository at this point in the history
  8. Separate class definitions from instances

    --HG--
    rename : Data/Aeson/Types/Class.hs => Data/Aeson/Types/Instances.hs
    bos committed Oct 14, 2013
    Copy the full SHA
    f6ef7d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2013

  1. Replace Number with Scientific

    Scientific numbers are floating-point numbers with arbitrary precision
    that are fast to parse and can be efficiently converted to/from
    Fractional numbers like Doubles.
    basvandijk committed Oct 22, 2013
    Copy the full SHA
    7459358 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ba3363d View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    321dc09 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2013

  1. Copy the full SHA
    b47f6b3 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    4a44fb9 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2013

  1. Copy the full SHA
    e166912 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2013

  1. Fixing a typo.

    Gabe McArthur committed Oct 27, 2013
    Copy the full SHA
    c09be2a View commit details
    Browse the repository at this point in the history
  2. Adding tests for the camlCase operation.

    Gabe McArthur committed Oct 27, 2013
    Copy the full SHA
    c7972e1 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2013

  1. Merge pull request haskell#156 from basvandijk/scientific

    Change Number to Scientific
    bos committed Oct 29, 2013
    Copy the full SHA
    65ea872 View commit details
    Browse the repository at this point in the history
  2. Merge

    --HG--
    rename : Data/Aeson/Types/Class.hs => Data/Aeson/Types/Instances.hs
    bos committed Oct 29, 2013
    Copy the full SHA
    6959d5d View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2013

  1. 4
    Copy the full SHA
    634c6ee View commit details
    Browse the repository at this point in the history
  2. Encode RealFloat numbers using Scientific.fromFloatDigits

    The previous code used realToFrac (fromRation . toRational) which
    approximates a floating point value. For example:
    
     > toRational (1.2::Double)
     5404319552844595 % 4503599627370496
    
    If you encode this Rational number to a Scientific number and render it
    you get:
    
     > encode (1.2::Double)
     "1.1999999999999999555910790149937383830547332763671875"
    
    Using Scientific.fromFloatDigits you get the expected:
    
     > encode (1.2::Double)
     "1.2"
    basvandijk committed Nov 5, 2013
    Copy the full SHA
    1cc3935 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    5c1fed2 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    bf7313d View commit details
    Browse the repository at this point in the history
  5. Bump dependency on scientific

    bos committed Nov 5, 2013
    Copy the full SHA
    0931a62 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2013

  1. Copy the full SHA
    645328e View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2013

  1. Merge pull request haskell#162 from basvandijk/master

    Encode RealFloat numbers using Scientific.fromFloatDigits
    bos committed Nov 19, 2013
    Copy the full SHA
    b0b4c24 View commit details
    Browse the repository at this point in the history
  2. Fix module sorting

    bos committed Nov 19, 2013
    Copy the full SHA
    eb84b70 View commit details
    Browse the repository at this point in the history
  3. Fix JSON instance for UTCTime

    This fixes haskellgh-158.
    bos committed Nov 19, 2013
    1
    Copy the full SHA
    ed98164 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    3dc6238 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    c0048d3 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    38c347b View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2013

  1. Copy the full SHA
    d942f79 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2013

  1. Copy the full SHA
    a594ec0 View commit details
    Browse the repository at this point in the history
  2. Rename release notes to changelog, for Hackage compat

    --HG--
    rename : release-notes.markdown => changelog
    bos committed Nov 22, 2013
    Copy the full SHA
    fe96a12 View commit details
    Browse the repository at this point in the history
  3. Merge

    bos committed Nov 22, 2013
    Copy the full SHA
    b2af147 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2013

  1. Copy the full SHA
    4b91304 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    61dafac View commit details
    Browse the repository at this point in the history
  3. Ignore new cabal sandboxes

    bos committed Nov 23, 2013
    Copy the full SHA
    79483dc View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2013

  1. Copy the full SHA
    dcc7019 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2013

  1. Add -rtsopts to benchmarks

    bos committed Nov 26, 2013
    Copy the full SHA
    99019ee View commit details
    Browse the repository at this point in the history
  2. Rewrite arrayValues to be less combinator-driven

    This gives us about a 20% performance increase when parsing an
    array-heavy input, such as json-data/geometry.json (haskellgh-134).
    bos committed Nov 26, 2013
    Copy the full SHA
    da17f1f View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    36f3c43 View commit details
    Browse the repository at this point in the history
  4. Rework objectValues to use commaSeparated

    This gives us a further 10% performance improvement when parsing
    object-heavy inputs, e.g. json-data/twitter100.json (haskellgh-134).
    bos committed Nov 26, 2013
    Copy the full SHA
    ed8c095 View commit details
    Browse the repository at this point in the history
  5. Simplify objectValues

    bos committed Nov 26, 2013
    Copy the full SHA
    6bae924 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2013

  1. Make imports more explicit

    bos committed Nov 27, 2013
    Copy the full SHA
    b46895a View commit details
    Browse the repository at this point in the history
  2. Check for empty array/object values (oops!)

    Well, that was embarrassing - my rewrite wasn't quite as clever as
    I thought!
    
    This fix drops peak throughput, but it's still better than it was.
    bos committed Nov 27, 2013
    Copy the full SHA
    1c59a16 View commit details
    Browse the repository at this point in the history
  3. Use symbolic constants more widely, for readability

    --HG--
    extra : amend_source : ca3adc7f8e317f8db73170b08bc145247fa752ec
    bos committed Nov 27, 2013
    Copy the full SHA
    35687de View commit details
    Browse the repository at this point in the history
  4. Switch to a peek-driven version of value

    This drops use of the (<|>) combinator, and greatly reduces the
    extent to which we allocate unused thunks. As a result, it improves
    both runtime and heap usage significantly.
    
    --HG--
    extra : rebase_source : 62bc8759400db5a2bc644f5da3fe19c0d10d5d96
    bos committed Nov 27, 2013
    Copy the full SHA
    abff795 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    0ad96ed View commit details
    Browse the repository at this point in the history
  6. Simplify the value parser

    If we've already peeked at a byte, we don't need to check its value
    a second time.
    bos committed Nov 27, 2013
    Copy the full SHA
    ce36f22 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2013

  1. Merge branch 'master' of https://github.com/bos/aeson

    Conflicts:
    	Data/Aeson/Types/Internal.hs
    heyzua committed Nov 29, 2013
    Copy the full SHA
    3d8b167 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2013

  1. Added data instance to Value

    mxswd committed Dec 1, 2013
    Copy the full SHA
    cdcafd5 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2013

  1. Copy the full SHA
    0004197 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2014

  1. Merge pull request haskell#168 from mkscrg/decodeStrict-fix

    Fix "incomplete input" from decodeStrictWith
    bos committed Jan 2, 2014
    Copy the full SHA
    3101c93 View commit details
    Browse the repository at this point in the history
  2. Merge

    bos committed Jan 2, 2014
    Copy the full SHA
    f2f3aa3 View commit details
    Browse the repository at this point in the history
  3. Bump dependency on attoparsec

    bos committed Jan 2, 2014
    Copy the full SHA
    4b3b5d8 View commit details
    Browse the repository at this point in the history
  4. Merge pull request haskell#169 from maxpow4h/master

    Added data instance to Value
    bos committed Jan 2, 2014
    Copy the full SHA
    38ebb57 View commit details
    Browse the repository at this point in the history
  5. Merge pull request haskell#155 from gabemc/master

    Adding functions to TH to make CamelCase to under_score easier.
    bos committed Jan 2, 2014
    Copy the full SHA
    be4cfc8 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2014

  1. Copy the full SHA
    99882c9 View commit details
    Browse the repository at this point in the history
  2. Use fast 'encodeUtf8BuilderEscaped' if possible

    - only use it when compiling against bytestring >= 0.10.4.0
    - speed improvement over bytestring-via-text encoding:
        factor 1.5 - 1.6 for japanase and english JSON messages
        factor 2         for integer encoding
    
    - equal speed for encoding floats
    meiersi committed Jan 3, 2014
    Copy the full SHA
    7f92045 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2014

  1. Fix JSON instance for UTCTime to yield a valid ISO8601 string

    The value truncated to milliseconds by rounding down
    Lars Kuhtz committed Jan 6, 2014
    Copy the full SHA
    555c7d1 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2014

  1. Bump dependency on scientific

    bos committed Jan 8, 2014
    Copy the full SHA
    8705e71 View commit details
    Browse the repository at this point in the history
  2. Merge pull request haskell#172 from meiersi/feat-encode-via-bytestrin…

    …g-builder
    
    Feat encode via bytestring builder
    bos committed Jan 8, 2014
    Copy the full SHA
    faa9936 View commit details
    Browse the repository at this point in the history
  3. Merge

    bos committed Jan 8, 2014
    Copy the full SHA
    63a95d6 View commit details
    Browse the repository at this point in the history
  4. Restore deriving Data

    bos committed Jan 8, 2014
    Copy the full SHA
    1d7b92c View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2014

  1. Fix benchmark build with older bytestring

    --HG--
    extra : amend_source : c1a49357128d6784becacab023c114fceee98abf
    bos committed Jan 9, 2014
    Copy the full SHA
    08e397b View commit details
    Browse the repository at this point in the history
  2. Update changelog

    bos committed Jan 9, 2014
    Copy the full SHA
    72d12e9 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    84ca163 View commit details
    Browse the repository at this point in the history
  4. Update benchmark framework

    bos committed Jan 9, 2014
    Copy the full SHA
    97635d8 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    06d7edd View commit details
    Browse the repository at this point in the history
  6. Update perf numbers for the previous versions of the various libs

    I want to be able to use this as a baseline to see how the new
    versions of the libraries fare.
    
    --HG--
    extra : amend_source : 166f845a7d1d42ee33c646f6fa7034d853eefe60
    bos committed Jan 9, 2014
    Copy the full SHA
    0d1d835 View commit details
    Browse the repository at this point in the history
  7. Update performance numbers

    This clearly shows that on this dataset, decoding is about 33%
    faster than the previous release, while encoding is about twice as
    fast. Nice!
    bos committed Jan 9, 2014
    Copy the full SHA
    9636fda View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    8cc212a View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    e94d20d View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2014

  1. Fix cabal-install for GHC 7.8; better support for GHC < 7.8

    Proposed fix for haskell#177.  This does have the downside that it would
    immediately require text-1.1,  which might cause for some people
    committed to older versions of the Haskell Platform.
    lpsmith committed Jan 11, 2014
    Copy the full SHA
    2dfb890 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2014

  1. Relax dependency on attoparsec

    This allows us to work with the version of the Haskell Platform
    that is current as of early 2014.
    bos committed Feb 4, 2014
    Copy the full SHA
    473757c View commit details
    Browse the repository at this point in the history
  2. Bump version to 0.7.0.1

    bos committed Feb 4, 2014
    Copy the full SHA
    775a4a2 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    3ea60c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2014

  1. depends on unordered-containers 0.2.3.0 for HashMap Data instance

    Data instance for HashMap, which only seems to appear in 0.2.3.0, but
    aeson's current dependency is only on 0.1.3.0.
    
    Data instance for HashMap
    codygman committed Feb 5, 2014
    Copy the full SHA
    3e8769d View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2014

  1. Copy the full SHA
    08a365e View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2014

  1. Merge pull request haskell#183 from codygman/master

    depends on unordered-containers 0.2.3.0 for HashMap Data instance
    bos committed Mar 4, 2014
    Copy the full SHA
    025f73e View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2014

  1. Bump version to 0.7.0.2

    bos committed Mar 5, 2014
    Copy the full SHA
    c40759b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    b20b6a3 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2014

  1. Follow TH changes in GHC 7.9.

    Pred now is just an alias of Type. See GHC Trac #7021.
    Fuuzetsu committed Mar 10, 2014
    Copy the full SHA
    19682fe View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2014

  1. Copy the full SHA
    b000e67 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2014

  1. Copy the full SHA
    b2fc709 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2014

  1. Bump version to 0.7.0.3

    bos committed Apr 11, 2014
    Copy the full SHA
    2543a3e View commit details
    Browse the repository at this point in the history
  2. Improve parseJSON failure message for Either

    This fixes haskell#193.
    bos committed Apr 11, 2014
    Copy the full SHA
    5eee13d View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    4c563a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. Make all cabal flags manual

    This means that dependency solver's job is easier (it doesn't need to
    consider the opposite flag setting) and it means that cabal cannot
    automatically switch these flags (which I don't think happened in the
    past, but it's theoretically possible).
    tibbe committed Apr 25, 2014
    Copy the full SHA
    0243576 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2014

  1. Modernizing the TH example.

    ret committed Apr 29, 2014
    Copy the full SHA
    19bec1d View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2014

  1. Parse a number using the new scientific parser

    The old rational parser applied realToFrac (fromRational . toRational)
    to the Scientific number to construct a new Scientific number. This had
    the disadvantage that scientific numbers with big exponents like
    1e1000000000 are converted from (Scientific 1 1000000000) to
    (Scientific (1*10^1000000000) 0). If the Integer coefficient of the
    latter is later evaluated it will allocate all memory.
    
    This is the first step needed to fix haskell#198.
    basvandijk committed Apr 30, 2014
    Copy the full SHA
    5092020 View commit details
    Browse the repository at this point in the history
  2. Fix haskell#198 for Integral types. Fractional types are still unsafe!

    Integral types can now be parsed safely (bounded space usage).
    
    Parsing fractional types (Float and Double) still allows an attacker to
    fill up the memory of the target system by supplying a number with a
    large exponent. Fixing this is on my TODO list.
    basvandijk committed Apr 30, 2014
    Copy the full SHA
    9eee203 View commit details
    Browse the repository at this point in the history
  3. Bump version to 0.7.0.4

    bos committed Apr 30, 2014
    Copy the full SHA
    fa086b5 View commit details
    Browse the repository at this point in the history
  4. Go away, hashmap branch!

    --HG--
    branch : hashmap
    extra : close : 1
    bos committed Apr 30, 2014
    Copy the full SHA
    367570b View commit details
    Browse the repository at this point in the history
  5. Merge

    bos committed Apr 30, 2014
    Copy the full SHA
    5b76f7b View commit details
    Browse the repository at this point in the history
  6. Merge

    bos committed Apr 30, 2014
    Copy the full SHA
    ed7caa7 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    7d419b4 View commit details
    Browse the repository at this point in the history
  8. Drop more legacy GHC support

    bos committed Apr 30, 2014
    Copy the full SHA
    35e7aa5 View commit details
    Browse the repository at this point in the history
  9. Fix silly build error

    bos committed Apr 30, 2014
    Copy the full SHA
    039ab9f View commit details
    Browse the repository at this point in the history
  10. Rename and reformat changelog

    --HG--
    rename : changelog => changelog.md
    bos committed Apr 30, 2014
    Copy the full SHA
    fdb07f5 View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    677a8d9 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2014

  1. Data.Aeson.Types.Instances: fix UTCTime for years outside of [0, 9999]

    ∙ "take 23" is a dubious way to truncate to millisecond accuracy.
    ∙ instance ToJSON ZonedTime had it right, so copypasta from it.
    liyang committed May 2, 2014
    Copy the full SHA
    4bee2d4 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2014

  1. Use scientific >= 0.3

    scientific-0.3 exports the Text and ByteString Scientific Builders from
    the following modules respectively:
    
    - Data.Text.Lazy.Builder.Scientific
    - Data.ByteString.Builder.Scientific
    basvandijk committed May 12, 2014
    Copy the full SHA
    7138f02 View commit details
    Browse the repository at this point in the history
  2. Use scientific >= 0.3.1

    scientific-0.3.1 exports the Text and ByteString Scientific Builders from
    the following modules respectively:
    
    - Data.Text.Lazy.Builder.Scientific
    - Data.ByteString.Builder.Scientific
    
    --HG--
    extra : rebase_source : ba52e4d4efebc4d8b28a83f100ede322c2cc85dd
    extra : histedit_source : 24672de0b23f74e2ddf9b17f054444fa542bed17
    basvandijk committed May 12, 2014
    Copy the full SHA
    3408781 View commit details
    Browse the repository at this point in the history
  3. Use floor on Scientifics again

    scientific-0.3 provides a DoS safe floor.
    basvandijk committed May 12, 2014
    Copy the full SHA
    1c8bf6b View commit details
    Browse the repository at this point in the history
  4. Use floor on Scientifics again

    scientific-0.3 provides a DoS safe floor.
    
    --HG--
    extra : rebase_source : 01c184cd9999662e8a73b5819d498fae979c3723
    extra : histedit_source : 810ed4934aa7f76f0fe7b63449609ceeba89025b
    basvandijk committed May 12, 2014
    Copy the full SHA
    24fcc10 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2014

  1. Copy the full SHA
    b8773ed View commit details
    Browse the repository at this point in the history
  2. Use Scientific.fromRealFloat and Scientific.toRealFloat

    --HG--
    extra : rebase_source : e4f41aa4600e3623a6a0ac72b29fe644f49c5f52
    extra : histedit_source : 18d65f0d3fa236b43343cb25349d6778384dd2f4
    basvandijk committed May 13, 2014
    Copy the full SHA
    a7626a5 View commit details
    Browse the repository at this point in the history
  3. Renamed fromRealFloat back to fromFloatDigits

    I think the latter is more descriptive.
    basvandijk committed May 13, 2014
    Copy the full SHA
    bb06ecd View commit details
    Browse the repository at this point in the history
  4. Renamed fromRealFloat back to fromFloatDigits

    I think the latter is more descriptive.
    
    --HG--
    extra : rebase_source : ccbcb71c7b8901da4d510f586c02ec5e9c411143
    extra : histedit_source : 6db4361fc35e24c7649d96316cd3d4f9170e3a6b
    basvandijk committed May 13, 2014
    Copy the full SHA
    1bfd1d2 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    e8ac8a1 View commit details
    Browse the repository at this point in the history
  6. Use Scientific.toRealFloat instead of realToFrac in scientificToNumber

    --HG--
    extra : rebase_source : f50acab7fd39d3e6ef22aeb91394b8bb73c238bb
    extra : histedit_source : 504f28b4100ae2197e85c19fc1b14cab1ea72a51
    basvandijk committed May 13, 2014
    Copy the full SHA
    80e3a9b View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    8039de5 View commit details
    Browse the repository at this point in the history
  8. Add warning about space-usage on the Fixed instance

    --HG--
    extra : rebase_source : 625058aecd476ec8f0140965e04787974ad21b70
    extra : histedit_source : 13c9b34b80a918675cffa1311881b00b9e3511d5
    basvandijk committed May 13, 2014
    Copy the full SHA
    ecbb736 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    2a2d016 View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    e3776df View commit details
    Browse the repository at this point in the history

Commits on May 14, 2014

  1. Bump version to 0.7.0.4

    bos committed May 14, 2014
    Copy the full SHA
    c9f3cc5 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    d71a69e View commit details
    Browse the repository at this point in the history
  3. Merge

    bos committed May 14, 2014
    Copy the full SHA
    c46752f View commit details
    Browse the repository at this point in the history
  4. Merge

    bos committed May 14, 2014
    Copy the full SHA
    c75bf45 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2014

  1. Merge

    bos committed May 15, 2014
    Copy the full SHA
    f799cb9 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    0571ba4 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    c78cc97 View commit details
    Browse the repository at this point in the history
  4. Bump versiob to 0.8.0.0

    bos committed May 15, 2014
    Copy the full SHA
    50d47d4 View commit details
    Browse the repository at this point in the history
  5. Merge from 0.7 branch

    bos committed May 15, 2014
    Copy the full SHA
    19c0ac5 View commit details
    Browse the repository at this point in the history
  6. Constrain the bounds on attoparsec and scientific

    --HG--
    extra : amend_source : d48e612e53488f41b0d6f2ceb4395978b48d411d
    bos committed May 15, 2014
    Copy the full SHA
    5eaab83 View commit details
    Browse the repository at this point in the history
  7. Bump attoparsec dep

    --HG--
    extra : amend_source : aa3ad961a2c62e2948ee0e213615c01ac002b42c
    bos committed May 15, 2014
    Copy the full SHA
    119a327 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    401f51a View commit details
    Browse the repository at this point in the history

Commits on May 16, 2014

  1. Copy the full SHA
    6fdecb1 View commit details
    Browse the repository at this point in the history
  2. Bump version to 0.7.0.6

    bos committed May 16, 2014
    Copy the full SHA
    354055c View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    73d893b View commit details
    Browse the repository at this point in the history

Commits on May 17, 2014

  1. Merge from 0.11

    bos committed May 17, 2014
    Copy the full SHA
    3a0642b View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2014

  1. Test the version of template haskell, not GHC

    This is more portable between compilers as well as between variants on GHC (ex: HaLVM is building off of head so GHC appears as 7.8.3 while TH is 2.10).
    TomMD committed Jun 17, 2014
    Copy the full SHA
    a6f3870 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2014

  1. Merge pull request haskell#200 from liyang/master

    Data.Aeson.Types.Instances: fix UTCTime for years outside of [0, 9999]
    bos committed Jul 2, 2014
    Copy the full SHA
    49a13d2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request haskell#199 from ret/patch-1

    Modernizing the TH example.
    bos committed Jul 2, 2014
    Copy the full SHA
    8cb4af2 View commit details
    Browse the repository at this point in the history
  3. Merge pull request haskell#204 from tekul/master

    Export 'camelTo' function and fix its tests
    bos committed Jul 2, 2014
    Copy the full SHA
    cdbdd27 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2014

  1. Copy the full SHA
    8bc3d4f View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    708e922 View commit details
    Browse the repository at this point in the history
  3. Update changelog

    bos committed Jul 16, 2014
    Copy the full SHA
    5ab8aba View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    78e705b View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2014

  1. Support time-1.5

    basvandijk committed Sep 19, 2014
    6
    Copy the full SHA
    730a8c4 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2014

  1. Bump version to 0.8.0.1

    basvandijk committed Sep 30, 2014
    Copy the full SHA
    2a38ffa View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    5f2cd3e View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2014

  1. Fix 15-tuple instances

    lambda-fairy committed Oct 14, 2014
    Copy the full SHA
    73c4707 View commit details
    Browse the repository at this point in the history
  2. Bump version to 0.8.0.2

    basvandijk committed Oct 14, 2014
    Copy the full SHA
    67ea649 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2015

  1. Copy the full SHA
    8f04524 View commit details
    Browse the repository at this point in the history