Changes in / [381132b:6437ce4]

Files:

• libcfa/src/iostream.cfa (modified) (4 diffs)
• src/Parser/ParseNode.h (modified) (2 diffs)
• tests/.expect/manipulatorsOutput3.txt (deleted)
• tests/.expect/manipulatorsOutput3.x64.txt (added)
• tests/copyfile.cfa (modified) (2 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul  5 08:14:07 2020
-// Update Count     : 1063
+// Last Modified On : Mon Jul  6 08:49:48 2020
+// Update Count     : 1064
 //
 
@@ -674 +674 @@
                 base_128( os, val / power, power, f, maxdig, bits, cnt + 1 ); // recursive
                 f.val = val % power;
-                if ( cnt == 1 && f.flags.left ) { wd = f.wd; f.wd = maxdig; } // copy f.wd across printing of middle value
+                if ( cnt == 1 && f.flags.left ) { wd = f.wd; f.wd = maxdig; } // copy f.wd and reset for printing middle chunk
                 (ostype &)(os | f);
                 if ( cnt == 1 ) {
-                        if ( f.flags.left ) { wd -= maxdig; f.wd = wd < 0 ? 1 : wd; }
+                        if ( f.flags.left ) { wd -= maxdig; f.wd = wd < 0 ? 1 : wd; } // update and restore f.wd for printing end chunk
                         sepOff( os );                                                           // no seperator between chunks
                 } // if
-        } else {
+        } else {                                                                                        // print start chunk
                 f.val = val;
                 // f.pc is unsigned => use wd
@@ -693 +693 @@
                         if ( cnt != 0 ) {                                                       // value >= 2^64 ?
                                 unsigned int dig, bs = 0;
-                                // compute size of prefix base and digits
+                                // compute size of prefix digits and base
                                 if ( f.base == 'd' || f.base == 'u' ) { // no base prefix
                                         dig = ceil( log10( f.val ) );           // use floating-point
@@ -717 +717 @@
                 (ostype &)(os | f);
 
+                // remaining middle and end chunks are padded with 0s on the left
                 if ( ! f.flags.left ) { f.flags.pad0 = true; f.flags.pc = false; } // left pad with 0s
                 else { f.pc = maxdig; f.flags.pc = true; }              // left pad with precision
+
                 if ( cnt != 0 ) sepOff( os );                                   // no seperator between chunks
-                f.wd = wd;
-                f.flags.sign = false;                                                   // no +/- sign
-                f.flags.nobsdp = true;                                                  // no base prefix
+                f.wd = wd;                                                                              // reset f.wd for next chunk
+                f.flags.sign = false;                                                   // no leading +/- sign
+                f.flags.nobsdp = true;                                                  // no leading base prefix
         } // if
 } // base_128

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  7 17:56:02 2020
-// Update Count     : 891
+// Last Modified On : Mon Jul  6 09:33:32 2020
+// Update Count     : 892
 //
 
@@ -86 +86 @@
 class InitializerNode : public ParseNode {
   public:
-        InitializerNode( ExpressionNode *, bool aggrp = false,  ExpressionNode * des = nullptr );
+        InitializerNode( ExpressionNode *, bool aggrp = false, ExpressionNode * des = nullptr );
         InitializerNode( InitializerNode *, bool aggrp = false, ExpressionNode * des = nullptr );
         InitializerNode( bool isDelete );

tests/copyfile.cfa

@@ -10 +10 @@
 // Created On       : Fri Jun 19 13:44:05 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 19 17:58:03 2020
-// Update Count     : 4
+// Last Modified On : Sun Jul  5 11:27:43 2020
+// Update Count     : 5
 // 
 
@@ -22 +22 @@
 
         try {
-                choose ( argc ) {
+                choose ( argc ) {                                                               // terminate if command-line errors
                   case 2, 3:
                         open( in, argv[1] );                                            // open input file first as output creates file
                         if ( argc == 3 ) open( out, argv[2] );          // do not create output unless input opens
                   case 1: ;                                                                             // use default files
-                  default:
+                  default:                                                                              // wrong number of options
                         exit | "Usage" | argv[0] | "[ input-file (default stdin) [ output-file (default stdout) ] ]";
                 } // choose