Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Now calling unicode::is_Nd() only when necessary.

Now calling unicode::is_Nd() only when necessary.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-04-04T16-18-40.299Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-04-04T16-18-40.299Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-04-04T17-54-37.264Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-04-04T17-54-37.264Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/runtime/numerics/format_integer.cpp'
--- src/runtime/numerics/format_integer.cpp	2013-04-01 02:22:49 +0000
+++ src/runtime/numerics/format_integer.cpp	2013-04-04 16:16:28 +0000
@@ -237,18 +237,17 @@
           if ( !mandatory_digits && !mandatory_grouping_seps && n_i == n_end )
             break;
           unicode::code_point const pic_cp = *pic_i++;
-          bool const is_mandatory_digit = unicode::is_Nd( pic_cp );
-          if ( pic_cp == '#' || is_mandatory_digit ) {
+          if ( pic_cp == '#' || unicode::is_Nd( pic_cp ) ) {
             u_dest.insert( 0, 1, digit_cp );
             if ( n_i != n_end ) ++n_i;
             ++digit_pos;
+            if ( pic_cp != '#' )
+              --mandatory_digits;
           } else {                      // must be a grouping-separator
             grouping_cp = pic_cp;       // remember for later
             u_dest.insert( 0, 1, grouping_cp );
             --mandatory_grouping_seps;
           }
-          if ( is_mandatory_digit )
-            --mandatory_digits;
         } else {                        // have exhausted the picture
           if ( pic.primary.grouping_interval &&
                digit_pos % pic.primary.grouping_interval == 0 ) {