Merge branch 'sprintf' into master

Merge the sprintf branch from 2 years ago into master for better
handling of %b spacing.

Author: samcv

src/HLL/sprintf.nqp

@@ -168,26 +168,35 @@ my module sprintf {
 
         method directive:sym<b>($/) {
             my $next := next_argument($/);
+            my int $i := 0;
             CATCH {
                 bad-type-for-directive($next, 'b');
             }
             my $int := intify($next);
-            my $positive := has_flag($/, 'plus') && nqp::isgt_I($int, $zero) ?? 1 !! 0;
-            $int := nqp::base_I($int, 2);
-            my $pre := ($<sym> eq 'b' ?? '0b' !! '0B') if $int ne '0' && has_flag($/, 'hash');
+            my $pad := padding_char($/);
+            my $sign := nqp::islt_I($int, $zero) ?? '-'
+                     !! has_flag($/, 'plus') ?? '+'
+                     !! has_flag($/, 'space') ?? ' '
+                     !! '';
+            $int := nqp::base_I(nqp::abs_I($int, $knowhow), 2);
+            my $size := $<size> ?? $<size>.made !! 0;
+            my $pre := '';
+            $pre := ($<sym> eq 'b' ?? '0b' !! '0B') if $int ne '0' && has_flag($/, 'hash');
             if nqp::chars($<precision>) {
-                $int := '' if $<precision>.made == 0 && $int == 0;
-                $int := $pre ~ infix_x('0', $<precision>.made - nqp::chars($int)) ~ $int;
+                $int := ($<precision>.made == 0 && $int == 0) ?? ''
+                     !! $sign ~ $pre ~ infix_x('0', $<precision>.made - nqp::chars($int)) ~ $int;
             }
             else {
-                $int := $pre ~ $int
-            }
-            if $positive {
-                $int := '+' ~ $int;
+                if $pad ne ' ' && $size {
+                    my $chars_sign_pre := $sign ?? nqp::chars($pre) + 1 !! nqp::chars($pre);
+                    $int := $sign ~ $pre ~ infix_x($pad, $size - $chars_sign_pre - nqp::chars($int)) ~ $int;
+                } else {
+                    $int := $sign ~ $pre ~ $int;
+                }
             }
-
             make $int;
         }
+
         method directive:sym<c>($/) {
             my $next := next_argument($/);
             CATCH {

t/hll/06-sprintf.t

@@ -137,7 +137,7 @@ is(nqp::sprintf('%#3.3b', [0]), '000', '%b, width and precision but zero value')
 is(nqp::sprintf('%#3.4b', [0]), '0000', '%b, width and precision but zero value, overlong');
 is(nqp::sprintf('%.0b', [1]), '1', '%b, precision zero and value');
 is(nqp::sprintf('%+.0b', [1]), '+1', '%b, precision zero, plus sign and value');
-is(nqp::sprintf('% .0b', [1]), '1', '%b, precision zero, space char and value');
+is(nqp::sprintf('% .0b', [1]), ' 1', '%b, precision zero, space char and value');
 is(nqp::sprintf('%-.0b', [1]), '1', '%b, precision zero, hash and value');
 is(nqp::sprintf('%#.0b', [1]), '0b1', '%b, width, zero precision, no value');
 is(nqp::sprintf('%#3.0b', [1]), '0b1', '%b, width, zero precision but value');