2013-12-27: better output

better output

diff --git a/examples/tinyenc.c b/examples/tinyenc.c
--- a/examples/tinyenc.c
+++ b/examples/tinyenc.c
@@ -7,13 +7,13 @@ void encrypt (uint32_t* v, uint32_t* k) 
     uint32_t k0=k[0], k1=k[1], k2=k[2], k3=k[3];   /* cache key */
     for (i=0; i < 32; i++) {                       /* basic cycle start */
         sum += delta;
-        printf("v0: %u, v1: %u\n", v0, v1);
-        printf("sum: %u, (v1<<4) + k0: %u, (v1 + sum): %u,  (v1>>5) + k1: %u\n", sum, ((v1<<4) + k0), (v1 + sum), ((v1>>5) + k1));
+        //        printf("v0: %u, v1: %u\n", v0, v1);
+        //        printf("sum: %u, (v1<<4) + k0: %u, (v1 + sum): %u,  (v1>>5) + k1: %u\n", sum, ((v1<<4) + k0), (v1 + sum), ((v1>>5) + k1));
         v0 += ((v1<<4) + k0) ^ (v1 + sum) ^ ((v1>>5) + k1);
         v1 += ((v0<<4) + k2) ^ (v0 + sum) ^ ((v0>>5) + k3);  
     }                                              /* end cycle */
-    printf("v0: %u, v1: %u\n", v0, v1);
-    printf("k0: %u, k1: %u, k2: %u, k3: %u\n", k0, k1, k2, k3);
+    //    printf("v0: %u, v1: %u\n", v0, v1);
+    //    printf("k0: %u, k1: %u, k2: %u, k3: %u\n", k0, k1, k2, k3);
     v[0]=v0; v[1]=v1;
 }
  
diff --git a/examples/tinyenc.w b/examples/tinyenc.w
--- a/examples/tinyenc.w
+++ b/examples/tinyenc.w
@@ -13,11 +13,11 @@ define : uint32 number
   modulo number : integer-expt 2 32
 
 define : v0change k0 v1 sum k1
-         format #t "sum: ~A, + k0 : ash v1 4: ~A, + v1 sum: ~A, + k1 : ash v1 -5: ~A\n"
-           . sum
-           uint32 : + k0 : ash v1 4
-           uint32 : + v1 sum
-           uint32 : + k1 : uint32 : ash v1 -5
+;         format #t "sum: ~A, + k0 : ash v1 4: ~A, + v1 sum: ~A, + k1 : ash v1 -5: ~A\n"
+;           . sum
+;           uint32 : + k0 : ash v1 4
+;           uint32 : + v1 sum
+;           uint32 : + k1 : uint32 : ash v1 -5
          logxor
            uint32 : + k0 : ash v1 4
            uint32 : + v1 sum
@@ -58,8 +58,8 @@ define : encrypt v k
         cycle 0
         v0 v0
         v1 v1
-      format #t "v0: ~A, v1: ~A\n" v0 v1
-      if (= cycle 32) : format #t "k0: ~A, k1: ~A, k2: ~A, k3: ~A\n" k0 k1 k2 k3
+;      format #t "v0: ~A, v1: ~A\n" v0 v1
+ ;     if (= cycle 32) : format #t "k0: ~A, k1: ~A, k2: ~A, k3: ~A\n" k0 k1 k2 k3
       if : = cycle 32
          + v1 : * v0 : integer-expt 2 32
          let : : v0tmp : uint32 : + v0 : v0change k0 v1 sum k1
@@ -93,15 +93,13 @@ define : decrypt v k
              . v1tmp
 
 
-;display 
-;    decrypt
-;        encrypt 
-;          . 5
-;          . 9
-;        . 9
-;newline
-display
+format #t "decrypted: ~A\n" 
+    decrypt
         encrypt 
           . 5
           . 9
-newline
+        . 9
+format #t "encrypted: ~A\n" 
+        encrypt 
+          . 5
+          . 9