* stream.c (vformat): Left-adjusted field is now specified

using < rather than '-'. The +, space and leading 0 are
specified on the precision, not the width.

2 files changed, 15 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 8eb46034..0fbdb2f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-12-22  Kaz Kylheku  <kaz@kylheku.com>
 
+	* stream.c (vformat): Left-adjusted field is now  specified
+	using < rather than '-'. The +, space and leading 0 are
+	specified on the precision, not the width.
+
+2011-12-22  Kaz Kylheku  <kaz@kylheku.com>
+
 	* rand.c (random): Fix for 64 bit fixnums: stick two random numbers
 	together. Otherwise for fixnum moduli, we get only a 32 bit number no
 	matter what the modulus is.
diff --git a/stream.c b/stream.c
index aecb621c..f959898e 100644
--- a/stream.c
+++ b/stream.c
@@ -882,21 +882,13 @@ val vformat(val stream, val fmtstr, va_list vl)
           put_char(stream, chr('~'));
           state = vf_init;
           continue;
-        case '-':
+        case '<':
           left = 1;
           continue;
-        case '+': case ' ':
-          sign = ch;
-          continue;
         case ',':
           state = vf_precision;
           continue;
-        case '0':
-          saved_state = state;
-          state = vf_digits;
-          zeropad = 1;
-          continue;
-        case '1': case '2': case '3': case '4': case '5':
+        case '0': case '1': case '2': case '3': case '4': case '5':
         case '6': case '7': case '8': case '9':
           saved_state = state;
           state = vf_digits;
@@ -915,12 +907,18 @@ val vformat(val stream, val fmtstr, va_list vl)
         break;
       case vf_precision:
         switch (ch) {
-        case '0': case '1': case '2': case '3': case '4': case '5':
+        case '0':
+          zeropad = 1;
+          /* fallthrough */
+        case '1': case '2': case '3': case '4': case '5':
         case '6': case '7': case '8': case '9':
           saved_state = state;
           state = vf_digits;
           digits = ch - '0';
           continue;
+        case '+': case ' ':
+          sign = ch;
+          continue;
         case '*':
           obj = va_arg(vl, val);
           width = c_num(obj);