From 15ba2b0cd61c4504eab39f04c36579aa1aecac37 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Wed, 8 Sep 1999 03:06:13 +0000
Subject: [PATCH] 19990908-04:52 GMT+1

---
 harbour/ChangeLog                  |  12 ++++++++
 harbour/include/clipdefs.h         |   9 +-----
 harbour/include/error.api          | Bin 1263 -> 1290 bytes
 harbour/include/extend.api         |   3 ++
 harbour/include/item.api           |   2 ++
 harbour/source/hbpp/table.c        |   7 +++--
 harbour/tests/working/rtl_test.prg |  46 ++++++++++++++++++++++++++---
 7 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index dee0787cc4..071e31d271 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,15 @@
+19990908-04:52 GMT+1 Victor Szel <info@szelvesz.hu>
+  * tests/working/rtl_test.prg
+    + Some tests now are only included when compiled with Harbour, to skip
+      obvious bugs to show up in Clipper.
+  * source/hbpp/table.c
+    + _SET_COUNT added.
+  * include/clipdefs.h
+    include/error.api
+    include/item.api
+    include/extend.api
+    ! Some fixes.
+
 19990908-03:14 GMT+1 Victor Szel <info@szelvesz.hu>
   * tests/working/rtl_test.prg
     + Some ==/= tests added for strings.
diff --git a/harbour/include/clipdefs.h b/harbour/include/clipdefs.h
index 2949a2f580..f7f76da147 100644
--- a/harbour/include/clipdefs.h
+++ b/harbour/include/clipdefs.h
@@ -11,14 +11,7 @@
 #ifndef HB_CLIPDEFS_H_
 #define HB_CLIPDEFS_H_
 
-#include "hbdefs.h"
-
-/* Types moved here from *.api files */
-
-typedef PHB_ITEM  ERRORP;
-typedef double    XDOUBLE;
-typedef PHB_ITEM  ITEM;
-typedef PEVALINFO EVALINFOP;
+#include "extend.h"
 
 /* Old types */
 
diff --git a/harbour/include/error.api b/harbour/include/error.api
index c7214f0e39207e33002363e5ef2a1e5b5ae60557..fa457f9a5379b120df80eba8dea3b94603bd248c 100644
GIT binary patch
delta 37
scmaFQ*~K;CloVG<WkG66YMMfThf};~h^w!Hf@@Hae^7w+#*=C+0Q*-AeE<Le

delta 10
RcmeC;de1rG)W)Z(EC3pk1f~E0

diff --git a/harbour/include/extend.api b/harbour/include/extend.api
index f9074cc45d..5476aaa738 100644
--- a/harbour/include/extend.api
+++ b/harbour/include/extend.api
@@ -11,6 +11,9 @@
 #include "clipdefs.h"
 #include "extend.h"
 
+typedef PHB_ITEM  ITEM;
+typedef double    XDOUBLE;
+
 /* Compatible defines */
 
 #define UNDEF           IT_NIL
diff --git a/harbour/include/item.api b/harbour/include/item.api
index 4a04f3e70b..197a3e126a 100644
--- a/harbour/include/item.api
+++ b/harbour/include/item.api
@@ -10,6 +10,8 @@
 
 #include "itemapi.h"
 
+typedef PEVALINFO EVALINFOP;
+
 #define _evalLaunch     hb_evalLaunch
 #define _evalNew        hb_evalNew
 #define _evalPutParam   hb_evalPutParam
diff --git a/harbour/source/hbpp/table.c b/harbour/source/hbpp/table.c
index fc40dec275..8429c7c5a3 100644
--- a/harbour/source/hbpp/table.c
+++ b/harbour/source/hbpp/table.c
@@ -75,9 +75,10 @@
    static DEFINES sD___38 = {"_SET_TYPEAHEAD",NULL,-1,"14", &sD___37 };
    static DEFINES sD___39 = {"_SET_UNIQUE",NULL,-1,"10", &sD___38 };
    static DEFINES sD___40 = {"_SET_WRAP",NULL,-1,"35", &sD___39 };
-   static DEFINES sD___41 = {"_SET_CH",NULL,-1,NULL, &sD___40 };
-   static DEFINES sD___42 = {"_DFSET","x,y",2,"Set( _SET_DATEFORMAT, if(__SetCentury(), x, y) )", &sD___41 };
-   DEFINES *topDefine = &sD___42;
+   static DEFINES sD___41 = {"_SET_COUNT",NULL,-1,"39", &sD___40 };
+   static DEFINES sD___42 = {"_SET_CH",NULL,-1,NULL, &sD___41 };
+   static DEFINES sD___43 = {"_DFSET","x,y",2,"Set( _SET_DATEFORMAT, if(__SetCentury(), x, y) )", &sD___42 };
+   DEFINES *topDefine = &sD___43;
 
    static COMMANDS sC___1 = {0,"NOTE","\1A30",NULL,NULL };
    static COMMANDS sC___2 = {0,"DO","WHILE \1A00","while \1A00",&sC___1 };
diff --git a/harbour/tests/working/rtl_test.prg b/harbour/tests/working/rtl_test.prg
index d125c679a4..180efcc793 100644
--- a/harbour/tests/working/rtl_test.prg
+++ b/harbour/tests/working/rtl_test.prg
@@ -164,6 +164,7 @@ STATIC FUNCTION Main_HVM()
    TEST_LINE( ValType(  suNIL     )           , "U"   )
    TEST_LINE( ValType(  sbBlock   )           , "B"   )
    TEST_LINE( ValType(  saArray   )           , "A"   )
+#ifdef __HARBOUR__
    TEST_LINE( ValType( @scString  )           , "C"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @scStringE )           , "C"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @scStringZ )           , "C"   ) /* Bug in CA-Cl*pper, it will return "U" */
@@ -183,6 +184,7 @@ STATIC FUNCTION Main_HVM()
    TEST_LINE( ValType( @suNIL     )           , "U"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @sbBlock   )           , "B"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @saArray   )           , "A"   ) /* Bug in CA-Cl*pper, it will return "U" */
+#endif
    TEST_LINE( ValType(  mcString  )           , "C"   )
    TEST_LINE( ValType(  mcStringE )           , "C"   )
    TEST_LINE( ValType(  mcStringZ )           , "C"   )
@@ -202,6 +204,7 @@ STATIC FUNCTION Main_HVM()
    TEST_LINE( ValType(  muNIL     )           , "U"   )
    TEST_LINE( ValType(  mbBlock   )           , "B"   )
    TEST_LINE( ValType(  maArray   )           , "A"   )
+#ifdef __HARBOUR__
    TEST_LINE( ValType( @mcString  )           , "C"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @mcStringE )           , "C"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @mcStringZ )           , "C"   ) /* Bug in CA-Cl*pper, it will return "U" */
@@ -221,6 +224,7 @@ STATIC FUNCTION Main_HVM()
    TEST_LINE( ValType( @muNIL     )           , "U"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @mbBlock   )           , "B"   ) /* Bug in CA-Cl*pper, it will return "U" */
    TEST_LINE( ValType( @maArray   )           , "A"   ) /* Bug in CA-Cl*pper, it will return "U" */
+#endif
 
    /* Special internal messages */
 
@@ -556,10 +560,12 @@ STATIC FUNCTION Main_HVM()
 
    /* EMPTY() */
 
+#ifdef __HARBOUR__
    TEST_LINE( Empty( @scString              ) , .F.                                    ) /* Bug in CA-Cl*pper, it will return .T. */
    TEST_LINE( Empty( @scStringE             ) , .T.                                    )
    TEST_LINE( Empty( @snIntP                ) , .F.                                    ) /* Bug in CA-Cl*pper, it will return .T. */
    TEST_LINE( Empty( @snIntZ                ) , .T.                                    )
+#endif
    TEST_LINE( Empty( "Hallo"                ) , .F.                                    )
    TEST_LINE( Empty( ""                     ) , .T.                                    )
    TEST_LINE( Empty( "  "                   ) , .T.                                    )
@@ -599,7 +605,9 @@ STATIC FUNCTION Main_MATH()
 
    TEST_LINE( Log("A")                        , "E BASE 1095 Argument error LOG F:S"   )
    TEST_LINE( Str(Log(snIntP))                , "         2.30"                        )
+#ifdef __HARBOUR__
    TEST_LINE( Str(Log(@snIntP))               , "         2.30"                        ) /* Bug in CA-Cl*pper, it returns: "E BASE 1095 Argument error LOG F:S" */
+#endif
 
    /* SQRT() */
 
@@ -608,7 +616,9 @@ STATIC FUNCTION Main_MATH()
    TEST_LINE( Sqrt(0)                         , 0                                      )
    TEST_LINE( Sqrt(4)                         , 2                                      )
    TEST_LINE( Str(Sqrt(snIntP))               , "         3.16"                        )
+#ifdef __HARBOUR__
    TEST_LINE( Str(Sqrt(@snIntP))              , "         3.16"                        ) /* Bug in CA-Cl*pper, it returns: "E BASE 1097 Argument error SQRT F:S" */
+#endif
    TEST_LINE( Str(Sqrt(4),21,18)              , " 2.000000000000000000"                )
    TEST_LINE( Str(Sqrt(3),21,18)              , " 1.732050807568877000"                )
 
@@ -619,7 +629,9 @@ STATIC FUNCTION Main_MATH()
    TEST_LINE( Abs(10)                         , 10                                     )
    TEST_LINE( Abs(-10)                        , 10                                     )
    TEST_LINE( Str(Abs(snIntN))                , "        10"                           )
+#ifdef __HARBOUR__
    TEST_LINE( Str(Abs(@snIntN))               , "        10"                           ) /* Bug in CA-Cl*pper, it returns: "E BASE 1089 Argument error ABS F:S" */
+#endif
    TEST_LINE( Abs(Month(sdDate))              , 1                                      )
    TEST_LINE( Abs(-Month(sdDate))             , 1                                      )
    TEST_LINE( Str(Abs(Month(sdDate)))         , "  1"                                  )
@@ -643,7 +655,9 @@ STATIC FUNCTION Main_MATH()
    TEST_LINE( Exp("A")                        , "E BASE 1096 Argument error EXP F:S"   )
    TEST_LINE( Exp(0)                          , 1.00                                   )
    TEST_LINE( Str(Exp(snIntZ))                , "         1.00"                        )
+#ifdef __HARBOUR__
    TEST_LINE( Str(Exp(@snIntZ))               , "         1.00"                        ) /* Bug in CA-Cl*pper, it returns: "E BASE 1096 Argument error EXP F:S" */
+#endif
    TEST_LINE( Round(Exp(1),2)                 , 2.72                                   )
    TEST_LINE( Str(Exp(1),20,10)               , "        2.7182818285"                 )
    TEST_LINE( Round(Exp(10),2)                , 22026.47                               )
@@ -652,7 +666,9 @@ STATIC FUNCTION Main_MATH()
    /* ROUND() */
 
    TEST_LINE( Round(snDoubleP, snIntZ)        , 11                                     )
+#ifdef __HARBOUR__
    TEST_LINE( Round(@snDoubleP, @snIntZ)      , 11                                     ) /* Bug in CA-Cl*pper, it returns: "E BASE 1094 Argument error ROUND F:S" */
+#endif
    TEST_LINE( Round(NIL, 0)                   , "E BASE 1094 Argument error ROUND F:S" )
    TEST_LINE( Round(0, NIL)                   , "E BASE 1094 Argument error ROUND F:S" )
    TEST_LINE( Round(0, 0)                     , 0                )
@@ -758,7 +774,9 @@ STATIC FUNCTION Main_MATH()
    TEST_LINE( Int( 0.0 )                      , 0                                    )
    TEST_LINE( Int( 10 )                       , 10                                   )
    TEST_LINE( Int( snIntP )                   , 10                                   )
+#ifdef __HARBOUR__
    TEST_LINE( Int( @snIntP )                  , 10                                   ) /* Bug in CA-Cl*pper, it returns: "E BASE 1090 Argument error INT F:S" */
+#endif
    TEST_LINE( Int( -10 )                      , -10                                  )
    TEST_LINE( Int( 100000 )                   , 100000                               )
    TEST_LINE( Int( -100000 )                  , -100000                              )
@@ -783,7 +801,9 @@ STATIC FUNCTION Main_MATH()
    TEST_LINE( Max(SToD("19800102"), SToD("19800101")) , SToD("19800102")                     )
    TEST_LINE( Max(SToD("19800101"), SToD("19800102")) , SToD("19800102")                     )
    TEST_LINE( Max(snIntP, snLongP)                    , 100000                               )
+#ifdef __HARBOUR__
    TEST_LINE( Max(@snIntP, @snLongP)                  , 100000                               ) /* Bug in CA-Cl*pper, it will return: "E BASE 1093 Argument error MAX F:S" */
+#endif
    TEST_LINE( Min(NIL, NIL)                           , "E BASE 1092 Argument error MIN F:S" )
    TEST_LINE( Min(10, NIL)                            , "E BASE 1092 Argument error MIN F:S" )
    TEST_LINE( Min(SToD("19800101"), 10)               , "E BASE 1092 Argument error MIN F:S" )
@@ -791,7 +811,9 @@ STATIC FUNCTION Main_MATH()
    TEST_LINE( Min(SToD("19800102"), SToD("19800101")) , SToD("19800101")                     )
    TEST_LINE( Min(SToD("19800101"), SToD("19800102")) , SToD("19800101")                     )
    TEST_LINE( Min(snIntP, snLongP)                    , 10                                   )
+#ifdef __HARBOUR__
    TEST_LINE( Min(@snIntP, @snLongP)                  , 10                                   ) /* Bug in CA-Cl*pper, it will return: "E BASE 1092 Argument error MIN F:S" */
+#endif
 
    /* Decimals handling */
 
@@ -973,8 +995,10 @@ STATIC FUNCTION Main_STRINGS()
    TEST_LINE( Pad(SToD("19800101"), 12)       , "1980.01.01  "   )
    TEST_LINE( Pad(Year(SToD("19800101")), 5)  , "1980 "          )
    TEST_LINE( Pad(Day(SToD("19800101")), 5)   , "1    "          )
+#ifdef __HARBOUR__
    TEST_LINE( Pad(@scString, 10)              , "HELLO     "     ) /* Bug in CA-Cl*pper, it will return "" */
    TEST_LINE( Pad(scString, @snIntP)          , "HELLO     "     ) /* Bug in CA-Cl*pper, it will return "" */
+#endif
    TEST_LINE( Pad("abcdef", -5)               , ""               )
    TEST_LINE( Pad("abcdef", 0)                , ""               )
    TEST_LINE( Pad("abcdef", 5)                , "abcde"          )
@@ -994,8 +1018,10 @@ STATIC FUNCTION Main_STRINGS()
    TEST_LINE( PadR(SToD("19800101"), 12)      , "1980.01.01  "   )
    TEST_LINE( PadR(Year(SToD("19800101")), 5) , "1980 "          )
    TEST_LINE( PadR(Day(SToD("19800101")), 5)  , "1    "          )
+#ifdef __HARBOUR__
    TEST_LINE( PadR(@scString, 10)             , "HELLO     "     ) /* Bug in CA-Cl*pper, it will return "" */
    TEST_LINE( PadR(scString, @snIntP)         , "HELLO     "     ) /* Bug in CA-Cl*pper, it will return "" */
+#endif
    TEST_LINE( PadR("abcdef", -5)              , ""               )
    TEST_LINE( PadR("abcdef", 0)               , ""               )
    TEST_LINE( PadR("abcdef", 5)               , "abcde"          )
@@ -1015,8 +1041,10 @@ STATIC FUNCTION Main_STRINGS()
    TEST_LINE( PadL(SToD("19800101"), 12)      , "  1980.01.01"   )
    TEST_LINE( PadL(Year(SToD("19800101")), 5) , " 1980"          )
    TEST_LINE( PadL(Day(SToD("19800101")), 5)  , "    1"          )
-   TEST_LINE( PadL(@scString, 10)             , "     HELLO"     )
-   TEST_LINE( PadL(scString, @snIntP)         , "     HELLO"     )
+#ifdef __HARBOUR__
+   TEST_LINE( PadL(@scString, 10)             , "     HELLO"     ) /* Bug in CA-Cl*pper, it will return "" */
+   TEST_LINE( PadL(scString, @snIntP)         , "     HELLO"     ) /* Bug in CA-Cl*pper, it will return "" */
+#endif
    TEST_LINE( PadL("abcdef", -5)              , ""               )
    TEST_LINE( PadL("abcdef", 0)               , ""               )
    TEST_LINE( PadL("abcdef", 5)               , "abcde"          ) /* QUESTION: CA-Cl*pper "bug", should return: "bcdef" ? */
@@ -1036,8 +1064,10 @@ STATIC FUNCTION Main_STRINGS()
    TEST_LINE( PadC(SToD("19800101"), 12)      , " 1980.01.01 "   )
    TEST_LINE( PadC(Year(SToD("19800101")), 5) , "1980 "          )
    TEST_LINE( PadC(Day(SToD("19800101")), 5)  , "  1  "          )
-   TEST_LINE( PadC(@scString, 10)             , "  HELLO   "     )
-   TEST_LINE( PadC(scString, @snIntP)         , "  HELLO   "     )
+#ifdef __HARBOUR__
+   TEST_LINE( PadC(@scString, 10)             , "  HELLO   "     ) /* Bug in CA-Cl*pper, it will return "" */
+   TEST_LINE( PadC(scString, @snIntP)         , "  HELLO   "     ) /* Bug in CA-Cl*pper, it will return "" */
+#endif
    TEST_LINE( PadC("abcdef", -5)              , ""               )
    TEST_LINE( PadC("abcdef", 0)               , ""               )
    TEST_LINE( PadC("abcdef", 2)               , "ab"             ) /* QUESTION: CA-Cl*pper "bug", should return: "cd" ? */
@@ -1357,8 +1387,10 @@ STATIC FUNCTION Main_MISC()
    TEST_LINE( aScan( "A", {|| .F. } )         , 0           )
    TEST_LINE( aScan( {1,2,3}, {|x| NIL } )    , 0           )
    TEST_LINE( aScan( saAllTypes, scString   ) , 1           )
+#ifdef __HARBOUR__
    TEST_LINE( aScan( @saAllTypes, scString )  , 1           ) /* Bug in CA-Cl*pper, it will return 0 */
    TEST_LINE( aScan( saAllTypes, @scString )  , 1           ) /* Bug in CA-Cl*pper, it will return 0 */
+#endif
    TEST_LINE( aScan( saAllTypes, scStringE  ) , 1           )
    TEST_LINE( aScan( saAllTypes, scStringZ  ) , 3           )
    TEST_LINE( aScan( saAllTypes, snIntZ     ) , 4           )
@@ -1388,7 +1420,9 @@ STATIC FUNCTION Main_MISC()
 
    TEST_LINE( Eval( NIL )                     , "E BASE 1004 No exported method EVAL F:S" )
    TEST_LINE( Eval( 1 )                       , "E BASE 1004 No exported method EVAL F:S" )
+#ifdef __HARBOUR__
    TEST_LINE( Eval( @sbBlock )                , NIL                                       ) /* Bug in CA-Cl*pper, it will return: "E BASE 1004 No exported method EVAL F:S" */
+#endif
    TEST_LINE( Eval( {|p1| p1 },"A","B")       , "A"                                       )
    TEST_LINE( Eval( {|p1,p2| p1+p2 },"A","B") , "AB"                                      )
    TEST_LINE( Eval( {|p1,p2,p3| p1 },"A","B") , "A"                                       )
@@ -1448,7 +1482,9 @@ STATIC FUNCTION Main_MISC()
    TEST_LINE( Descend()                       , NIL                                                 ) /* Bug in CA-Cl*pper, it returns undefined trash */
    TEST_LINE( Descend( NIL )                  , NIL                                                 )
    TEST_LINE( Descend( { "A", "B" } )         , NIL                                                 )
+#ifdef __HARBOUR__
    TEST_LINE( Descend( @scString )            , "¸»´´±"                                             ) /* Bug in CA-Cl*pper, it will return NIL */
+#endif
    TEST_LINE( Descend( scString )             , "¸»´´±"                                             )
    TEST_LINE( Descend( scString )             , "¸»´´±"                                             )
    TEST_LINE( Descend( Descend( scString ) )  , "HELLO"                                             )
@@ -1522,9 +1558,11 @@ STATIC FUNCTION Main_MISC()
 
    TEST_LINE( FKMax()                         , 40               )
    TEST_LINE( FKMax( 1 )                      , 40               )
+#ifdef __HARBOUR__
    TEST_LINE( FKLabel()                       , ""               ) /* Bug in CA-Cl*pper, it returns: "E BASE 1074 Argument error <= F:S" */
    TEST_LINE( FKLabel( NIL )                  , ""               ) /* Bug in CA-Cl*pper, it returns: "E BASE 1074 Argument error <= F:S" */
    TEST_LINE( FKLabel( "A" )                  , ""               ) /* Bug in CA-Cl*pper, it returns: "E BASE 1074 Argument error <= F:S" */
+#endif
    TEST_LINE( FKLabel( -1 )                   , ""               )
    TEST_LINE( FKLabel( 0 )                    , ""               )
    TEST_LINE( FKLabel( 1 )                    , "F1"             )