From 830b15811b369aacb6ecc3df7d35ec2ce1e322e1 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 29 Jun 2012 17:50:16 +0000
Subject: [PATCH] 2012-06-29 19:49 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbtinymt/tests/test32.prg   * contrib/hbtinymt/tests/test64.prg  
   % simplified     ! minor fixes

---
 harbour/ChangeLog                         |  6 ++
 harbour/contrib/hbtinymt/tests/test32.prg | 95 +++++------------------
 harbour/contrib/hbtinymt/tests/test64.prg | 89 ++++++---------------
 3 files changed, 49 insertions(+), 141 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 054396c897..b9ae443e7e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-29 19:49 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbtinymt/tests/test32.prg
+  * contrib/hbtinymt/tests/test64.prg
+    % simplified
+    ! minor fixes
+
 2012-06-29 19:37 UTC+0200 Viktor Szakats (harbour syenar.net)
   + contrib/hbtinymt/tests/test64.prg
     ! another missing file.
diff --git a/harbour/contrib/hbtinymt/tests/test32.prg b/harbour/contrib/hbtinymt/tests/test32.prg
index 2f8b9ba9a5..4a92fa7bbb 100644
--- a/harbour/contrib/hbtinymt/tests/test32.prg
+++ b/harbour/contrib/hbtinymt/tests/test32.prg
@@ -11,88 +11,35 @@
 
 PROCEDURE Main()
 
-   LOCAL i, j
-
    SET DECIMAL TO 0
 
    IF hb_tinymt32_init( 0x123, 0x234, 0x345 )
-      OutStd( "32-bit unsigned integers r, where 0 <= r < 2^32" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( HB_TINYMT32_GENERATE_UINT32(), 11 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
+      TestMatrix( "32-bit unsigned integers r, where 0 <= r < 2^32", {|| PadL( hb_tinymt32_generate_uint32(), 11 ) } )
    ENDIF
-   OutStd( hb_eol() )
 
    SET DECIMAL TO 12
 
    IF hb_tinymt32_init_by_array( { 0x123, 0x234, 0x345 } )
-      OutStd( "Float numbers r, where 0.0 <= r < 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt32_generate_float(), 15 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Float numbers r, where 0.0 <= r < 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt32_generate_float01(), 15 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Float numbers r, where 1.0 <= r < 2.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt32_generate_float12(), 15 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Float numbers r, where 0.0 < r <= 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt32_generate_floatoc(), 15 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Float numbers r, where 0.0 < r < 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt32_generate_floatoo(), 15 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "32-bit precision double numbers r, where 0.0 <= r < 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt32_generate_32double(), 15 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
+      TestMatrix( "Float numbers r, where 0.0 <= r < 1.0", {|| PadL( hb_tinymt32_generate_float(), 15 ) } )
+      TestMatrix( "Float numbers r, where 0.0 <= r < 1.0", {|| PadL( hb_tinymt32_generate_float01(), 15 ) } )
+      TestMatrix( "Float numbers r, where 1.0 <= r < 2.0", {|| PadL( hb_tinymt32_generate_float12(), 15 ) } )
+      TestMatrix( "Float numbers r, where 0.0 < r <= 1.0", {|| PadL( hb_tinymt32_generate_floatoc(), 15 ) } )
+      TestMatrix( "Float numbers r, where 0.0 < r < 1.0" , {|| PadL( hb_tinymt32_generate_floatoo(), 15 ) } )
+      TestMatrix( "32-bit precision double numbers r, where 0.0 <= r < 1.0", {|| PadL( hb_tinymt32_generate_32double(), 15 ) } )
    ENDIF
 
    RETURN
+
+STATIC PROCEDURE TestMatrix( cDescription, bBlock )
+   LOCAL i, j
+
+   OutStd( cDescription + hb_eol() )
+   FOR i := 1 TO 10
+      FOR j := 1 TO 5
+         OutStd( Eval( bBlock ) )
+      NEXT
+      OutStd( hb_eol() )
+   NEXT
+   OutStd( hb_eol() )
+
+   RETURN
diff --git a/harbour/contrib/hbtinymt/tests/test64.prg b/harbour/contrib/hbtinymt/tests/test64.prg
index 1916539438..67a5a33f3e 100644
--- a/harbour/contrib/hbtinymt/tests/test64.prg
+++ b/harbour/contrib/hbtinymt/tests/test64.prg
@@ -6,79 +6,34 @@
 
 PROCEDURE Main()
 
-   LOCAL i, j
-
-   SET DECIMAL TO 20
+   SET DECIMAL TO 0
 
    IF hb_tinymt64_init( 0x123, 0x234, 0x345 )
-      OutStd( "64-bit unsigned integers r, where 0 <= r < 2^64" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( HB_TINYMT64_GENERATE_UINT64(), 22 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
+      TestMatrix( "64-bit unsigned integers r, where 0 <= r < 2^64", {|| PadL( hb_tinymt64_generate_uint64(), 22 ) } )
    ENDIF
-   OutStd( hb_eol() )
 
-   SET DECIMAL TO 12
+   SET DECIMAL TO 22
 
    IF hb_tinymt64_init_by_array( { 0x123, 0x234, 0x345 } )
-      OutStd( "Double numbers r, where 0.0 <= r < 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt64_generate_double(), 30 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Double numbers r, where 0.0 < r <= 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt64_generate_double01(), 30 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Double numbers r, where 1.0 <= r < 2.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt64_generate_double12(), 30 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Double numbers r, where 0.0 < r <= 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt64_generate_doubleoc(), 30 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
-
-      OutStd( "Double numbers r, where 0.0 < r < 1.0" )
-      OutStd( hb_eol() )
-      FOR i := 1 TO 10
-         FOR j := 1 TO 5
-            OutStd( PadL( hb_tinymt64_generate_doubleoo(), 30 ) )
-         NEXT
-         OutStd( hb_eol() )
-      NEXT
-      OutStd( hb_eol() )
-      OutStd( hb_eol() )
+      TestMatrix( "Double numbers r, where 0.0 <= r < 1.0", {|| PadL( hb_tinymt64_generate_double(), 30 ) } )
+      TestMatrix( "Double numbers r, where 0.0 < r <= 1.0", {|| PadL( hb_tinymt64_generate_double01(), 30 ) } )
+      TestMatrix( "Double numbers r, where 1.0 <= r < 2.0", {|| PadL( hb_tinymt64_generate_double12(), 30 ) } )
+      TestMatrix( "Double numbers r, where 0.0 < r <= 1.0", {|| PadL( hb_tinymt64_generate_doubleoc(), 30 ) } )
+      TestMatrix( "Double numbers r, where 0.0 < r < 1.0" , {|| PadL( hb_tinymt64_generate_doubleoo(), 30 ) } )
    ENDIF
 
    RETURN
+
+STATIC PROCEDURE TestMatrix( cDescription, bBlock )
+   LOCAL i, j
+
+   OutStd( cDescription + hb_eol() )
+   FOR i := 1 TO 10
+      FOR j := 1 TO 5
+         OutStd( Eval( bBlock ) )
+      NEXT
+      OutStd( hb_eol() )
+   NEXT
+   OutStd( hb_eol() )
+
+   RETURN