From d478e5e9cddc22958033c67110d3d708e4aab652 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 17 Nov 1999 02:29:42 +0000 Subject: [PATCH] 19991117-03:15 GMT+1 Victor Szel --- harbour/ChangeLog | 2 +- harbour/tests/rtl_test.prg | 48 ++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 146c1d77f0..3f64f66372 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -45,7 +45,7 @@ * include/hbver.h * Version number updated to reflect the deep changes. * include/compiler.h - * Uncommented code removed + * Commented code removed 19991116-21:55 GMT+1 Ryszard Glab diff --git a/harbour/tests/rtl_test.prg b/harbour/tests/rtl_test.prg index 8c8f6ef7b2..13e75cedc6 100644 --- a/harbour/tests/rtl_test.prg +++ b/harbour/tests/rtl_test.prg @@ -261,7 +261,10 @@ STATIC FUNCTION Main_HVM() /* Special internal messages */ -// TEST_LINE( NIL:className , "NIL" ) +/* Harbour compiler not yet handles these */ +#ifndef __HARBOUR__ + TEST_LINE( NIL:className , "NIL" ) +#endif ) TEST_LINE( "":className , "CHARACTER" ) TEST_LINE( 0:className , "NUMERIC" ) TEST_LINE( SToD( "" ):className , "DATE" ) @@ -269,7 +272,10 @@ STATIC FUNCTION Main_HVM() TEST_LINE( {|| nil }:className , "BLOCK" ) TEST_LINE( {}:className , "ARRAY" ) TEST_LINE( ErrorNew():className , "ERROR" ) -// TEST_LINE( NIL:classH , 0 ) +/* Harbour compiler not yet handles these */ +#ifndef __HARBOUR__ + TEST_LINE( NIL:classH , 0 ) +#endif TEST_LINE( "":classH , 0 ) TEST_LINE( 0:classH , 0 ) TEST_LINE( SToD( "" ):classH , 0 ) @@ -278,7 +284,10 @@ STATIC FUNCTION Main_HVM() TEST_LINE( {}:classH , 0 ) TEST_LINE( ErrorNew():classH > 0 , .T. ) -// TEST_LINE( suNIL:className , "NIL" ) +/* Harbour compiler not yet handles these */ +#ifndef __HARBOUR__ + TEST_LINE( suNIL:className , "NIL" ) +#endif TEST_LINE( scString:className , "CHARACTER" ) TEST_LINE( snIntP:className , "NUMERIC" ) TEST_LINE( sdDateE:className , "DATE" ) @@ -286,7 +295,10 @@ STATIC FUNCTION Main_HVM() TEST_LINE( sbBlock:className , "BLOCK" ) TEST_LINE( saArray:className , "ARRAY" ) TEST_LINE( soObject:className , "ERROR" ) -// TEST_LINE( suNIL:classH , 0 ) +/* Harbour compiler not yet handles these */ +#ifndef __HARBOUR__ + TEST_LINE( suNIL:classH , 0 ) +#endif TEST_LINE( scString:classH , 0 ) TEST_LINE( snIntP:classH , 0 ) TEST_LINE( sdDateE:classH , 0 ) @@ -629,7 +641,7 @@ STATIC FUNCTION Main_HVM() TEST_LINE( "A " - " B" , "A B " ) TEST_LINE( " " - "B " , "B " ) -// TEST_LINE( 1 / 0 , "E BASE 1340 Zero divisor / F:S" ) + TEST_LINE( 1 / 0 , "E BASE 1340 Zero divisor / F:S" ) TEST_LINE( 1 / NIL , "E BASE 1084 Argument error / F:S" ) TEST_LINE( 1 * NIL , "E BASE 1083 Argument error * F:S" ) TEST_LINE( 1 ** NIL , "E BASE 1088 Argument error ^ F:S" ) @@ -797,7 +809,7 @@ STATIC FUNCTION Main_HVM() TEST_LINE( .NOT. .F. , .T. ) TEST_LINE( .NOT. 1 , "E BASE 1077 Argument error .NOT. F:S" ) -// TEST_LINE( iif( "A", ":T:", ":F:" ) , "E BASE 1066 Argument error conditional " ) + TEST_LINE( iif( "A", ":T:", ":F:" ) , "E BASE 1066 Argument error conditional " ) TEST_LINE( iif( .T., ":T:", ":F:" ) , ":T:" ) TEST_LINE( iif( .F., ":T:", ":F:" ) , ":F:" ) @@ -812,17 +824,17 @@ STATIC FUNCTION Main_HVM() TEST_LINE( &mxNotHere. , "E BASE 1003 Variable does not exist MXUNDECL F:R" ) #endif -// TEST_LINE( saArray[ 0 ] , "E BASE 1132 Bound error array access " ) -// TEST_LINE( saArray[ 0 ] := 1 , "E BASE 1133 Bound error array assign " ) + TEST_LINE( saArray[ 0 ] , "E BASE 1132 Bound error array access " ) + TEST_LINE( saArray[ 0 ] := 1 , "E BASE 1133 Bound error array assign " ) TEST_LINE( saArray[ 1000 ] , "E BASE 1132 Bound error array access " ) TEST_LINE( saArray[ 1000 ] := 1 , "E BASE 1133 Bound error array assign " ) -// TEST_LINE( saArray[ -1 ] , "E BASE 1132 Bound error array access " ) -// TEST_LINE( saArray[ -1 ] := 1 , "E BASE 1133 Bound error array assign " ) -// TEST_LINE( saArray[ "1" ] , "E BASE 1068 Argument error array access F:S" ) -// TEST_LINE( saArray[ "1" ] := 1 , "E BASE 1069 Argument error array assign " ) + TEST_LINE( saArray[ -1 ] , "E BASE 1132 Bound error array access " ) + TEST_LINE( saArray[ -1 ] := 1 , "E BASE 1133 Bound error array assign " ) + TEST_LINE( saArray[ "1" ] , "E BASE 1068 Argument error array access F:S" ) + TEST_LINE( saArray[ "1" ] := 1 , "E BASE 1069 Argument error array assign " ) /* Alias */ -/* + TEST_LINE( ("NOTHERE")->NOFIELD , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( (mcString)->NOFIELD , "E BASE 1002 Alias does not exist HELLO F:R" ) TEST_Line( ({})->NOFIELD , "E BASE 1065 Argument error & F:S" ) @@ -834,8 +846,7 @@ STATIC FUNCTION Main_HVM() TEST_LINE( (1.5)->NOFIELD , "E BASE 1003 Variable does not exist NOFIELD F:R" ) TEST_LINE( (SToD(""))->NOFIELD , "E BASE 1065 Argument error & F:S" ) TEST_LINE( (ErrorNew())->NOFIELD , "E BASE 1065 Argument error & F:S" ) -*/ -/* + TEST_LINE( ("NOTHERE")->(Eof()) , .T. ) TEST_LINE( (mcString)->(Eof()) , .T. ) TEST_LINE( ({})->(Eof()) , .T. ) @@ -847,8 +858,7 @@ STATIC FUNCTION Main_HVM() TEST_LINE( (1.5)->(Eof()) , .T. ) TEST_LINE( (SToD(""))->(Eof()) , .T. ) TEST_LINE( (ErrorNew())->(Eof()) , .T. ) -*/ -/* + TEST_LINE( NOTHERE->NOFIELD , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( NOTHERE->("NOFIELD") , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( NOTHERE->(mcString) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) @@ -861,8 +871,7 @@ STATIC FUNCTION Main_HVM() TEST_LINE( NOTHERE->(1.5) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( NOTHERE->(SToD("")) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) TEST_LINE( NOTHERE->(ErrorNew()) , "E BASE 1002 Alias does not exist NOTHERE F:R" ) -*/ -/* + TEST_LINE( 200->NOFIELD , "E BASE 1003 Variable does not exist NOFIELD F:R" ) TEST_LINE( 200->("NOFIELD") , "NOFIELD" ) TEST_LINE( 200->(mcString) , "HELLO" ) @@ -875,7 +884,6 @@ STATIC FUNCTION Main_HVM() TEST_LINE( 200->(1.5) , 1.5 ) TEST_LINE( 200->(SToD("")) , SToD(" ") ) TEST_LINE( 200->(ErrorNew()) , "ERROR Object" ) -*/ TEST_LINE( soObject:hello , "E BASE 1004 No exported method HELLO F:S" ) TEST_LINE( soObject:hello := 1 , "E BASE 1005 No exported variable HELLO F:S" )