From 79d5392cfc28439ce59c78bdc7771a4651fee739 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 28 Sep 2007 15:31:45 +0000
Subject: [PATCH] 2007-09-28 17:26 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)    * include/Makefile    - include/hbcompat.ch    +
 contrib/xhb/hbcompat.ch    * contrib/xhb/xhb.ch    * contrib/xhb/Makefile    
  * Moved content or hbcompat.ch into xhb.ch.        Those who need
 compatibility, have to replace      * Moved hbcompat.ch (for compatibility)
 to contrib/xhb

---
 harbour/ChangeLog               |  10 ++
 harbour/contrib/xhb/Makefile    |   1 +
 harbour/contrib/xhb/hbcompat.ch |  53 +++++++
 harbour/contrib/xhb/xhb.ch      | 194 ++++++++++++++++++++++++-
 harbour/include/Makefile        |   1 -
 harbour/include/hbcompat.ch     | 242 --------------------------------
 6 files changed, 256 insertions(+), 245 deletions(-)
 create mode 100644 harbour/contrib/xhb/hbcompat.ch
 delete mode 100644 harbour/include/hbcompat.ch

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index de28082449..ee58baff90 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-09-28 17:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * include/Makefile
+   - include/hbcompat.ch
+   + contrib/xhb/hbcompat.ch
+   * contrib/xhb/xhb.ch
+   * contrib/xhb/Makefile
+     * Moved content or hbcompat.ch into xhb.ch.
+       Those who need compatibility, have to replace 
+     * Moved hbcompat.ch (for compatibility) to contrib/xhb
+
 2007-09-28 16:32 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbexprb.c
     * respect -ks in macrovars and array item references
diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile
index 0f9ba1ef86..2b4a7a9236 100644
--- a/harbour/contrib/xhb/Makefile
+++ b/harbour/contrib/xhb/Makefile
@@ -22,6 +22,7 @@ PRG_SOURCES=\
 
 PRG_HEADERS=\
 	xhb.ch      \
+	hbcompat.ch \
 	hblog.ch    \
 	hblogdef.ch \
 	cstruct.ch  \
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
new file mode 100644
index 0000000000..b84654491a
--- /dev/null
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -0,0 +1,53 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * Header file for cross-compatibility between different Harbour flavours
+ *
+ * Copyright 1999-2007 {list of individual authors and e-mail addresses}
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
+ *
+ * As a special exception, the Harbour Project gives permission for
+ * additional uses of the text contained in its release of Harbour.
+ *
+ * The exception is that, if you link the Harbour libraries with other
+ * files to produce an executable, this does not by itself cause the
+ * resulting executable to be covered by the GNU General Public License.
+ * Your use of that executable is in no way restricted on account of
+ * linking the Harbour library code into it.
+ *
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ *
+ * This exception applies only to the code released by the Harbour
+ * Project under the name Harbour.  If you copy code from other
+ * Harbour Project or Free Software Foundation releases into a copy of
+ * Harbour, as the General Public License permits, the exception does
+ * not apply to the code that you add in this way.  To avoid misleading
+ * anyone as to the status of such modified files, you must delete
+ * this exception notice from them.
+ *
+ * If you write modifications of your own for Harbour, it is your choice
+ * whether to permit this exception to apply to your modifications.
+ * If you do not wish that, delete this exception notice.
+ *
+ */
+
+#include "xhb.ch"
diff --git a/harbour/contrib/xhb/xhb.ch b/harbour/contrib/xhb/xhb.ch
index 2118a08d56..114e426bbe 100644
--- a/harbour/contrib/xhb/xhb.ch
+++ b/harbour/contrib/xhb/xhb.ch
@@ -50,13 +50,203 @@
  *
  */
 
-#ifndef __XHARBOUR__
+#ifndef XHB__CH_
+#define XHB__CH_
 
-   #include "hbcompat.ch"
+#ifdef __HARBOUR__
+
+#ifdef __XHARBOUR__
+   #include "gtinfo.ch"
+   #include "gfx.ch"
+#else
+   #include "hbgtinfo.ch"
+   #include "hbgfx.ch"
+#endif
+
+
+#ifdef __XHARBOUR__
+
+   #xtranslate hb_gtSys                => gtSys
+   #xtranslate hb_gtInfo([<x,...>])    => gtInfo(<x>)
+   #xtranslate hb_gtVersion([<x>])     => hb_gt_Version(<x>)
+
+   #xtranslate hb_isregex([<x>])       => hb_isregexstring(<x>)
+   #xtranslate hb_pvalue([<x,...>])    => pvalue(<x>)
+   #xtranslate hb_methodName([<x,...>])=> methodName(<x>)
+   #xtranslate hb_libLoad([<x,...>])   => libLoad(<x>)
+   #xtranslate hb_libFree([<x,...>])   => libFree(<x>)
+   #xtranslate hb_adler32([<x,...>])   => hb_checksum(<x>)
+   #xtranslate hb_setLastKey([<x,...>])=> setLastKey(<x>)
+   #xtranslate hb_CStr([<x,...>])      => CStr(<x>)
+
+   #xtranslate hb_HexToNum([<c,...>])  => HexToNum(<c>)
+   #xtranslate hb_NumToHex([<n,...>])  => NumToHex(<n>)
+   #xtranslate hb_HexToStr([<c,...>])  => HexToStr(<c>)
+   #xtranslate hb_StrToHex([<c,...>])  => StrToHex(<c>)
+
+   #xtranslate hb_AScan(<a>,<b>,[<c>],[<d>],<e>) => AScan(<a>,<b>,<c>,<d>,<e>)
+   #xtranslate hb_RAScan([<x,...>])              => RAScan(<x>)
+
+   #xtranslate hb_ISPOINTER( <xValue> )=> ISPOINTER( <xValue> )
+
+   #xtranslate hb_IniSetComment([<x,...>]) => hb_SetIniComment(<x>)
+   #xtranslate hb_IniRead([<x,...>])       => hb_ReadIni(<x>)
+   #xtranslate hb_IniWrite([<x,...>])      => hb_WriteIni(<x>)
+
+   /* Some statement endings */
+   #xcommand ENDSEQUENCE => END
+   #xcommand ENDSWITCH => END
+   #xcommand END SWITCH => END
+   #xcommand ENDWITH => END
+   #xcommand END WITH => END
+   #xcommand END OBJECT => END
+
+#else
 
    REQUEST XHB_LIB
 
    #xtranslate AIns(<a>,<n>,[<x,...>])      => xhb_AIns(<a>,<n>,<x>)
    #xtranslate ADel(<a>,<n>,<l>)              => xhb_ADel(<a>,<n>,<l>)
 
+   #xtranslate gtSys                   => hb_gtSys
+   #xtranslate gtInfo([<x,...>])       => hb_gtInfo(<x>)
+   #xtranslate hb_gt_Version([<x>])    => hb_gtVersion(<x>)
+
+   #xtranslate gtSetClipboard(<x>)     => hb_gtInfo( GTI_CLIPBOARDDATA, <x> )
+   #xtranslate gtGetClipboard()        => hb_gtInfo( GTI_CLIPBOARDDATA )
+   #xtranslate gtGetClipBoardSize()    => Len( hb_gtInfo( GTI_CLIPBOARDDATA ) )
+   #xtranslate gtPasteClipBoard([<n>]) => hb_gtInfo( GTI_CLIPBOARDPAST )
+   #xtranslate gtProcessMessages()     => NextKey()
+   #xtranslate gfxPrimitive([<x,...>]) => hb_gfxPrimitive(<x>)
+   #xtranslate gfxText([<x,...>])      => hb_gfxText(<x>)
+
+   #xtranslate hb_isregexstring([<x>]) => hb_isregex(<x>)
+   #xtranslate pvalue([<x,...>])       => hb_pvalue(<x>)
+   #xtranslate methodName([<x,...>])   => hb_methodName(<x>)
+   #xtranslate libLoad([<x,...>])      => hb_libLoad(<x>)
+   #xtranslate libFree([<x,...>])      => hb_libFree(<x>)
+   #xtranslate hb_checksum([<x,...>])  => hb_adler32(<x>)
+   #xtranslate setLastKey([<x,...>])   => hb_setLastKey(<x>)
+   #xtranslate CStr([<x,...>])         => hb_CStr(<x>)
+
+   #xtranslate HexToNum([<c,...>])     => hb_HexToNum(<c>)
+   #xtranslate NumToHex([<n,...>])     => hb_NumToHex(<n>)
+   #xtranslate HexToStr([<c,...>])     => hb_HexToStr(<c>)
+   #xtranslate StrToHex([<c,...>])     => hb_StrToHex(<c>)
+
+   #xtranslate AScan(<a>,<b>,[<c>],[<d>],<e>) => hb_AScan(<a>,<b>,<c>,<d>,<e>)
+   #xtranslate RAScan([<x,...>])              => hb_RAScan(<x>)
+
+   #xtranslate ISPOINTER( <xValue> )   => hb_ISPOINTER( <xValue> )
+
+   #xtranslate hb_SetIniComment([<x,...>]) => hb_IniSetComment(<x>)
+   #xtranslate hb_ReadIni([<x,...>])       => hb_IniRead(<x>)
+   #xtranslate hb_WriteIni([<x,...>])      => hb_IniWrite(<x>)
+
+   #xtranslate Str(<x>,[<y>],[<y>],<z>)=> iif(<z>, LTrim(Str(<x>)), Str(<x>))
+   #xtranslate hb_CMDARGARGV([<x,...>])=> hb_ARGV(0)
+
+   /* Hash item functions */
+   #xtranslate HASH([<x,...>])         => hb_HASH(<x>)
+   #xtranslate HHASKEY([<x,...>])      => hb_HHASKEY(<x>)
+   #xtranslate HGETPOS([<x,...>])      => hb_HPOS(<x>)
+   #xtranslate HGET([<x,...>])         => hb_HGET(<x>)
+   #xtranslate HSET([<x,...>])         => hb_HSET(<x>)
+   #xtranslate HDEL([<x,...>])         => hb_HDEL(<x>)
+   #xtranslate HGETKEYAT([<x,...>])    => hb_HKEYAT(<x>)
+   #xtranslate HGETVALUEAT([<x,...>])  => hb_HVALUEAT(<x>)
+   #xtranslate HSETVALUEAT([<x,...>])  => hb_HVALUEAT(<x>)
+   #xtranslate HGETPAIRAT([<x,...>])   => hb_HPAIRAT(<x>)
+   #xtranslate HDELAT([<x,...>])       => hb_HDELAT(<x>)
+   #xtranslate HGETKEYS([<x,...>])     => hb_HKEYS(<x>)
+   #xtranslate HGETVALUES([<x,...>])   => hb_HVALUES(<x>)
+   #xtranslate HFILL([<x,...>])        => hb_HFILL(<x>)
+   #xtranslate HCLONE([<x,...>])       => hb_HCLONE(<x>)
+   #xtranslate HCOPY([<x,...>])        => hb_HCOPY(<x>)
+   #xtranslate HMERGE([<x,...>])       => hb_HMERGE(<x>)
+   #xtranslate HEVAL([<x,...>])        => hb_HEVAL(<x>)
+   #xtranslate HSCAN([<x,...>])        => hb_HSCAN(<x>)
+   #xtranslate HSETCASEMATCH([<x,...>])=> hb_HSETCASEMATCH(<x>)
+   #xtranslate HGETCASEMATCH([<x,...>])=> hb_HCASEMATCH(<x>)
+   #xtranslate HSETAUTOADD([<x,...>])  => hb_HSETAUTOADD(<x>)
+   #xtranslate HGETAUTOADD([<x,...>])  => hb_HAUTOADD(<x>)
+   #xtranslate HALLOCATE([<x,...>])    => hb_HALLOCATE(<x>)
+   #xtranslate HDEFAULT([<x,...>])     => hb_HDEFAULT(<x>)
+
+   /* Inet functions */
+   #xtranslate INETINIT([<x,...>])              => hb_INETINIT(<x>)
+   #xtranslate INETCLEANUP([<x,...>])           => hb_INETCLEANUP(<x>)
+   #xtranslate INETCREATE([<x,...>])            => hb_INETCREATE(<x>)
+   #xtranslate INETCLOSE([<x,...>])             => hb_INETCLOSE(<x>)
+   #xtranslate INETFD([<x,...>])                => hb_INETFD(<x>)
+   #xtranslate INETSTATUS([<x,...>])            => hb_INETSTATUS(<x>)
+   #xtranslate INETERRORCODE([<x,...>])         => hb_INETERRORCODE(<x>)
+   #xtranslate INETERRORDESC([<x,...>])         => hb_INETERRORDESC(<x>)
+   #xtranslate INETCLEARERROR([<x,...>])        => hb_INETCLEARERROR(<x>)
+   #xtranslate INETCOUNT([<x,...>])             => hb_INETCOUNT(<x>)
+   #xtranslate INETADDRESS([<x,...>])           => hb_INETADDRESS(<x>)
+   #xtranslate INETPORT([<x,...>])              => hb_INETPORT(<x>)
+   #xtranslate INETSETTIMEOUT([<x,...>])        => hb_INETTIMEOUT(<x>)
+   #xtranslate INETGETTIMEOUT([<x,...>])        => hb_INETTIMEOUT(<x>)
+   #xtranslate INETCLEARTIMEOUT([<x,...>])      => hb_INETCLEARTIMEOUT(<x>)
+   #xtranslate INETSETTIMELIMIT([<x,...>])      => hb_INETTIMELIMIT(<x>)
+   #xtranslate INETGETTIMELIMIT([<x,...>])      => hb_INETTIMELIMIT(<x>)
+   #xtranslate INETCLEARTIMELIMIT([<x,...>])    => hb_INETCLEARTIMELIMIT(<x>)
+   #xtranslate INETSETPERIODCALLBACK([<x,...>]) => hb_INETPERIODCALLBACK(<x>)
+   #xtranslate INETGETPERIODCALLBACK([<x,...>]) => hb_INETPERIODCALLBACK(<x>)
+   #xtranslate INETCLEARPERIODCALLBACK([<x,...>])=> hb_INETCLEARPERIODCALLBACK(<x>)
+   #xtranslate INETRECV([<x,...>])              => hb_INETRECV(<x>)
+   #xtranslate INETRECVALL([<x,...>])           => hb_INETRECVALL(<x>)
+   #xtranslate INETRECVLINE([<x,...>])          => hb_INETRECVLINE(<x>)
+   #xtranslate INETRECVENDBLOCK([<x,...>])      => hb_INETRECVENDBLOCK(<x>)
+   #xtranslate INETDATAREADY([<x,...>])         => hb_INETDATAREADY(<x>)
+   #xtranslate INETSEND([<x,...>])              => hb_INETSEND(<x>)
+   #xtranslate INETSENDALL([<x,...>])           => hb_INETSENDALL(<x>)
+   #xtranslate INETGETHOSTS([<x,...>])          => hb_INETGETHOSTS(<x>)
+   #xtranslate INETGETALIAS([<x,...>])          => hb_INETGETALIAS(<x>)
+   #xtranslate INETSERVER([<x,...>])            => hb_INETSERVER(<x>)
+   #xtranslate INETACCEPT([<x,...>])            => hb_INETACCEPT(<x>)
+   #xtranslate INETCONNECT([<x,...>])           => hb_INETCONNECT(<x>)
+   #xtranslate INETCONNECTIP([<x,...>])         => hb_INETCONNECTIP(<x>)
+   #xtranslate INETDGRAMBIND([<x,...>])         => hb_INETDGRAMBIND(<x>)
+   #xtranslate INETDGRAM([<x,...>])             => hb_INETDGRAM(<x>)
+   #xtranslate INETDGRAMSEND([<x,...>])         => hb_INETDGRAMSEND(<x>)
+   #xtranslate INETDGRAMRECV([<x,...>])         => hb_INETDGRAMRECV(<x>)
+   #xtranslate INETCRLF([<x,...>])              => hb_INETCRLF(<x>)
+   #xtranslate ISINETSOCKET([<x,...>])          => HB_ISINETSOCKET(<x>)
+   #xtranslate INETDESTROY([<x,...>])           => IIF( HB_ISINETSOCKET( <x> ), ;
+                                                   hb_INETCLOSE( <x> ), )
+
+   /* THROW => generate error */
+   #xtranslate THROW(<oErr>) => (Eval(ErrorBlock(), <oErr>), Break(<oErr>))
+
+   /* TEXT INTO <varname> */
+   #xcommand TEXT INTO <v> => #pragma __text|<v>+=%s+HB_OSNEWLINE();<v>:=""
+
+   /* SWITCH ... ; case ... ; DEFAULT ; ... ; END */
+   #xcommand DEFAULT => OTHERWISE
+
+   /* TRY / CATCH / FINALLY / END */
+   #xcommand TRY  => BEGIN SEQUENCE WITH {|oErr| Break( oErr )}
+   #xcommand CATCH [<!oErr!>] => RECOVER [USING <oErr>] <-oErr->
+   #xcommand FINALLY => ALWAYS
+
+   /* EXTENDED CODEBLOCKs */
+   #xtranslate \<|[<x,...>]| => {|<x>|
+   #xcommand > [<*x*>]       => } <x>
+
+   /* xHarbour operators: IN, HAS, LIKE, >>, <<, |, &, ^^ */
+   #translate ( <exp1> IN <exp2> )     => ( (<exp1>) $ (<exp2>) )
+   #translate ( <exp1> HAS <exp2> )    => ( HB_REGEXHAS( (<exp2>), (<exp1>) ) )
+   #translate ( <exp1> LIKE <exp2> )   => ( HB_REGEXLIKE( (<exp2>), (<exp1>) ) )
+   #translate ( <exp1> \<\< <exp2> )   => ( HB_BITSHIFT( (<exp1>), (<exp2>) ) )
+   #translate ( <exp1> >> <exp2> )     => ( HB_BITSHIFT( (<exp1>), -(<exp2>) ) )
+   #translate ( <exp1> | <exp2> )      => ( HB_BITOR( (<exp1>), (<exp2>) ) )
+   #translate ( <exp1> & <exp2> )      => ( HB_BITAND( (<exp1>), (<exp2>) ) )
+   #translate ( <exp1> ^^ <exp2> )     => ( HB_BITXOR( (<exp1>), (<exp2>) ) )
+
 #endif
+
+#endif /* __HARBOUR__ */
+
+#endif /* XHB__CH_ */
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index f7c6c7300f..50d020b4b5 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -73,7 +73,6 @@ PRG_HEADERS=\
 	getexit.ch   \
 	hbclass.ch   \
 	hbcommon.ch  \
-	hbcompat.ch  \
 	hbdebug.ch   \
 	hbextern.ch  \
 	hbgetcmt.ch  \
diff --git a/harbour/include/hbcompat.ch b/harbour/include/hbcompat.ch
deleted file mode 100644
index e7fdc205cd..0000000000
--- a/harbour/include/hbcompat.ch
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * Harbour Project source code:
- * Header file for cross-compatibility between different Harbour flavours
- *
- * Copyright 1999-2007 {list of individual authors and e-mail addresses}
- * www - http://www.harbour-project.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
- *
- * As a special exception, the Harbour Project gives permission for
- * additional uses of the text contained in its release of Harbour.
- *
- * The exception is that, if you link the Harbour libraries with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the Harbour library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the Harbour
- * Project under the name Harbour.  If you copy code from other
- * Harbour Project or Free Software Foundation releases into a copy of
- * Harbour, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for Harbour, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- *
- */
-
-#ifdef __HARBOUR__
-
-#ifdef __XHARBOUR__
-   #include "gtinfo.ch"
-   #include "gfx.ch"
-#else
-   #include "hbgtinfo.ch"
-   #include "hbgfx.ch"
-#endif
-
-
-#ifdef __XHARBOUR__
-
-   #xtranslate hb_gtSys                => gtSys
-   #xtranslate hb_gtInfo([<x,...>])    => gtInfo(<x>)
-   #xtranslate hb_gtVersion([<x>])     => hb_gt_Version(<x>)
-
-   #xtranslate hb_isregex([<x>])       => hb_isregexstring(<x>)
-   #xtranslate hb_pvalue([<x,...>])    => pvalue(<x>)
-   #xtranslate hb_methodName([<x,...>])=> methodName(<x>)
-   #xtranslate hb_libLoad([<x,...>])   => libLoad(<x>)
-   #xtranslate hb_libFree([<x,...>])   => libFree(<x>)
-   #xtranslate hb_adler32([<x,...>])   => hb_checksum(<x>)
-   #xtranslate hb_setLastKey([<x,...>])=> setLastKey(<x>)
-   #xtranslate hb_CStr([<x,...>])      => CStr(<x>)
-
-   #xtranslate hb_HexToNum([<c,...>])  => HexToNum(<c>)
-   #xtranslate hb_NumToHex([<n,...>])  => NumToHex(<n>)
-   #xtranslate hb_HexToStr([<c,...>])  => HexToStr(<c>)
-   #xtranslate hb_StrToHex([<c,...>])  => StrToHex(<c>)
-
-   #xtranslate hb_AScan(<a>,<b>,[<c>],[<d>],<e>) => AScan(<a>,<b>,<c>,<d>,<e>)
-   #xtranslate hb_RAScan([<x,...>])              => RAScan(<x>)
-
-   #xtranslate hb_ISPOINTER( <xValue> )=> ISPOINTER( <xValue> )
-
-   #xtranslate hb_IniSetComment([<x,...>]) => hb_SetIniComment(<x>)
-   #xtranslate hb_IniRead([<x,...>])       => hb_ReadIni(<x>)
-   #xtranslate hb_IniWrite([<x,...>])      => hb_WriteIni(<x>)
-
-   /* Some statement endings */
-   #xcommand ENDSEQUENCE => END
-   #xcommand ENDSWITCH => END
-   #xcommand END SWITCH => END
-   #xcommand ENDWITH => END
-   #xcommand END WITH => END
-   #xcommand END OBJECT => END
-
-#else
-
-   #xtranslate gtSys                   => hb_gtSys
-   #xtranslate gtInfo([<x,...>])       => hb_gtInfo(<x>)
-   #xtranslate hb_gt_Version([<x>])    => hb_gtVersion(<x>)
-
-   #xtranslate gtSetClipboard(<x>)     => hb_gtInfo( GTI_CLIPBOARDDATA, <x> )
-   #xtranslate gtGetClipboard()        => hb_gtInfo( GTI_CLIPBOARDDATA )
-   #xtranslate gtGetClipBoardSize()    => Len( hb_gtInfo( GTI_CLIPBOARDDATA ) )
-   #xtranslate gtPasteClipBoard([<n>]) => hb_gtInfo( GTI_CLIPBOARDPAST )
-   #xtranslate gtProcessMessages()     => NextKey()
-   #xtranslate gfxPrimitive([<x,...>]) => hb_gfxPrimitive(<x>)
-   #xtranslate gfxText([<x,...>])      => hb_gfxText(<x>)
-
-   #xtranslate hb_isregexstring([<x>]) => hb_isregex(<x>)
-   #xtranslate pvalue([<x,...>])       => hb_pvalue(<x>)
-   #xtranslate methodName([<x,...>])   => hb_methodName(<x>)
-   #xtranslate libLoad([<x,...>])      => hb_libLoad(<x>)
-   #xtranslate libFree([<x,...>])      => hb_libFree(<x>)
-   #xtranslate hb_checksum([<x,...>])  => hb_adler32(<x>)
-   #xtranslate setLastKey([<x,...>])   => hb_setLastKey(<x>)
-   #xtranslate CStr([<x,...>])         => hb_CStr(<x>)
-
-   #xtranslate HexToNum([<c,...>])     => hb_HexToNum(<c>)
-   #xtranslate NumToHex([<n,...>])     => hb_NumToHex(<n>)
-   #xtranslate HexToStr([<c,...>])     => hb_HexToStr(<c>)
-   #xtranslate StrToHex([<c,...>])     => hb_StrToHex(<c>)
-
-   #xtranslate AScan(<a>,<b>,[<c>],[<d>],<e>) => hb_AScan(<a>,<b>,<c>,<d>,<e>)
-   #xtranslate RAScan([<x,...>])              => hb_RAScan(<x>)
-
-   #xtranslate ISPOINTER( <xValue> )   => hb_ISPOINTER( <xValue> )
-
-   #xtranslate hb_SetIniComment([<x,...>]) => hb_IniSetComment(<x>)
-   #xtranslate hb_ReadIni([<x,...>])       => hb_IniRead(<x>)
-   #xtranslate hb_WriteIni([<x,...>])      => hb_IniWrite(<x>)
-
-   #xtranslate Str(<x>,[<y>],[<y>],<z>)=> iif(<z>, LTrim(Str(<x>)), Str(<x>))
-   #xtranslate hb_CMDARGARGV([<x,...>])=> hb_ARGV(0)
-
-   /* Hash item functions */
-   #xtranslate HASH([<x,...>])         => hb_HASH(<x>)
-   #xtranslate HHASKEY([<x,...>])      => hb_HHASKEY(<x>)
-   #xtranslate HGETPOS([<x,...>])      => hb_HPOS(<x>)
-   #xtranslate HGET([<x,...>])         => hb_HGET(<x>)
-   #xtranslate HSET([<x,...>])         => hb_HSET(<x>)
-   #xtranslate HDEL([<x,...>])         => hb_HDEL(<x>)
-   #xtranslate HGETKEYAT([<x,...>])    => hb_HKEYAT(<x>)
-   #xtranslate HGETVALUEAT([<x,...>])  => hb_HVALUEAT(<x>)
-   #xtranslate HSETVALUEAT([<x,...>])  => hb_HVALUEAT(<x>)
-   #xtranslate HGETPAIRAT([<x,...>])   => hb_HPAIRAT(<x>)
-   #xtranslate HDELAT([<x,...>])       => hb_HDELAT(<x>)
-   #xtranslate HGETKEYS([<x,...>])     => hb_HKEYS(<x>)
-   #xtranslate HGETVALUES([<x,...>])   => hb_HVALUES(<x>)
-   #xtranslate HFILL([<x,...>])        => hb_HFILL(<x>)
-   #xtranslate HCLONE([<x,...>])       => hb_HCLONE(<x>)
-   #xtranslate HCOPY([<x,...>])        => hb_HCOPY(<x>)
-   #xtranslate HMERGE([<x,...>])       => hb_HMERGE(<x>)
-   #xtranslate HEVAL([<x,...>])        => hb_HEVAL(<x>)
-   #xtranslate HSCAN([<x,...>])        => hb_HSCAN(<x>)
-   #xtranslate HSETCASEMATCH([<x,...>])=> hb_HSETCASEMATCH(<x>)
-   #xtranslate HGETCASEMATCH([<x,...>])=> hb_HCASEMATCH(<x>)
-   #xtranslate HSETAUTOADD([<x,...>])  => hb_HSETAUTOADD(<x>)
-   #xtranslate HGETAUTOADD([<x,...>])  => hb_HAUTOADD(<x>)
-   #xtranslate HALLOCATE([<x,...>])    => hb_HALLOCATE(<x>)
-   #xtranslate HDEFAULT([<x,...>])     => hb_HDEFAULT(<x>)
-
-   /* Inet functions */
-   #xtranslate INETINIT([<x,...>])              => hb_INETINIT(<x>)
-   #xtranslate INETCLEANUP([<x,...>])           => hb_INETCLEANUP(<x>)
-   #xtranslate INETCREATE([<x,...>])            => hb_INETCREATE(<x>)
-   #xtranslate INETCLOSE([<x,...>])             => hb_INETCLOSE(<x>)
-   #xtranslate INETFD([<x,...>])                => hb_INETFD(<x>)
-   #xtranslate INETSTATUS([<x,...>])            => hb_INETSTATUS(<x>)
-   #xtranslate INETERRORCODE([<x,...>])         => hb_INETERRORCODE(<x>)
-   #xtranslate INETERRORDESC([<x,...>])         => hb_INETERRORDESC(<x>)
-   #xtranslate INETCLEARERROR([<x,...>])        => hb_INETCLEARERROR(<x>)
-   #xtranslate INETCOUNT([<x,...>])             => hb_INETCOUNT(<x>)
-   #xtranslate INETADDRESS([<x,...>])           => hb_INETADDRESS(<x>)
-   #xtranslate INETPORT([<x,...>])              => hb_INETPORT(<x>)
-   #xtranslate INETSETTIMEOUT([<x,...>])        => hb_INETTIMEOUT(<x>)
-   #xtranslate INETGETTIMEOUT([<x,...>])        => hb_INETTIMEOUT(<x>)
-   #xtranslate INETCLEARTIMEOUT([<x,...>])      => hb_INETCLEARTIMEOUT(<x>)
-   #xtranslate INETSETTIMELIMIT([<x,...>])      => hb_INETTIMELIMIT(<x>)
-   #xtranslate INETGETTIMELIMIT([<x,...>])      => hb_INETTIMELIMIT(<x>)
-   #xtranslate INETCLEARTIMELIMIT([<x,...>])    => hb_INETCLEARTIMELIMIT(<x>)
-   #xtranslate INETSETPERIODCALLBACK([<x,...>]) => hb_INETPERIODCALLBACK(<x>)
-   #xtranslate INETGETPERIODCALLBACK([<x,...>]) => hb_INETPERIODCALLBACK(<x>)
-   #xtranslate INETCLEARPERIODCALLBACK([<x,...>])=> hb_INETCLEARPERIODCALLBACK(<x>)
-   #xtranslate INETRECV([<x,...>])              => hb_INETRECV(<x>)
-   #xtranslate INETRECVALL([<x,...>])           => hb_INETRECVALL(<x>)
-   #xtranslate INETRECVLINE([<x,...>])          => hb_INETRECVLINE(<x>)
-   #xtranslate INETRECVENDBLOCK([<x,...>])      => hb_INETRECVENDBLOCK(<x>)
-   #xtranslate INETDATAREADY([<x,...>])         => hb_INETDATAREADY(<x>)
-   #xtranslate INETSEND([<x,...>])              => hb_INETSEND(<x>)
-   #xtranslate INETSENDALL([<x,...>])           => hb_INETSENDALL(<x>)
-   #xtranslate INETGETHOSTS([<x,...>])          => hb_INETGETHOSTS(<x>)
-   #xtranslate INETGETALIAS([<x,...>])          => hb_INETGETALIAS(<x>)
-   #xtranslate INETSERVER([<x,...>])            => hb_INETSERVER(<x>)
-   #xtranslate INETACCEPT([<x,...>])            => hb_INETACCEPT(<x>)
-   #xtranslate INETCONNECT([<x,...>])           => hb_INETCONNECT(<x>)
-   #xtranslate INETCONNECTIP([<x,...>])         => hb_INETCONNECTIP(<x>)
-   #xtranslate INETDGRAMBIND([<x,...>])         => hb_INETDGRAMBIND(<x>)
-   #xtranslate INETDGRAM([<x,...>])             => hb_INETDGRAM(<x>)
-   #xtranslate INETDGRAMSEND([<x,...>])         => hb_INETDGRAMSEND(<x>)
-   #xtranslate INETDGRAMRECV([<x,...>])         => hb_INETDGRAMRECV(<x>)
-   #xtranslate INETCRLF([<x,...>])              => hb_INETCRLF(<x>)
-   #xtranslate ISINETSOCKET([<x,...>])          => HB_ISINETSOCKET(<x>)
-   #xtranslate INETDESTROY([<x,...>])           => IIF( HB_ISINETSOCKET( <x> ), ;
-                                                   hb_INETCLOSE( <x> ), )
-
-   /* THROW => generate error */
-   #xtranslate THROW(<oErr>) => (Eval(ErrorBlock(), <oErr>), Break(<oErr>))
-
-   /* TEXT INTO <varname> */
-   #xcommand TEXT INTO <v> => #pragma __text|<v>+=%s+HB_OSNEWLINE();<v>:=""
-
-   /* SWITCH ... ; case ... ; DEFAULT ; ... ; END */
-   #xcommand DEFAULT => OTHERWISE
-
-   /* TRY / CATCH / FINALLY / END */
-   #xcommand TRY  => BEGIN SEQUENCE WITH {|oErr| Break( oErr )}
-   #xcommand CATCH [<!oErr!>] => RECOVER [USING <oErr>] <-oErr->
-   #xcommand FINALLY => ALWAYS
-
-   /* EXTENDED CODEBLOCKs */
-   #xtranslate \<|[<x,...>]| => {|<x>|
-   #xcommand > [<*x*>]       => } <x>
-
-   /* xHarbour operators: IN, HAS, LIKE, >>, <<, |, &, ^^ */
-   #translate ( <exp1> IN <exp2> )     => ( (<exp1>) $ (<exp2>) )
-   #translate ( <exp1> HAS <exp2> )    => ( HB_REGEXHAS( (<exp2>), (<exp1>) ) )
-   #translate ( <exp1> LIKE <exp2> )   => ( HB_REGEXLIKE( (<exp2>), (<exp1>) ) )
-   #translate ( <exp1> \<\< <exp2> )   => ( HB_BITSHIFT( (<exp1>), (<exp2>) ) )
-   #translate ( <exp1> >> <exp2> )     => ( HB_BITSHIFT( (<exp1>), -(<exp2>) ) )
-   #translate ( <exp1> | <exp2> )      => ( HB_BITOR( (<exp1>), (<exp2>) ) )
-   #translate ( <exp1> & <exp2> )      => ( HB_BITAND( (<exp1>), (<exp2>) ) )
-   #translate ( <exp1> ^^ <exp2> )     => ( HB_BITXOR( (<exp1>), (<exp2>) ) )
-
-#endif
-
-#endif /* __HARBOUR__ */