1 files changed, 43 insertions, 41 deletions

diff --git a/src/main/smp/sys/text.smp b/src/main/smp/sys/text.smp
index a414ff45..43698f22 100644
--- a/src/main/smp/sys/text.smp
+++ b/src/main/smp/sys/text.smp
@@ -5,78 +5,75 @@
 val begin = { -> new aryu8(); };
 
 val end = { aryu8 b ->
-    val bytes = new u8[b.len];
-    ary.copy(bytes,0,b.buf,0,b.len);
-    u8[~] result = bytes;
-    result;
+    new u8[~b.len]{ i64 i -> b.buf[i]; };
 };
 
 val _pad = { !aryu8 b, i64 n, u8 c ->
-    for( i64 i=0; i<n; i++ ) b.add(c);
+    for( i64 i = 0; i < n; i++ ) b.add(c);
     b;
 };
 
 val string = { !aryu8 b, u8[~] s, i64 spec, i64 width, i64 precision ->
-    i64 len=s#;
-    if( precision>=0 && precision<len ) len=precision;
-    i64 pad=width-len;
+    i64 len = s#;
+    if( precision >= 0 && precision < len ) len = precision;
+    i64 pad = width-len;
     if( !(spec&256) ) _pad(b,pad,' ');
-    for( i64 i=0; i<len; i++ ) b.add(s[i]);
+    for( i64 i = 0; i < len; i++ ) b.add(s[i]);
     if( spec&256 ) _pad(b,pad,' ');
     b;
 };
 
 val integer = { !aryu8 b, i64 value, i64 spec, i64 width, i64 precision ->
-    i64 kind=spec&255;
-    if( kind=='b' ) return string(b,value ? "true" : "false",spec,width,-1);
-    if( kind=='c' ) {
+    i64 kind = spec&255;
+    if( kind == 'b' ) return string(b,value ? "true" : "false",spec,width,-1);
+    if( kind == 'c' ) {
         if( !(spec&256) ) _pad(b,width-1,' ');
-        u8 c=value;
+        u8 c = value;
         b.add(c);
         if( spec&256 ) _pad(b,width-1,' ');
         return b;
     }
-    bool signed=kind==0 || kind=='d' || kind=='i';
-    i64 base=kind=='o' ? 8 : (kind=='x' || kind=='X' ? 16 : 10);
-    u8[~] alphabet=kind=='X' ? "0123456789ABCDEF" : "0123456789abcdef";
-    val digits=new u8[22]; // Maximum: 22 octal digits for a 64-bit integer.
-    i64 count=0, n=value;
+    bool signed = kind == 0 || kind == 'd' || kind == 'i';
+    i64 base = kind == 'o' ? 8 : (kind == 'x' || kind == 'X' ? 16 : 10);
+    u8[~] alphabet = kind == 'X' ? "0123456789ABCDEF" : "0123456789abcdef";
+    val digits = new u8[22]; // Maximum: 22 octal digits for a 64-bit integer.
+    i64 count = 0, n = value;
     // Signed decimal stays nonpositive, including the minimum i64.
-    if( signed && n>0 ) n=-n;
-    if( n==0 && precision!=0 ) digits[count++]='0';
-    while( n!=0 ) {
-        i64 q=0, r=0;
-        if( signed ) { q=n/base; r=q*base-n; }
+    if( signed && n > 0 ) n = -n;
+    if( n == 0 && precision != 0 ) digits[count++] = '0';
+    while( n != 0 ) {
+        i64 q = 0, r = 0;
+        if( signed ) { q = n/base; r = q*base-n; }
         else {
             // Unsigned division without a u64 type. Halving first makes
             // the dividend nonnegative; the remainder needs at most one fix.
-            q=((n>>>1)/base)*2;
-            r=n-q*base;
-            if( r>=base ) { q++; r-=base; }
+            q = ((n>>>1)/base)*2;
+            r = n-q*base;
+            if( r >= base ) { q++; r -= base; }
         }
-        digits[count++]=alphabet[r];
-        n=q;
+        digits[count++] = alphabet[r];
+        n = q;
     }
-    u8[~] !prefix="";
+    u8[~] !prefix = "";
     if( signed ) {
-        if( value<0 ) prefix="-";
-        else if( spec&512 ) prefix="+";
-        else if( spec&1024 ) prefix=" ";
-    } else if( (spec&2048) && value!=0 ) {
-        if( kind=='x' ) prefix="0x";
-        if( kind=='X' ) prefix="0X";
+        if( value < 0 ) prefix = "-";
+        else if( spec&512 ) prefix = "+";
+        else if( spec&1024 ) prefix = " ";
+    } else if( (spec&2048) && value != 0 ) {
+        if( kind == 'x' ) prefix = "0x";
+        if( kind == 'X' ) prefix = "0X";
     }
-    i64 zeros=precision>count ? precision-count : 0;
+    i64 zeros = precision > count ? precision-count : 0;
     // Alternate octal always begins with a zero, including precision-zero 0.
-    if( kind=='o' && (spec&2048) && zeros==0 && (count==0 || digits[count-1]!='0') ) zeros=1;
-    i64 pad=width-prefix#-zeros-count;
-    bool left=(spec&256)!=0;
-    bool zero=(spec&4096)!=0 && precision<0 && !left;
+    if( kind == 'o' && (spec&2048) && zeros == 0 && (count == 0 || digits[count-1] != '0') ) zeros = 1;
+    i64 pad = width-prefix#-zeros-count;
+    bool left = (spec&256) != 0;
+    bool zero = (spec&4096) != 0 && precision < 0 && !left;
     if( !left && !zero ) _pad(b,pad,' ');
     b.addAry(prefix);
     if( zero ) _pad(b,pad,'0');
     _pad(b,zeros,'0');
-    while( count>0 ) b.add(digits[--count]);
+    while( count > 0 ) b.add(digits[--count]);
     if( left ) _pad(b,pad,' ');
     b;
 };
@@ -96,3 +93,8 @@ val f64  = { f64  x -> end(floating(begin(),x, 0 ,0,-1)); };
 val char = { i64  x -> end(integer (begin(),x,'c',0,-1)); };
 val bool = { bool x -> end(integer (begin(),x,'b',0,-1)); };
 val hex  = { i64  x -> end(integer (begin(),x,'x',0,-1)); };
+
+// Time selectors occupy spec bits 16..23; padding shares string formatting.
+val time = { !aryu8 b, i64 value, i64 spec, i64 width, i64 precision ->
+    string(b,sys.time.format(value,(spec>>>16)&255),spec,width,-1);
+};