simon-git: spigot (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  8892280 Fix another assertion failure in BaseOutputGenerator.

Repository:     git://git.tartarus.org/simon/spigot.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=spigot.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-03-26 18:38:18

commit 8892280fb83b89de6bd89dc53a59a59425b03914
web diff http://tartarus.org/~simon-git/gitweb/?p=spigot.git;a=commitdiff;h=8892280fb83b89de6bd89dc53a59a59425b03914;hp=14eb4f6a2a938e6c22fe9894b4d25d22982ef49c
Author: Simon Tatham <anakin at pobox.com>
Date:   Thu Mar 26 18:37:00 2015 +0000

    Fix another assertion failure in BaseOutputGenerator.
    
    A test case I stumbled on just now points out that it's possible to
    accidentally generate three parallel formatters, in the case where the
    lower of two exponents generates two and then the higher exponent
    (because it's ignoring its own lower bound) generates a third one.
    
    I think in that situation it's correct to just discard the spurious
    higher-exponent formatter. Added a special case for that, and a
    regression test.

 baseout.cpp |   26 ++++++++++++++++++++++++++
 test.sh     |    1 +
 2 files changed, 27 insertions(+)