diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 517cbf5ebd..7440d03193 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,37 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-08 16:02 UTC+0100 Viktor Szakats (harbour syenar.net) + * contrib/hbmysql/tmysql.prg + * contrib/hbnf/tests/test.prg + * contrib/hbtip/cgi.prg + * contrib/hbtip/tests/base64.prg + * contrib/hbtip/tests/dbtohtml.prg + * contrib/hbtip/tests/ftpadv.prg + * contrib/hbtip/tests/httpadv.prg + * contrib/hbtip/tests/tiptest.prg + * contrib/hbtip/thtml.prg + * contrib/rddads/tests/testmg.prg + * extras/gfspell/spell.prg + * extras/hbvpdf/hbvpdf.prg + * extras/httpsrv/cgifunc.prg + * extras/httpsrv/modules/tableservletdb.prg + * extras/httpsrv/session.prg + * extras/httpsrv/uhttpd.prg + * utils/hbmk2/hbmk2.prg + * minor cleanups + + * contrib/xhb/*.ch + * formatted .ch files + ! fixed SETLASTKEY() to be HB_SETLASTKEY() in xhb + + * contrib/hbtinymt/3rd/tinymt/tinymt.hbp + - contrib/hbtinymt/3rd/tinymt/tinymt.hbx + ! deleted .hbx file for 3rd lib and fixed not to generate it + + * extras/httpsrv/modules/tableservletdb.prg + ! DEFAULT TO -> hb_default() + 2012-11-08 14:59 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * harbour/src/rtl/rat.c ! fixed HB_RAT() to respect end range in the same way as in HB_AT() diff --git a/harbour/contrib/hbmysql/tmysql.prg b/harbour/contrib/hbmysql/tmysql.prg index 73ab746247..e16ecd4947 100644 --- a/harbour/contrib/hbmysql/tmysql.prg +++ b/harbour/contrib/hbmysql/tmysql.prg @@ -1473,10 +1473,10 @@ METHOD CreateTable( cTable, aStruct, cPrimaryKey, cUniqueKey, cAuto ) CLASS TMyS NEXT IF cPrimarykey != NIL - ::cCreateQuery += ' PRIMARY KEY (' + cPrimaryKey + '),' + ::cCreateQuery += " PRIMARY KEY (" + cPrimaryKey + ")," ENDIF IF cUniquekey != NIL - ::cCreateQuery += ' UNIQUE ' + cUniquekey + ' (' + cUniqueKey + '),' + ::cCreateQuery += " UNIQUE " + cUniquekey + " (" + cUniqueKey + ")," ENDIF // remove last comma from list diff --git a/harbour/contrib/hbnf/tests/test.prg b/harbour/contrib/hbnf/tests/test.prg index 5d883fb0be..1561ca37e5 100644 --- a/harbour/contrib/hbnf/tests/test.prg +++ b/harbour/contrib/hbnf/tests/test.prg @@ -12,10 +12,10 @@ PROCEDURE Main() nmar := ft_MVersion( @nver, @ntype, @nir ) ppp := nmar + nver - ? Str( nmar, 2, 0 ), '.', Str( nver, 2, 0 ) + ? Str( nmar, 2, 0 ), ".", Str( nver, 2, 0 ) ? ppp / 100 Inkey( 0 ) - ? 'is mouse on', ft_MReset() + ? "is mouse on", ft_MReset() Inkey( 0 ) ? ft_MShowCrs() Inkey( 0 ) @@ -25,8 +25,8 @@ PROCEDURE Main() Inkey( 0 ) DO WHILE LastKey() != K_ESC - ? 'mouse row is', ft_MGetX() - ? 'mouse col is', ft_MGetY() + ? "mouse row is", ft_MGetX() + ? "mouse col is", ft_MGetY() IF LastKey() == K_ESC EXIT ENDIF diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbp b/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbp index 269302b642..068d120eb0 100644 --- a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbp +++ b/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbp @@ -9,6 +9,8 @@ -o${hb_targetname} +-hbx= + -warn=low -pic diff --git a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbx b/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbx deleted file mode 100644 index 8122c1034b..0000000000 --- a/harbour/contrib/hbtinymt/3rd/tinymt/tinymt.hbx +++ /dev/null @@ -1,29 +0,0 @@ -/* -------------------------------------------------------------------- - * NOTE: You can add manual override which functions to include or - * exclude from automatically generated EXTERNAL/DYNAMIC list. - * Syntax: // HB_FUNC_INCLUDE - * // HB_FUNC_EXCLUDE - */ - -/* -------------------------------------------------------------------- - * WARNING: Automatically generated code below. DO NOT EDIT! - * Regenerate using hbmk2 '-hbx=' option. - */ - -#ifndef __HBEXTERN_CH__TINYMT__ -#define __HBEXTERN_CH__TINYMT__ - -#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__TINYMT__ANNOUNCE ) - ANNOUNCE __HBEXTERN__TINYMT__ -#endif - -#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__TINYMT__REQUEST ) - #command DYNAMIC => EXTERNAL -#endif - - -#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__TINYMT__REQUEST ) - #uncommand DYNAMIC => EXTERNAL -#endif - -#endif diff --git a/harbour/contrib/hbtip/cgi.prg b/harbour/contrib/hbtip/cgi.prg index 79a83d372c..2fd3a92868 100644 --- a/harbour/contrib/hbtip/cgi.prg +++ b/harbour/contrib/hbtip/cgi.prg @@ -355,24 +355,24 @@ METHOD ErrHandler( xError ) CLASS TIpCgi cErrMsg += '' - cErrMsg += '' + cErrMsg += "" IF HB_ISOBJECT( xError ) - cErrMsg += '' - cErrMsg += '' - cErrMsg += '' - cErrMsg += '' + cErrMsg += "" + cErrMsg += "" + cErrMsg += "" + cErrMsg += "" ELSEIF HB_ISSTRING( xError ) - cErrMsg += '' + cErrMsg += "" ENDIF nCalls := 1 DO WHILE ! Empty( ProcName( nCalls ) ) - cErrMsg += '' + cErrMsg += "" nCalls++ ENDDO - cErrMsg += '
SCRIPT NAME:' + GetEnv( "SCRIPT_NAME" ) + '
SCRIPT NAME:" + GetEnv( "SCRIPT_NAME" ) + "
CRITICAL ERROR:' + xError:Description + '
OPERATION:' + xError:Operation + '
OS ERROR:' + hb_ntos( xError:OsCode ) + ' IN ' + xError:SubSystem + '/' + hb_ntos( xError:SubCode ) + '
FILENAME:' + Right( xError:FileName, 40 ) + '
CRITICAL ERROR:" + xError:Description + "
OPERATION:" + xError:Operation + "
OS ERROR:" + hb_ntos( xError:OsCode ) + " IN " + xError:SubSystem + "/" + hb_ntos( xError:SubCode ) + "
FILENAME:" + Right( xError:FileName, 40 ) + "
ERROR MESSAGE:' + tip_HtmlSpecialChars( xError ) + '
ERROR MESSAGE:" + tip_HtmlSpecialChars( xError ) + "
PROC/LINE:' + ProcName( nCalls ) + "/" + hb_ntos( ProcLine( nCalls ) ) + '
PROC/LINE:" + ProcName( nCalls ) + "/" + hb_ntos( ProcLine( nCalls ) ) + "
' + cErrMsg += "" ::Write( cErrMsg ) @@ -393,25 +393,25 @@ METHOD Write( cString ) CLASS TIpCgi METHOD StartHtml( hOptions ) CLASS TIpCgi ::cHtmlPage += ; - '' + _CRLF + ; + '" + _CRLF + ; '' + _CRLF + ; '' + ; - '' + ; - HtmlTag( hOptions, 'title', 'title' ) + ; + "" + ; + HtmlTag( hOptions, "title", "title" ) + ; HtmlScript( hOptions ) + ; HtmlStyle( hOptions ) + ; HtmlLinkRel( hOptions ) + ; - '' + ; - '" + ; + "' + ">" RETURN Self METHOD EndHtml() CLASS TIpCgi - ::cHtmlPage += '' + ::cHtmlPage += "" RETURN Self @@ -552,7 +552,7 @@ STATIC FUNCTION HtmlScript( hVal, cKey ) IF HB_ISARRAY( cVal ) cTmp := "" AScan( cVal, {| cVar | cTmp += cVar } ) - cRet += '' + _CRLF + cRet += '" + _CRLF ENDIF ENDIF ENDIF @@ -595,7 +595,7 @@ STATIC FUNCTION HtmlStyle( hVal, cKey ) IF HB_ISARRAY( cVal ) cTmp := "" AScan( cVal, {| cVar | cTmp += cVar } ) - cRet += '' + _CRLF + cRet += '" + _CRLF ENDIF ENDIF ENDIF diff --git a/harbour/contrib/hbtip/tests/base64.prg b/harbour/contrib/hbtip/tests/base64.prg index b9a7f83899..b7ef8e4727 100644 --- a/harbour/contrib/hbtip/tests/base64.prg +++ b/harbour/contrib/hbtip/tests/base64.prg @@ -36,16 +36,16 @@ PROCEDURE Main( ... ) FOR nLen := 1 TO PCount() cData := Lower( hb_PValue( nLen ) ) DO CASE - CASE cData == '-h' + CASE cData == "-h" lHelp := .T. - CASE cData == '-d' + CASE cData == "-d" lDecode := .T. - CASE cData == '-q' + CASE cData == "-q" lQp := .T. - CASE cData == '-u' + CASE cData == "-u" lUrl := .T. OTHERWISE diff --git a/harbour/contrib/hbtip/tests/dbtohtml.prg b/harbour/contrib/hbtip/tests/dbtohtml.prg index f219a8ecd4..398650d8c7 100644 --- a/harbour/contrib/hbtip/tests/dbtohtml.prg +++ b/harbour/contrib/hbtip/tests/dbtohtml.prg @@ -46,7 +46,7 @@ PROCEDURE Main oNode := oNode + "b" /* Operator "+" creates a new node with attribute */ - oNode := oNode + "font color='blue'" + oNode := oNode + 'font color="blue"' oNode:text := "sample " /* Operator "-" closes 2nd , result is node */ diff --git a/harbour/contrib/hbtip/tests/ftpadv.prg b/harbour/contrib/hbtip/tests/ftpadv.prg index 0c02ea8990..55a71d5784 100644 --- a/harbour/contrib/hbtip/tests/ftpadv.prg +++ b/harbour/contrib/hbtip/tests/ftpadv.prg @@ -21,8 +21,8 @@ PROCEDURE Main( cUrl ) ENDIF IF oUrl:cProto != "ftp" - ? 'This is a "DELE" test for ftp.' - ? 'Use an ftp address with a file that you can delete.' + ? "This is a 'DELE' test for ftp." + ? "Use an ftp address with a file that you can delete." ? QUIT ENDIF diff --git a/harbour/contrib/hbtip/tests/httpadv.prg b/harbour/contrib/hbtip/tests/httpadv.prg index c17c6c3153..81381c7279 100644 --- a/harbour/contrib/hbtip/tests/httpadv.prg +++ b/harbour/contrib/hbtip/tests/httpadv.prg @@ -21,8 +21,8 @@ PROCEDURE Main( cUrl ) ENDIF IF oUrl:cProto != "http" - ? 'This is a header test for http.' - ? 'Use an http address.' + ? "This is a header test for http." + ? "Use an http address." ? QUIT ENDIF diff --git a/harbour/contrib/hbtip/tests/tiptest.prg b/harbour/contrib/hbtip/tests/tiptest.prg index 8ec695033a..d9f1994058 100644 --- a/harbour/contrib/hbtip/tests/tiptest.prg +++ b/harbour/contrib/hbtip/tests/tiptest.prg @@ -105,7 +105,7 @@ PROCEDURE Main( cUrl, cFile ) @ 5, 5 SAY "Connection status: " + oClient:cReply ENDIF - IF ! Empty( cFile ) .AND. Left( cFile, 1 ) == '+' + IF ! Empty( cFile ) .AND. Left( cFile, 1 ) == "+" cFile := SubStr( cFile, 2 ) bWrite := .T. ENDIF diff --git a/harbour/contrib/hbtip/thtml.prg b/harbour/contrib/hbtip/thtml.prg index e3bc377a4f..6d004cce16 100644 --- a/harbour/contrib/hbtip/thtml.prg +++ b/harbour/contrib/hbtip/thtml.prg @@ -139,12 +139,12 @@ METHOD new( cHtmlString ) CLASS THtmlDocument LOCAL cEmptyHtmlDoc, oNode, oSubNode, oErrNode, aHead, aBody, nMode := 0 cEmptyHtmlDoc := '' + hb_eol() + ; - '' + hb_eol() + ; - ' ' + hb_eol() + ; - ' ' + hb_eol() + ; - ' ' + hb_eol() + ; - ' ' + hb_eol() + ; - '' + "" + hb_eol() + ; + " " + hb_eol() + ; + " " + hb_eol() + ; + " " + hb_eol() + ; + " " + hb_eol() + ; + "" IF ! HB_ISSTRING( cHtmlString ) ::root := THtmlNode():new( cEmptyHtmlDoc ) diff --git a/harbour/contrib/rddads/tests/testmg.prg b/harbour/contrib/rddads/tests/testmg.prg index ae8135ec5e..9b45b67abb 100644 --- a/harbour/contrib/rddads/tests/testmg.prg +++ b/harbour/contrib/rddads/tests/testmg.prg @@ -82,7 +82,7 @@ PROCEDURE Main() ? "Advantage Database Server Management Functions in Harbour" ? - ? "Connect:", AdsMgConnect( 'C:' ) + ? "Connect:", AdsMgConnect( "C:" ) ? ? "AdsVersion( 0 ):", AdsVersion( 0 ) ? "AdsVersion( 3 ):", AdsVersion( 3 ) diff --git a/harbour/contrib/xhb/cgi.ch b/harbour/contrib/xhb/cgi.ch index 6dd0e8201d..c2ed8c7ac4 100644 --- a/harbour/contrib/xhb/cgi.ch +++ b/harbour/contrib/xhb/cgi.ch @@ -44,7 +44,7 @@ * */ -#xtranslate DEFAULT(

, ) =>

:= iif(

== NIL, ,

) +#xtranslate Default(

, ) =>

:= iif(

== NIL, ,

) #xtranslate HTMLSpace( ) => Replicate( " ", ) //" " #xtranslate CRLF() => Chr( 13 ) + Chr( 10 ) diff --git a/harbour/contrib/xhb/cstruct.ch b/harbour/contrib/xhb/cstruct.ch index 6bc59f315a..993112f6cb 100644 --- a/harbour/contrib/xhb/cstruct.ch +++ b/harbour/contrib/xhb/cstruct.ch @@ -60,34 +60,34 @@ #xcommand C STRUCTURE [ALIGN ] => ; INIT PROCEDURE __INIT_; ; __ActiveStructure( #, ) ; ; - #xtranslate IS \[ \ { \ } ] => := HB_CStructure( # ):Init( {\} ); ; - #xtranslate IS FROM \ => := HB_CStructure( # ):Buffer( \ ) + #xtranslate IS \[ \ { \ } ] => := hb_CStructure( # ):Init( {\} ); ; + #xtranslate IS FROM \ => := hb_CStructure( # ):Buffer( \ ) // instead of to allow ElemName[n] syntax. - #xcommand MEMBER IS => HB_Member( #, ) + #xcommand MEMBER IS => hb_Member( #, ) /* Will match: MEMBER IS due to expansion of: - #xtranslate IS [...] => := HB_CStructure( # ):Init( {} ) + #xtranslate IS [...] => := hb_CStructure( # ):Init( {} ) as established by C STRUCTURE #xcommand for the given structure. */ - #xcommand MEMBER := HB_CStructure( ):Init( {} ) => ; - HB_Member( #, HB_CStructureId( , .T. ) ) + #xcommand MEMBER := hb_CStructure( ):Init( {} ) => ; + hb_Member( #, hb_CStructureId( , .T. ) ) - #xcommand MEMBER IS ( ) => HB_Member( #, HB_CTypeArrayID( , ) ) + #xcommand MEMBER IS ( ) => hb_Member( #, hb_CTypeArrayId( , ) ) #xcommand MEMBER AS => ; - HB_Member( #, HB_CStructureId( #, .F. ) ) + hb_Member( #, hb_CStructureId( #, .F. ) ) #xcommand END C STRUCTURE [] => ; ; __ClsSetModule( __ActiveStructure() ); ; RETURN #xcommand IMPORT C STRUCTURE => ; - #xtranslate IS \[ \ { \ } ] => := HB_CStructure( # ):Init( {\} ); ; - #xtranslate IS FROM \ => := HB_CStructure( # ):Buffer( \ ) + #xtranslate IS \[ \ { \ } ] => := hb_CStructure( # ):Init( {\} ); ; + #xtranslate IS FROM \ => := hb_CStructure( # ):Buffer( \ ) //----------------------------- C Syntax support ---------------------------------// /* NOTES: @@ -101,17 +101,17 @@ #xcommand typedef struct [] { [[struct] ] } [, <*synon*>] => ; INIT PROCEDURE __INIT_; ; - HB_CStructureCSyntax( #, {[#,]}, <(tag)>, <"synon">, __PACK ); ; + hb_CStructureCSyntax( #, {[#,]}, <(tag)>, <"synon">, __PACK ); ; __ClsSetModule( __ActiveStructure() ); ; RETURN; ; - #xtranslate IS \[ \ { \ } ] => := HB_CStructure( # ):Init( {\} ); ; - #xtranslate IS FROM \ => := HB_CStructure( # ):Buffer( \ ) + #xtranslate IS \[ \ { \ } ] => := hb_CStructure( # ):Init( {\} ); ; + #xtranslate IS FROM \ => := hb_CStructure( # ):Buffer( \ ) #xcommand pragma pack( ) => #undef __PACK; #define __PACK #xcommand pragma pack() => #undef __PACK; #define __PACK 8 - #xtranslate ( struct ) [] => HB_CStructure( # ):Buffer( ) - #xtranslate ( struct * ) => HB_CStructure( # ):Pointer( ) + #xtranslate ( struct ) [] => hb_CStructure( # ):Buffer( ) + #xtranslate ( struct * ) => hb_CStructure( # ):Pointer( ) #endif #endif /* __HBCSTRUCT_CH_ */ diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch index 6ef3100ab3..5509017ba2 100644 --- a/harbour/contrib/xhb/hbcompat.ch +++ b/harbour/contrib/xhb/hbcompat.ch @@ -64,182 +64,181 @@ #define __PLATFORM__LINUX #endif - #xtranslate hb_ScrMaxRow() => gtInfo( HB_GTI_SCREENHEIGHT ) - #xtranslate hb_ScrMaxCol() => gtInfo( HB_GTI_SCREENWIDTH ) - #xtranslate MaxRow(.T.) => gtInfo( HB_GTI_SCREENHEIGHT ) - #xtranslate MaxCol(.T.) => gtInfo( HB_GTI_SCREENWIDTH ) - #xtranslate hb_keyNext([]) => NextKey() + #xtranslate hb_ScrMaxRow() => gtInfo( HB_GTI_SCREENHEIGHT ) + #xtranslate hb_ScrMaxCol() => gtInfo( HB_GTI_SCREENWIDTH ) + #xtranslate MaxRow( .T. ) => gtInfo( HB_GTI_SCREENHEIGHT ) + #xtranslate MaxCol( .T. ) => gtInfo( HB_GTI_SCREENWIDTH ) + #xtranslate hb_keyNext( [] ) => NextKey( ) - #xtranslate hb_osNewLine() => hb_eol() - #xtranslate hb_osPathSeparator() => hb_ps() + #xtranslate hb_osNewLine() => hb_eol() + #xtranslate hb_osPathSeparator() => hb_ps() - #xtranslate hb_dbPack() => __dbPack() - #xtranslate hb_dbZap() => __dbZap() - #xtranslate hb_dbDrop([]) => dbDrop() - #xtranslate hb_dbExists([]) => dbExists() - #xtranslate hb_FieldLen([]) => FieldLen() - #xtranslate hb_FieldDec([]) => FieldDec() - #xtranslate hb_FieldType([]) => FieldType() + #xtranslate hb_dbPack() => __dbPack() + #xtranslate hb_dbZap() => __dbZap() + #xtranslate hb_dbDrop( [] ) => dbDrop( ) + #xtranslate hb_dbExists( [] ) => dbExists( ) + #xtranslate hb_FieldLen( [] ) => FieldLen( ) + #xtranslate hb_FieldDec( [] ) => FieldDec( ) + #xtranslate hb_FieldType( [] ) => FieldType( ) - #xtranslate hb_gtInfo( HB_GTI_INKEYREAD [, ] ) => SetInkeyBeforeBlock([]) <-x-> - #xtranslate hb_gtInfo( HB_GTI_INKEYFILTER [, ] ) => SetInkeyAfterBlock([]) <-x-> + #xtranslate hb_gtInfo( HB_GTI_INKEYREAD [, ] ) => SetInkeyBeforeBlock( [] ) <-x-> + #xtranslate hb_gtInfo( HB_GTI_INKEYFILTER [, ] ) => SetInkeyAfterBlock( [] ) <-x-> - #xtranslate hb_processOpen([]) => hb_openProcess() - #xtranslate hb_processClose([]) => hb_closeProcess() + #xtranslate hb_processOpen( [] ) => hb_OpenProcess( ) + #xtranslate hb_processClose( [] ) => hb_CloseProcess( ) - #xtranslate hb_isregex([]) => hb_isregexstring() - #xtranslate hb_methodName([]) => methodName() - #xtranslate hb_libLoad([]) => libLoad() - #xtranslate hb_libFree([]) => libFree() - #xtranslate hb_adler32([]) => hb_checksum() - #xtranslate hb_keySetLast([]) => setLastKey() - #xtranslate hb_setLastKey([]) => setLastKey() - #xtranslate hb_CStr([]) => CStr() - #xtranslate hb_valToExp([]) => ValToPrgExp() - #xtranslate hb_rddInfo([]) => rddInfo() - #xtranslate hb_idleSleep([]) => SecondsSleep() - #xtranslate hb_UserName() => NetName(1) - #xtranslate hb_FSize() => FileSize() - #xtranslate hb_WildMatch([]) => WildMatch() - #xtranslate hb_bitTest([]) => hb_bitIsSet() - #xtranslate hb_Deserialize() => hb_DeserialNext() + #xtranslate hb_IsRegex( [] ) => hb_IsRegexString( ) + #xtranslate hb_MethodName( [] ) => MethodName( ) + #xtranslate hb_libLoad( [] ) => LibLoad( ) + #xtranslate hb_libFree( [] ) => LibFree( ) + #xtranslate hb_Adler32( [] ) => hb_Checksum( ) + #xtranslate hb_keySetLast( [] ) => hb_SetLastKey( ) + #xtranslate hb_CStr( [] ) => CStr( ) + #xtranslate hb_ValToExp( [] ) => ValToPrgExp( ) + #xtranslate hb_rddInfo( [] ) => rddInfo( ) + #xtranslate hb_idleSleep( [] ) => SecondsSleep( ) + #xtranslate hb_UserName() => NetName(1) + #xtranslate hb_FSize( ) => FileSize( ) + #xtranslate hb_WildMatch( [] ) => WildMatch( ) + #xtranslate hb_bitTest( [] ) => hb_bitIsSet( ) + #xtranslate hb_Deserialize( ) => hb_DeserialNext( ) - #xtranslate hb_HexToNum([]) => HexToNum() - #xtranslate hb_NumToHex([]) => NumToHex() - #xtranslate hb_HexToStr([]) => HexToStr() - #xtranslate hb_StrToHex([]) => StrToHex() + #xtranslate hb_HexToNum( [] ) => HexToNum( ) + #xtranslate hb_NumToHex( [] ) => NumToHex( ) + #xtranslate hb_HexToStr( [] ) => HexToStr( ) + #xtranslate hb_StrToHex( [] ) => StrToHex( ) - #xtranslate hb_AScan([]) => AScan() - #xtranslate hb_RAScan([]) => RAScan() - #xtranslate hb_AIns([]) => AIns() - #xtranslate hb_ADel([]) => ADel() - #xtranslate hb_At([]) => At() + #xtranslate hb_AScan( [] ) => AScan( ) + #xtranslate hb_RAScan( [] ) => RAScan( ) + #xtranslate hb_AIns( [] ) => AIns( ) + #xtranslate hb_ADel( [] ) => ADel( ) + #xtranslate hb_At( [] ) => At( ) - #xtranslate hb_DateTime([]) => DateTime() - #xtranslate hb_Hour([]) => Hour() - #xtranslate hb_Minute([]) => Minute() - #xtranslate hb_TToS([]) => TToS() - #xtranslate hb_SToT([]) => SToT() - #xtranslate hb_TToC([]) => TToC() - #xtranslate hb_CToT([]) => CToT() + #xtranslate hb_DateTime( [] ) => DateTime( ) + #xtranslate hb_Hour( [] ) => Hour( ) + #xtranslate hb_Minute( [] ) => Minute( ) + #xtranslate hb_TToS( [] ) => TToS( ) + #xtranslate hb_SToT( [] ) => SToT( ) + #xtranslate hb_TToC( [] ) => TToC( ) + #xtranslate hb_CToT( [] ) => CToT( ) - #xtranslate hb_GetEnv([]) => GetEnv() - #xtranslate hb_SetKey([]) => SetKey() + #xtranslate hb_GetEnv( [] ) => GetEnv( ) + #xtranslate hb_SetKey( [] ) => SetKey( ) - #xtranslate hb_i18n_gettext() => i18n() + #xtranslate hb_i18n_gettext( ) => i18n( ) - #xtranslate hb_cdpSelect([]) => hb_SetCodepage( ) + #xtranslate hb_cdpSelect( [] ) => hb_SetCodepage( ) - #xtranslate hb_ARGV([]) => hb_CMDARGARGV() + #xtranslate hb_argv( [] ) => hb_CmdArgArgV( ) - #xtranslate hb_IniSetComment([]) => hb_SetIniComment() - #xtranslate hb_IniRead([]) => hb_ReadIni() - #xtranslate hb_IniWrite([]) => hb_WriteIni() + #xtranslate hb_iniSetComment( [] ) => hb_SetIniComment( ) + #xtranslate hb_iniRead( [] ) => hb_ReadIni( ) + #xtranslate hb_iniWrite( [] ) => hb_WriteIni( ) - #xtranslate hb_DisableWaitLocks([]) => DisableWaitLocks() + #xtranslate hb_DisableWaitLocks( [] ) => DisableWaitLocks( ) - #xtranslate hb_gtLock() => HBCONSOLELOCK() - #xtranslate hb_gtUnLock() => HBCONSOLEUNLOCK() + #xtranslate hb_gtLock() => hbConsoleLock() + #xtranslate hb_gtUnLock() => hbConsoleUnLock() /* MT functions */ - #xtranslate hb_mtvm() => hb_multiThread() - #xtranslate hb_threadSelf() => GetCurrentThread() - #xtranslate hb_threadId( [] ) => GetThreadId( ) - #xtranslate hb_threadStart( ) => StartThread( [] ) - #xtranslate hb_threadJoin( ) => JoinThread( ) - #xtranslate hb_threadQuitRequest( ) => KillThread( ) - #xtranslate hb_threadWaitForAll() => WaitForThreads() - #xtranslate hb_threadTerminateAll() => KillAllThreads() + #xtranslate hb_mtvm() => hb_MultiThread() + #xtranslate hb_threadSelf() => GetCurrentThread() + #xtranslate hb_threadID( [] ) => GetThreadId( ) + #xtranslate hb_threadStart( ) => StartThread( [] ) + #xtranslate hb_threadJoin( ) => JoinThread( ) + #xtranslate hb_threadQuitRequest( ) => KillThread( ) + #xtranslate hb_threadWaitForAll() => WaitForThreads() + #xtranslate hb_threadTerminateAll() => KillAllThreads() - #xtranslate hb_mutexNotify() => Notify() - #xtranslate hb_mutexNotifyAll() => NotifyAll() + #xtranslate hb_mutexNotify( ) => Notify( ) + #xtranslate hb_mutexNotifyAll( ) => NotifyAll( ) - #xtranslate hb_mutexSubscribe() => {| mtx, nTimeOut, xSubscribed | ;; - local lSubscribed ;; - xSubscribed := Subscribe( mtx, ; - iif( HB_ISNUMERIC( nTimeOut ), nTimeOut * 1000, ), ; - @lSubscribed ) ; - return lSubscribed ; }:eval( ) - #xtranslate hb_mutexSubscribeNow() => {| mtx, nTimeOut, xSubscribed | ;; - local lSubscribed ;; - xSubscribed := SubscribeNow( mtx, ; - iif( HB_ISNUMERIC( nTimeOut ), nTimeOut * 1000, ), ; - @lSubscribed ) ; - return lSubscribed ; }:eval( ) + #xtranslate hb_mutexSubscribe( ) => {| mtx, nTimeOut, xSubscribed | ;; + LOCAL lSubscribed ;; + xSubscribed := Subscribe( mtx, ; + iif( HB_ISNUMERIC( nTimeOut ), nTimeOut * 1000, ), ; + @lSubscribed ) ; + RETURN lSubscribed ; }:eval( ) + #xtranslate hb_mutexSubscribeNow( ) => {| mtx, nTimeOut, xSubscribed | ;; + LOCAL lSubscribed ;; + xSubscribed := SubscribeNow( mtx, ; + iif( HB_ISNUMERIC( nTimeOut ), nTimeOut * 1000, ), ; + @lSubscribed ) ; + RETURN lSubscribed ; }:eval( ) - #xtranslate hb_MutexLock( , ) => iif( ! HB_ISNUMERIC( ), hb_MutexLock( ) ; - iif( <= 0, hb_MutexTryLock( ), ; - hb_MutexTimeOutLock( , ) ) ) + #xtranslate hb_mutexLock( , ) => iif( ! HB_ISNUMERIC( ), hb_mutexLock( ) ; + iif( <= 0, hb_MutexTryLock( ), ; + hb_MutexTimeOutLock( , ) ) ) /* Hash item functions */ - #xtranslate hb_HASH([]) => HASH() - #xtranslate hb_HHASKEY([]) => HHASKEY() - #xtranslate hb_HPOS([]) => HGETPOS() - #xtranslate hb_HGET([]) => HGET() - #xtranslate hb_HSET([]) => HSET() - #xtranslate hb_HDEL([]) => HDEL() - #xtranslate hb_HKEYAT([]) => HGETKEYAT() - #xtranslate hb_HVALUEAT([]) => HGETVALUEAT() - #xtranslate hb_HVALUEAT([]) => HSETVALUEAT() - #xtranslate hb_HPAIRAT([]) => HGETPAIRAT() - #xtranslate hb_HDELAT([]) => HDELAT() - #xtranslate hb_HKEYS([]) => HGETKEYS() - #xtranslate hb_HVALUES([]) => HGETVALUES() - #xtranslate hb_HFILL([]) => HFILL() - #xtranslate hb_HCLONE([]) => HCLONE() - #xtranslate hb_HCOPY([]) => HCOPY() - #xtranslate hb_HMERGE([]) => HMERGE() - #xtranslate hb_HEVAL([]) => HEVAL() - #xtranslate hb_HSCAN([]) => HSCAN() - #xtranslate hb_HSETCASEMATCH([]) => HSETCASEMATCH() - #xtranslate hb_HCASEMATCH([]) => HGETCASEMATCH() - #xtranslate hb_HSETAUTOADD([]) => HSETAUTOADD() - #xtranslate hb_HAUTOADD([]) => HGETAUTOADD() - #xtranslate hb_HALLOCATE([]) => HALLOCATE() - #xtranslate hb_HDEFAULT([]) => HDEFAULT() + #xtranslate hb_Hash( [] ) => Hash( ) + #xtranslate hb_HHasKey( [] ) => HHasKey( ) + #xtranslate hb_HPos( [] ) => HGetPos( ) + #xtranslate hb_HGet( [] ) => HGet( ) + #xtranslate hb_HSet( [] ) => HSet( ) + #xtranslate hb_HDel( [] ) => HDel( ) + #xtranslate hb_HKeyAt( [] ) => HGetKeyAt( ) + #xtranslate hb_HValueAt( [] ) => HGetValueAt( ) + #xtranslate hb_HValueAt( [] ) => HSetValueAt( ) + #xtranslate hb_HPaiRAt( [] ) => HGetPaiRAt( ) + #xtranslate hb_HDelAt( [] ) => HDelAt( ) + #xtranslate hb_HKeys( [] ) => HGetKeys( ) + #xtranslate hb_HValues( [] ) => HGetValues( ) + #xtranslate hb_HFill( [] ) => HFill( ) + #xtranslate hb_HClone( [] ) => HClone( ) + #xtranslate hb_HCopy( [] ) => HCopy( ) + #xtranslate hb_HMerge( [] ) => HMerge( ) + #xtranslate hb_HEVal( [] ) => HEVal( ) + #xtranslate hb_HScan( [] ) => HScan( ) + #xtranslate hb_HSetCaseMatch( [] ) => HSetCaseMatch( ) + #xtranslate hb_HCaseMatch( [] ) => HGetCaseMatch( ) + #xtranslate hb_HSetAutoAdd( [] ) => HSetAutoAdd( ) + #xtranslate hb_HAutoAdd( [] ) => HGetAutoAdd( ) + #xtranslate hb_HAllocate( [] ) => HAllocate( ) + #xtranslate hb_HDefault( [] ) => HDefault( ) /* Inet functions */ - #xtranslate hb_INETINIT([]) => INETINIT() - #xtranslate hb_INETCLEANUP([]) => INETCLEANUP() - #xtranslate hb_INETCREATE([]) => INETCREATE() - #xtranslate hb_INETCLOSE([]) => INETCLOSE() - #xtranslate hb_INETFD([]) => INETFD() - #xtranslate hb_INETSTATUS([]) => INETSTATUS() - #xtranslate hb_INETERRORCODE([]) => INETERRORCODE() - #xtranslate hb_INETERRORDESC([]) => INETERRORDESC() - #xtranslate hb_INETCLEARERROR([]) => INETCLEARERROR() - #xtranslate hb_INETCOUNT([]) => INETCOUNT() - #xtranslate hb_INETADDRESS([]) => INETADDRESS() - #xtranslate hb_INETPORT([]) => INETPORT() - #xtranslate hb_INETTIMEOUT(, ) => INETSETTIMEOUT(, ) - #xtranslate hb_INETTIMEOUT() => INETGETTIMEOUT() - #xtranslate hb_INETCLEARTIMEOUT([]) => INETCLEARTIMEOUT() - #xtranslate hb_INETTIMELIMIT(, ) => INETSETTIMELIMIT(, ) - #xtranslate hb_INETTIMELIMIT() => INETGETTIMELIMIT() - #xtranslate hb_INETCLEARTIMELIMIT([]) => INETCLEARTIMELIMIT() - #xtranslate hb_INETPERIODCALLBACK(, ) => INETSETPERIODCALLBACK(, ) - #xtranslate hb_INETPERIODCALLBACK() => INETGETPERIODCALLBACK() - #xtranslate hb_INETCLEARPERIODCALLBACK([]) => INETCLEARPERIODCALLBACK() - #xtranslate hb_INETRECV([]) => INETRECV() - #xtranslate hb_INETRECVALL([]) => INETRECVALL() - #xtranslate hb_INETRECVLINE([]) => INETRECVLINE() - #xtranslate hb_INETRECVENDBLOCK([]) => INETRECVENDBLOCK() - #xtranslate hb_INETDATAREADY([]) => INETDATAREADY() - #xtranslate hb_INETSEND([]) => INETSEND() - #xtranslate hb_INETSENDALL([]) => INETSENDALL() - #xtranslate hb_INETGETHOSTS([]) => INETGETHOSTS() - #xtranslate hb_INETGETALIAS([]) => INETGETALIAS() - #xtranslate hb_INETSERVER([]) => INETSERVER() - #xtranslate hb_INETACCEPT([]) => INETACCEPT() - #xtranslate hb_INETCONNECT([]) => INETCONNECT() - #xtranslate hb_INETCONNECTIP([]) => INETCONNECTIP() - #xtranslate hb_INETDGRAMBIND([]) => INETDGRAMBIND() - #xtranslate hb_INETDGRAM([]) => INETDGRAM() - #xtranslate hb_INETDGRAMSEND([]) => INETDGRAMSEND() - #xtranslate hb_INETDGRAMRECV([]) => INETDGRAMRECV() - #xtranslate hb_INETCRLF([]) => INETCRLF() - #xtranslate hb_INETISSOCKET([]) => INETISSOCKET() - #xtranslate hb_INETCLOSE([]) => INETDESTROY() + #xtranslate hb_inetInit( [] ) => inetInit( ) + #xtranslate hb_inetCleanup( [] ) => inetCleanup( ) + #xtranslate hb_inetCreate( [] ) => inetCreate( ) + #xtranslate hb_inetClose( [] ) => inetClose( ) + #xtranslate hb_inetFD( [] ) => inetFD( ) + #xtranslate hb_inetstatus( [] ) => inetStatus( ) + #xtranslate hb_inetErrorCode( [] ) => inetErrorCode( ) + #xtranslate hb_inetErrorDesc( [] ) => inetErrorDesc( ) + #xtranslate hb_inetClearError( [] ) => inetClearError( ) + #xtranslate hb_inetCount( [] ) => inetCount( ) + #xtranslate hb_inetAddress( [] ) => inetAddress( ) + #xtranslate hb_inetPort( [] ) => inetPort( ) + #xtranslate hb_inetTimeout( , ) => inetSetTimeout( , ) + #xtranslate hb_inetTimeout( ) => inetGetTimeout( ) + #xtranslate hb_inetClearTimeout( [] ) => inetClearTimeout( ) + #xtranslate hb_inetTimeLimit( , ) => inetSetTimeLimit( , ) + #xtranslate hb_inetTimeLimit( ) => inetGetTimeLimit( ) + #xtranslate hb_inetClearTimeLimit( [] ) => inetClearTimeLimit( ) + #xtranslate hb_inetPeriodCallback( , ) => inetSetPeriodCallback( , ) + #xtranslate hb_inetPeriodCallback( ) => inetGetPeriodCallback( ) + #xtranslate hb_inetClearPeriodCallback( [] ) => inetClearPeriodCallback( ) + #xtranslate hb_inetRecv( [] ) => inetRecv( ) + #xtranslate hb_inetRecvAll( [] ) => inetRecvAll( ) + #xtranslate hb_inetRecvLine( [] ) => inetRecvLine( ) + #xtranslate hb_inetRecvEndbLock( [] ) => inetRecvEndBlock( ) + #xtranslate hb_inetDataReady( [] ) => inetDataReady( ) + #xtranslate hb_inetSend( [] ) => inetSend( ) + #xtranslate hb_inetSendAll( [] ) => inetSendAll( ) + #xtranslate hb_inetGetHosts( [] ) => inetGetHosts( ) + #xtranslate hb_inetGetAlias( [] ) => inetGetAlias( ) + #xtranslate hb_inetServer( [] ) => inetServer( ) + #xtranslate hb_inetAccept( [] ) => inetAccept( ) + #xtranslate hb_inetConnect( [] ) => inetConnect( ) + #xtranslate hb_inetConnectIP( [] ) => inetConnectIP( ) + #xtranslate hb_inetDGramBind( [] ) => inetDGramBind( ) + #xtranslate hb_inetDGram( [] ) => inetDGram( ) + #xtranslate hb_inetDGramSend( [] ) => inetDGramSend( ) + #xtranslate hb_inetDGramRecv( [] ) => inetDGramRecv( ) + #xtranslate hb_inetCRLF( [] ) => inetCRLF( ) + #xtranslate hb_inetIsSocket( [] ) => inetIsSocket( ) + #xtranslate hb_inetClose( [] ) => inetDestroy( ) /* Some statement endings */ #xcommand ENDSEQUENCE => END @@ -273,11 +272,11 @@ #xtranslate hb_eol() => hb_osNewLine() #xtranslate hb_ps() => hb_osPathSeparator() - #xtranslate MaxRow(.T.) => hb_gtInfo( HB_GTI_VIEWPORTHEIGHT ) - #xtranslate MaxCol(.T.) => hb_gtInfo( HB_GTI_VIEWPORTWIDTH ) + #xtranslate MaxRow( .T. ) => hb_gtInfo( HB_GTI_VIEWPORTHEIGHT ) + #xtranslate MaxCol( .T. ) => hb_gtInfo( HB_GTI_VIEWPORTWIDTH ) #xtranslate NextKey( [] ) => hb_keyNext( ) - #xtranslate Str(,[],[],) => iif( , hb_ntos( ), Str( ) ) + #xtranslate Str( , [], [], ) => iif( , hb_ntOS( ), Str( ) ) #xuntranslate NetName( => #xuntranslate MemoWrit( => @@ -288,14 +287,14 @@ #xuntranslate AIns( => #xuntranslate ADel( => - #xtranslate AIns(,,[]) => hb_AIns( , , ) - #xtranslate ADel(,,) => hb_ADel( , , ) + #xtranslate AIns( , , [] ) => hb_AIns( , , ) + #xtranslate ADel( , , ) => hb_ADel( , , ) #xtranslate AScan(,,[],[],) => hb_AScan( , , , , ) - #xtranslate At(,,[]) => hb_At( , , ) + #xtranslate At( , , [] ) => hb_At( , , ) - #xtranslate GetEnv([]) => hb_GetEnv( ) - #xtranslate SetKey([]) => hb_SetKey( ) + #xtranslate GetEnv( [] ) => hb_GetEnv( ) + #xtranslate SetKey( [] ) => hb_SetKey( ) /* TEXT INTO */ #xcommand TEXT INTO => #pragma __text|+=%s+hb_eol();:="" @@ -304,7 +303,7 @@ #xcommand DEFAULT => OTHERWISE /* FOR EACH hb_enumIndex() */ - #xtranslate hb_enumIndex() => :__enumIndex() + #xtranslate hb_enumIndex( ) => :__enumIndex() /* TRY / CATCH / FINALLY / END */ #xcommand TRY => BEGIN SEQUENCE WITH {| oErr | Break( oErr ) } @@ -316,20 +315,20 @@ #xcommand > [<*x*>] => } /* xHarbour operators: IN, HAS, LIKE, >>, <<, |, &, ^^ */ - #translate ( IN ) => ( () $ () ) - #translate ( HAS ) => ( HB_REGEXHAS( (), () ) ) - #translate ( LIKE ) => ( HB_REGEXLIKE( (), () ) ) - #translate ( \<\< ) => ( HB_BITSHIFT( (), () ) ) - #translate ( >> ) => ( HB_BITSHIFT( (), -() ) ) + #translate ( IN ) => ( ( ) $ ( ) ) + #translate ( HAS ) => ( hb_regexHas( ( ), ( ) ) ) + #translate ( LIKE ) => ( hb_regexLike( ( ), ( ) ) ) + #translate ( \<\< ) => ( hb_bitShift( ( ), ( ) ) ) + #translate ( >> ) => ( hb_bitShift( ( ), -( ) ) ) /* NOTE: These macros can break some valid Harbour/Clipper constructs, so they are disabled by default. Enable them with care, or even better to switch to use HB_BIT*() functions directly. They are optimized by Harbour compiler the same way (and even more) as these C-like operators, without any bad side-effects. */ #if defined( XHB_BITOP ) - #translate ( | ) => ( HB_BITOR( (), () ) ) - #translate ( & ) => ( HB_BITAND( (), () ) ) - #translate ( ^^ ) => ( HB_BITXOR( (), () ) ) + #translate ( | ) => ( hb_bitOr( ( ), ( ) ) ) + #translate ( & ) => ( hb_bitAnd( ( ), ( ) ) ) + #translate ( ^^ ) => ( hb_bitXor( ( ), ( ) ) ) #endif #command @ , PROMPT [ MESSAGE ] [ COLOR ] => ; @@ -344,61 +343,61 @@ #xtranslate gtSetClipboard( ) => hb_gtInfo( HB_GTI_CLIPBOARDDATA, ) #xtranslate gtGetClipboard() => hb_gtInfo( HB_GTI_CLIPBOARDDATA ) - #xtranslate gtGetClipBoardSize() => Len( hb_gtInfo( HB_GTI_CLIPBOARDDATA ) ) - #xtranslate gtPasteClipBoard() => hb_gtInfo( HB_GTI_CLIPBOARDPASTE ) + #xtranslate gtGetClipboardSize() => Len( hb_gtInfo( HB_GTI_CLIPBOARDDATA ) ) + #xtranslate gtPasteClipboard() => hb_gtInfo( HB_GTI_CLIPBOARDPASTE ) #xtranslate gtProcessMessages() => NextKey() - #xtranslate SetInkeyBeforeBlock([]) => hb_gtInfo( HB_GTI_INKEYREAD [, ] ) <-x-> - #xtranslate SetInkeyAfterBlock([]) => hb_gtInfo( HB_GTI_INKEYFILTER [, ] ) <-x-> - #xtranslate gfxPrimitive([]) => hb_gfxPrimitive( ) - #xtranslate gfxText([]) => hb_gfxText( ) + #xtranslate SetInkeyBeforeBlock( [] ) => hb_gtInfo( HB_GTI_INKEYREAD [, ] ) <-x-> + #xtranslate SetInkeyAfterBlock( [] ) => hb_gtInfo( HB_GTI_INKEYFILTER [, ] ) <-x-> + #xtranslate GfxPrimitive( [] ) => hb_gfxPrimitive( ) + #xtranslate GfxText( [] ) => hb_gfxText( ) - #xtranslate hb_openProcess([]) => hb_processOpen( ) - #xtranslate hb_closeProcess([]) => hb_processClose( ) + #xtranslate hb_OpenProcess( [] ) => hb_processOpen( ) + #xtranslate hb_CloseProcess( [] ) => hb_processClose( ) - #xtranslate hb_isregexstring([]) => hb_isregex( ) - #xtranslate methodName([]) => hb_methodName( ) - #xtranslate libLoad([]) => hb_libLoad( ) - #xtranslate libFree([]) => hb_libFree( ) - #xtranslate hb_checksum([]) => hb_adler32( ) - #xtranslate setLastKey([]) => hb_keySetLast( ) - #xtranslate CStr([]) => hb_CStr( ) - #xtranslate ValToPrgExp([]) => hb_valToExp( ) - #xtranslate SecondsSleep([]) => hb_idleSleep( ) - #xtranslate WildMatch([]) => hb_WildMatch( ) - #xtranslate hb_bitIsSet([]) => hb_bitTest( ) - #xtranslate hb_DeserialNext() => hb_Deserialize( ) - #xtranslate hb_funcptr() => __dynsn2sym( ) + #xtranslate hb_IsRegexString( [] ) => hb_IsRegex( ) + #xtranslate MethodName( [] ) => hb_MethodName( ) + #xtranslate LibLoad( [] ) => hb_libLoad( ) + #xtranslate LibFree( [] ) => hb_libFree( ) + #xtranslate hb_Checksum( [] ) => hb_Adler32( ) + #xtranslate hb_SetLastKey( [] ) => hb_keySetLast( ) + #xtranslate CStr( [] ) => hb_CStr( ) + #xtranslate ValToPrgExp( [] ) => hb_ValToExp( ) + #xtranslate SecondsSleep( [] ) => hb_idleSleep( ) + #xtranslate WildMatch( [] ) => hb_WildMatch( ) + #xtranslate hb_bitIsSet( [] ) => hb_bitTest( ) + #xtranslate hb_DeserialNext( ) => hb_Deserialize( ) + #xtranslate hb_FuncPtr( ) => __dynSN2Sym( ) - #xtranslate HexToNum([]) => hb_HexToNum( ) - #xtranslate NumToHex([]) => hb_NumToHex( ) - #xtranslate HexToStr([]) => hb_HexToStr( ) - #xtranslate StrToHex([]) => hb_StrToHex( ) + #xtranslate HexToNum( [] ) => hb_HexToNum( ) + #xtranslate NumToHex( [] ) => hb_NumToHex( ) + #xtranslate HexToStr( [] ) => hb_HexToStr( ) + #xtranslate StrToHex( [] ) => hb_StrToHex( ) - #xtranslate ISPOINTER( ) => hb_ISPOINTER( ) + #xtranslate IsPointer( ) => HB_ISPOINTER( ) - #xtranslate hb_SetIniComment([]) => hb_IniSetComment( ) - #xtranslate hb_ReadIni([]) => hb_IniRead( ) - #xtranslate hb_WriteIni([]) => hb_IniWrite( ) + #xtranslate hb_SetIniComment( [] ) => hb_iniSetComment( ) + #xtranslate hb_ReadIni( [] ) => hb_iniRead( ) + #xtranslate hb_WriteIni( [] ) => hb_iniWrite( ) - #xtranslate DisableWaitLocks([]) => hb_DisableWaitLocks( ) + #xtranslate DisableWaitLocks( [] ) => hb_DisableWaitLocks( ) - #xtranslate HBCONSOLELOCK() => hb_gtLock() - #xtranslate HBCONSOLEUNLOCK() => hb_gtUnLock() + #xtranslate hbConsoleLock() => hb_gtLock() + #xtranslate hbConsoleUnLock() => hb_gtUnLock() - #xtranslate hb_CMDARGARGV([]) => hb_ARGV( ) + #xtranslate hb_CmdArgArgV( [] ) => hb_argv( ) - #xtranslate RAScan([]) => hb_RAScan( ) + #xtranslate RAScan( [] ) => hb_RAScan( ) - #xtranslate AsizeAlloc( [, ] ) => AFill( ) + #xtranslate ASizeAlloc( [, ] ) => AFill( ) #xtranslate ALenAlloc( [, ] ) => Len( ) - #xtranslate DateTime([]) => hb_DateTime( ) - #xtranslate Hour([]) => hb_Hour( ) - #xtranslate Minute([]) => hb_Minute( ) - #xtranslate TToS([]) => hb_TToS( ) - #xtranslate SToT([]) => hb_SToT( ) - #xtranslate TToC([]) => hb_TToC( ) - #xtranslate CToT([]) => hb_CToT( ) + #xtranslate DateTime( [] ) => hb_DateTime( ) + #xtranslate Hour( [] ) => hb_Hour( ) + #xtranslate Minute( [] ) => hb_Minute( ) + #xtranslate TToS( [] ) => hb_TToS( ) + #xtranslate SToT( [] ) => hb_SToT( ) + #xtranslate TToC( [] ) => hb_TToC( ) + #xtranslate CToT( [] ) => hb_CToT( ) #xtranslate i18n( ) => hb_i18n_gettext( ) @@ -407,10 +406,10 @@ /* MT functions */ #xtranslate hb_MultiThread() => hb_mtvm() #xtranslate GetCurrentThread() => hb_threadSelf() - #xtranslate GetThreadId( [] ) => hb_threadId( ) - #xtranslate ThreadGetCurrentInternal() => hb_threadId() - #xtranslate IsSameThread( [,] ) => ( hb_threadId( ) == hb_threadId( ) ) - #xtranslate IsValidThread( ) => ( hb_threadId( ) != 0 ) + #xtranslate GetThreadId( [] ) => hb_threadID( ) + #xtranslate ThreadGetCurrentInternal() => hb_threadID() + #xtranslate IsSameThread( [,] ) => ( hb_threadID( ) == hb_threadID( ) ) + #xtranslate IsValidThread( ) => ( hb_threadID( ) != 0 ) #xtranslate JoinThread( ) => hb_threadJoin( ) #xtranslate KillThread( ) => hb_threadQuitRequest( ) #xtranslate StopThread( ) => hb_threadQuitRequest( ); hb_threadJoin( ) @@ -441,21 +440,21 @@ #xtranslate StartThread( [] ) => hb_threadStart( ) #xtranslate StartThread( , [, ] ) => iif( HB_ISOBJECT( ) .AND. HB_ISSTRING( ), ; - hb_threadStart( {| ... | ():&()( ... ) } [, ] ), ; + hb_threadStart( {| ... | ( ):&( )( ... ) } [, ] ), ; hb_threadStart( , [, ] ) ) /* not possible to well replicate xHarbour behavior because it's buggy these function results are different on different platform, chosen translation which returns compatible types (numeric) */ - #xtranslate ThreadGetCurrent() => hb_threadId() - #xtranslate GetSystemThreadId( [] ) => hb_threadId( ) + #xtranslate ThreadGetCurrent() => hb_threadID() + #xtranslate GetSystemThreadId( [] ) => hb_threadID( ) /* do not need translation */ - /* hb_MutexCreate() => hb_mutexCreate() */ - /* hb_MutexUnlock( ) => hb_mutexUnlock( ) */ + /* hb_mutexCreate() => hb_mutexCreate() */ + /* hb_mutexUnLock( ) => hb_mutexUnLock( ) */ /* do not need translation only when xHarbour code is compiled by Harbour */ - /* hb_MutexLock( ) => hb_mutexLock( ) */ + /* hb_mutexLock( ) => hb_mutexLock( ) */ /* functions I do not want to document as public .prg API in Harbour */ /* ThreadInspect() */ @@ -470,96 +469,96 @@ /* hb_ThreadCountStacks() */ /* Hash item functions */ - #xtranslate HASH([]) => hb_HASH( ) - #xtranslate HHASKEY([]) => hb_HHASKEY( ) - #xtranslate HGETPOS([]) => hb_HPOS( ) - #xtranslate HGET([]) => hb_HGET( ) - #xtranslate HSET([]) => hb_HSET( ) - #xtranslate HDEL([]) => hb_HDEL( ) - #xtranslate HGETKEYAT([]) => hb_HKEYAT( ) - #xtranslate HGETVALUEAT([]) => hb_HVALUEAT( ) - #xtranslate HSETVALUEAT([]) => hb_HVALUEAT( ) - #xtranslate HGETPAIRAT([]) => hb_HPAIRAT( ) - #xtranslate HDELAT([]) => hb_HDELAT( ) - #xtranslate HGETKEYS([]) => hb_HKEYS( ) - #xtranslate HGETVALUES([]) => hb_HVALUES( ) - #xtranslate HFILL([]) => hb_HFILL( ) - #xtranslate HCLONE([]) => hb_HCLONE( ) - #xtranslate HCOPY([]) => hb_HCOPY( ) - #xtranslate HMERGE([]) => hb_HMERGE( ) - #xtranslate HEVAL([]) => hb_HEVAL( ) - #xtranslate HSCAN([]) => hb_HSCAN( ) - #xtranslate HSETCASEMATCH([]) => hb_HSETCASEMATCH( ) - #xtranslate HGETCASEMATCH([]) => hb_HCASEMATCH( ) - #xtranslate HSETAUTOADD([]) => hb_HSETAUTOADD( ) - #xtranslate HGETAUTOADD([]) => hb_HAUTOADD( ) - #xtranslate HALLOCATE([]) => hb_HALLOCATE( ) - #xtranslate HDEFAULT([]) => hb_HDEFAULT( ) - #xtranslate HSETPARTITION([]) => + #xtranslate Hash( [] ) => hb_Hash( ) + #xtranslate HHasKey( [] ) => hb_HHasKey( ) + #xtranslate HGetPos( [] ) => hb_HPos( ) + #xtranslate HGet( [] ) => hb_HGet( ) + #xtranslate HSet( [] ) => hb_HSet( ) + #xtranslate HDel( [] ) => hb_HDel( ) + #xtranslate HGetKeyAt( [] ) => hb_HKeyAt( ) + #xtranslate HGetValueAt( [] ) => hb_HValueAt( ) + #xtranslate HSetValueAt( [] ) => hb_HValueAt( ) + #xtranslate HGetPaiRAt( [] ) => hb_HPaiRAt( ) + #xtranslate HDelAt( [] ) => hb_HDelAt( ) + #xtranslate HGetKeys( [] ) => hb_HKeys( ) + #xtranslate HGetValues( [] ) => hb_HValues( ) + #xtranslate HFill( [] ) => hb_HFill( ) + #xtranslate HClone( [] ) => hb_HClone( ) + #xtranslate HCopy( [] ) => hb_HCopy( ) + #xtranslate HMerge( [] ) => hb_HMerge( ) + #xtranslate HEVal( [] ) => hb_HEVal( ) + #xtranslate HScan( [] ) => hb_HScan( ) + #xtranslate HSetCaseMatch( [] ) => hb_HSetCaseMatch( ) + #xtranslate HGetCaseMatch( [] ) => hb_HCaseMatch( ) + #xtranslate HSetAutoAdd( [] ) => hb_HSetAutoAdd( ) + #xtranslate HGetAutoAdd( [] ) => hb_HAutoAdd( ) + #xtranslate HAllocate( [] ) => hb_HAllocate( ) + #xtranslate HDefault( [] ) => hb_HDefault( ) + #xtranslate HSetPartition( [] ) => /* Associative hash array functions */ - #xtranslate HAAGETKEYAT([]) => hb_HKEYAT( ) - #xtranslate HAAGETVALUEAT([]) => hb_HVALUEAT( ) - #xtranslate HAADELAT([]) => hb_HDELAT( ) - #xtranslate HAAGETPOS([]) => hb_HPOS( ) - #xtranslate HAAGETREALPOS(,) => iif( HB_ISNUMERIC( ) .AND. >= 1 .AND. ; - int( ) <= len( ), int( ), 0 ) - #xtranslate HGETVAAPOS() => {| h | ;; - local a := array( len( h ), v ;; - for each v in a ;; + #xtranslate haAGetKeyAt( [] ) => hb_HKeyAt( ) + #xtranslate haAGetValueAt( [] ) => hb_HValueAt( ) + #xtranslate haADelAt( [] ) => hb_HDelAt( ) + #xtranslate haAGetPos( [] ) => hb_HPos( ) + #xtranslate haAGetRealPos( , ) => iif( HB_ISNUMERIC( ) .AND. >= 1 .AND. ; + Int( ) <= Len( ), Int( ), 0 ) + #xtranslate HGetVaaPos( ) => {| h | ;; + LOCAL a := Array( Len( h ), v ;; + FOR EACH v IN a ;; v := v:__enumIndex() ;; - next ;; - return a ; }:eval( ) - #xtranslate HGETAACOMPATIBILITY() => hb_HKEEPORDER( ) - #xtranslate HSETAACOMPATIBILITY([]) => {| h | ;; - hb_HKEEPORDER( h ) ;; - return .T. ; }:eval( ) + NEXT ;; + RETURN a ; }:eval( ) + #xtranslate HGetAACompatibility( ) => hb_HKeepOrder( ) + #xtranslate HSetAACompatibility( [] ) => {| h | ;; + hb_HKeepOrder( h ) ;; + RETURN .T. ; }:eval( ) /* Inet functions */ - #xtranslate INETINIT([]) => hb_INETINIT( ) - #xtranslate INETCLEANUP([]) => hb_INETCLEANUP( ) - #xtranslate INETCREATE([]) => hb_INETCREATE( ) - #xtranslate INETCLOSE([]) => hb_INETCLOSE( ) - #xtranslate INETFD([]) => hb_INETFD( ) - #xtranslate INETSTATUS([]) => hb_INETSTATUS( ) - #xtranslate INETERRORCODE([]) => hb_INETERRORCODE( ) - #xtranslate INETERRORDESC([]) => hb_INETERRORDESC( ) - #xtranslate INETCLEARERROR([]) => hb_INETCLEARERROR( ) - #xtranslate INETCOUNT([]) => hb_INETCOUNT( ) - #xtranslate INETADDRESS([]) => hb_INETADDRESS( ) - #xtranslate INETPORT([]) => hb_INETPORT( ) - #xtranslate INETSETTIMEOUT([]) => hb_INETTIMEOUT( ) - #xtranslate INETGETTIMEOUT([]) => hb_INETTIMEOUT( ) - #xtranslate INETCLEARTIMEOUT([]) => hb_INETCLEARTIMEOUT( ) - #xtranslate INETSETTIMELIMIT([]) => hb_INETTIMELIMIT( ) - #xtranslate INETGETTIMELIMIT([]) => hb_INETTIMELIMIT( ) - #xtranslate INETCLEARTIMELIMIT([]) => hb_INETCLEARTIMELIMIT( ) - #xtranslate INETSETPERIODCALLBACK([]) => hb_INETPERIODCALLBACK( ) - #xtranslate INETGETPERIODCALLBACK([]) => hb_INETPERIODCALLBACK( ) - #xtranslate INETCLEARPERIODCALLBACK([]) => hb_INETCLEARPERIODCALLBACK( ) - #xtranslate INETRECV([]) => hb_INETRECV( ) - #xtranslate INETRECVALL([]) => hb_INETRECVALL( ) - #xtranslate INETRECVLINE([]) => hb_INETRECVLINE( ) - #xtranslate INETRECVENDBLOCK([]) => hb_INETRECVENDBLOCK( ) - #xtranslate INETDATAREADY([]) => hb_INETDATAREADY( ) - #xtranslate INETSEND([]) => hb_INETSEND( ) - #xtranslate INETSENDALL([]) => hb_INETSENDALL( ) - #xtranslate INETGETHOSTS([]) => hb_INETGETHOSTS( ) - #xtranslate INETGETALIAS([]) => hb_INETGETALIAS( ) - #xtranslate INETSERVER([]) => hb_INETSERVER( ) - #xtranslate INETACCEPT([]) => hb_INETACCEPT( ) - #xtranslate INETCONNECT([]) => hb_INETCONNECT( ) - #xtranslate INETCONNECTIP([]) => hb_INETCONNECTIP( ) - #xtranslate INETDGRAMBIND([]) => hb_INETDGRAMBIND( ) - #xtranslate INETDGRAM([]) => hb_INETDGRAM( ) - #xtranslate INETDGRAMSEND([]) => hb_INETDGRAMSEND( ) - #xtranslate INETDGRAMRECV([]) => hb_INETDGRAMRECV( ) - #xtranslate INETCRLF([]) => hb_INETCRLF( ) - #xtranslate INETISSOCKET([]) => hb_INETISSOCKET( ) - #xtranslate INETDESTROY([]) => iif( HB_INETISSOCKET( ), hb_INETCLOSE( ), ) + #xtranslate inetInit( [] ) => hb_inetInit( ) + #xtranslate inetCleanup( [] ) => hb_inetCleanup( ) + #xtranslate inetCreate( [] ) => hb_inetCreate( ) + #xtranslate inetClose( [] ) => hb_inetClose( ) + #xtranslate inetFD( [] ) => hb_inetFD( ) + #xtranslate inetStatus( [] ) => hb_inetstatus( ) + #xtranslate inetErrorCode( [] ) => hb_inetErrorCode( ) + #xtranslate inetErrorDesc( [] ) => hb_inetErrorDesc( ) + #xtranslate inetClearError( [] ) => hb_inetClearError( ) + #xtranslate inetCount( [] ) => hb_inetCount( ) + #xtranslate inetAddress( [] ) => hb_inetAddress( ) + #xtranslate inetPort( [] ) => hb_inetPort( ) + #xtranslate inetSetTimeout( [] ) => hb_inetTimeout( ) + #xtranslate inetGetTimeout( [] ) => hb_inetTimeout( ) + #xtranslate inetClearTimeout( [] ) => hb_inetClearTimeout( ) + #xtranslate inetSetTimeLimit( [] ) => hb_inetTimeLimit( ) + #xtranslate inetGetTimeLimit( [] ) => hb_inetTimeLimit( ) + #xtranslate inetClearTimeLimit( [] ) => hb_inetClearTimeLimit( ) + #xtranslate inetSetPeriodCallback( [] ) => hb_inetPeriodCallback( ) + #xtranslate inetGetPeriodCallback( [] ) => hb_inetPeriodCallback( ) + #xtranslate inetClearPeriodCallback( [] ) => hb_inetClearPeriodCallback( ) + #xtranslate inetRecv( [] ) => hb_inetRecv( ) + #xtranslate inetRecvAll( [] ) => hb_inetRecvAll( ) + #xtranslate inetRecvLine( [] ) => hb_inetRecvLine( ) + #xtranslate inetRecvEndBlock( [] ) => hb_inetRecvEndbLock( ) + #xtranslate inetDataReady( [] ) => hb_inetDataReady( ) + #xtranslate inetSend( [] ) => hb_inetSend( ) + #xtranslate inetSendAll( [] ) => hb_inetSendAll( ) + #xtranslate inetGetHosts( [] ) => hb_inetGetHosts( ) + #xtranslate inetGetAlias( [] ) => hb_inetGetAlias( ) + #xtranslate inetServer( [] ) => hb_inetServer( ) + #xtranslate inetAccept( [] ) => hb_inetAccept( ) + #xtranslate inetConnect( [] ) => hb_inetConnect( ) + #xtranslate inetConnectIP( [] ) => hb_inetConnectIP( ) + #xtranslate inetDGramBind( [] ) => hb_inetDGramBind( ) + #xtranslate inetDGram( [] ) => hb_inetDGram( ) + #xtranslate inetDGramSend( [] ) => hb_inetDGramSend( ) + #xtranslate inetDGramRecv( [] ) => hb_inetDGramRecv( ) + #xtranslate inetCRLF( [] ) => hb_inetCRLF( ) + #xtranslate inetIsSocket( [] ) => hb_inetIsSocket( ) + #xtranslate inetDestroy( [] ) => iif( hb_inetIsSocket( ), hb_inetClose( ), ) /* THROW => generate error */ - #xtranslate THROW( ) => ( Eval( ErrorBlock(), ), Break( ) ) + #xtranslate Throw( ) => ( Eval( ErrorBlock(), ), Break( ) ) #endif diff --git a/harbour/contrib/xhb/hbctypes.ch b/harbour/contrib/xhb/hbctypes.ch index ecf4f50ef0..e29f8d4b64 100644 --- a/harbour/contrib/xhb/hbctypes.ch +++ b/harbour/contrib/xhb/hbctypes.ch @@ -50,40 +50,40 @@ */ #ifndef __HBCTYPES_CH_ - #define __HBCTYPES_CH_ +#define __HBCTYPES_CH_ - #define CTYPE_VOID 0 +#define CTYPE_VOID 0 - #define CTYPE_CHAR 1 - #define CTYPE_UNSIGNED_CHAR -1 - #define CTYPE_CHAR_PTR 10 - #define CTYPE_UNSIGNED_CHAR_PTR -10 +#define CTYPE_CHAR 1 +#define CTYPE_UNSIGNED_CHAR -1 +#define CTYPE_CHAR_PTR 10 +#define CTYPE_UNSIGNED_CHAR_PTR -10 - #define CTYPE_SHORT 2 - #define CTYPE_UNSIGNED_SHORT -2 - #define CTYPE_SHORT_PTR 20 - #define CTYPE_UNSIGNED_SHORT_PTR -20 +#define CTYPE_SHORT 2 +#define CTYPE_UNSIGNED_SHORT -2 +#define CTYPE_SHORT_PTR 20 +#define CTYPE_UNSIGNED_SHORT_PTR -20 - #define CTYPE_INT 3 - #define CTYPE_UNSIGNED_INT -3 - #define CTYPE_INT_PTR 30 - #define CTYPE_UNSIGNED_INT_PTR -30 +#define CTYPE_INT 3 +#define CTYPE_UNSIGNED_INT -3 +#define CTYPE_INT_PTR 30 +#define CTYPE_UNSIGNED_INT_PTR -30 - #define CTYPE_LONG 4 - #define CTYPE_UNSIGNED_LONG -4 - #define CTYPE_LONG_PTR 40 - #define CTYPE_UNSIGNED_LONG_PTR -40 +#define CTYPE_LONG 4 +#define CTYPE_UNSIGNED_LONG -4 +#define CTYPE_LONG_PTR 40 +#define CTYPE_UNSIGNED_LONG_PTR -40 - #define CTYPE_FLOAT 5 - #define CTYPE_FLOAT_PTR 50 +#define CTYPE_FLOAT 5 +#define CTYPE_FLOAT_PTR 50 - #define CTYPE_DOUBLE 6 - #define CTYPE_DOUBLE_PTR 60 +#define CTYPE_DOUBLE 6 +#define CTYPE_DOUBLE_PTR 60 - #define CTYPE_VOID_PTR 7 +#define CTYPE_VOID_PTR 7 - /* _Must_ be smaller than CTYPE_STRUCTURE_PTR */ - #define CTYPE_STRUCTURE 1000 - #define CTYPE_STRUCTURE_PTR 10000 +/* _Must_ be smaller than CTYPE_STRUCTURE_PTR */ +#define CTYPE_STRUCTURE 1000 +#define CTYPE_STRUCTURE_PTR 10000 #endif /* __HBCTYPES_CH_ */ diff --git a/harbour/contrib/xhb/hbdll.ch b/harbour/contrib/xhb/hbdll.ch index 0c7aa06126..ad73a1e287 100644 --- a/harbour/contrib/xhb/hbdll.ch +++ b/harbour/contrib/xhb/hbdll.ch @@ -74,10 +74,10 @@ THREAD STATIC t_cTemplate;; IF t_cTemplate == NIL;; t_cTemplate := DllPrepareCall( <(DllName)>, iif( <.CallConvention.>, , DC_CALL_STD ), iif( <.DllFuncName.>, #, # ) );; - end;; + END;; IF <.ArgName.>;; RETURN DllExecuteCall( t_cTemplate, [, ] );; - end;; + END;; RETURN DllExecuteCall( t_cTemplate ) #xcommand IMPORT [] [ ] ; @@ -86,10 +86,10 @@ THREAD STATIC t_cTemplate;; IF t_cTemplate == NIL;; t_cTemplate := DllPrepareCall( <(DllName)>, iif( <.CallConvention.>, , DC_CALL_STD ), iif( <.DllFuncName.>, #, # ) );; - end;; + END;; IF <.ArgName.>;; RETURN DllExecuteCall( t_cTemplate, [, ] );; - end;; + END;; RETURN DllExecuteCall( t_cTemplate ) @@ -99,10 +99,10 @@ THREAD STATIC t_cTemplate;; IF t_cTemplate == NIL;; t_cTemplate := DllPrepareCall( <(DllName)>, iif( <.CallConvention.>, , DC_CALL_STD ), iif( <.DllFuncName.>, #, # ) );; - end;; + END;; IF <.ArgName.>;; RETURN DllExecuteCall( t_cTemplate, [, ] );; - end;; + END;; RETURN DllExecuteCall( t_cTemplate ) #xcommand IMPORT [] [ ] ; @@ -111,10 +111,10 @@ THREAD STATIC t_cTemplate;; IF t_cTemplate == NIL;; t_cTemplate := DllPrepareCall( <(DllName)>, iif( <.CallConvention.>, , DC_CALL_STD ), iif( <.DllFuncName.>, #, # ) );; - end;; + END;; IF <.ArgName.>;; RETURN DllExecuteCall( t_cTemplate, [, ] );; - end;; + END;; RETURN DllExecuteCall( t_cTemplate ) // FoxPro syntax @@ -123,7 +123,7 @@ THREAD STATIC t_cTemplate;; IF t_cTemplate == NIL;; t_cTemplate := DllPrepareCall( <(DllName)>, DC_CALL_STD, iif( <.DllFuncName.>, <(DllFuncName)>, # ) );; - end;; + END;; RETURN DllExecuteCall( t_cTemplate, ... ) // FWH @@ -132,7 +132,7 @@ THREAD STATIC t_cTemplate;; IF t_cTemplate == NIL;; t_cTemplate := DllPrepareCall( <(DllName)>, iif( <.Pascal.>, DC_CALL_STD, DC_CALL_CDECL ), iif( <.DllFuncName.>, <(DllFuncName)>, # ) );; - end;; + END;; RETURN DllExecuteCall( t_cTemplate [, ] [, ] ) #xcommand DLL32 [] FUNCTION ( [ AS ] [, AS ] ) AS [] [ FROM ] LIB <(DllName)> => ; @@ -140,7 +140,7 @@ THREAD STATIC t_cTemplate;; IF t_cTemplate == NIL;; t_cTemplate := DllPrepareCall( <(DllName)>, iif( <.Pascal.>, DC_CALL_STD, DC_CALL_CDECL ), iif( <.DllFuncName.>, <(DllFuncName)>, # ) );; - end;; + END;; RETURN DllExecuteCall( t_cTemplate [, ] [, ] ) #endif diff --git a/harbour/contrib/xhb/hblog.ch b/harbour/contrib/xhb/hblog.ch index 6c9f849bb2..e4a198b757 100644 --- a/harbour/contrib/xhb/hblog.ch +++ b/harbour/contrib/xhb/hblog.ch @@ -73,37 +73,37 @@ [ ([ [,[,[,[,[,]]]]]])] ; [ ( [ [,]] )] ; [NAME ]=>; - HB_InitStandardLog() ;; - if <.con.>;; - HB_StandardLogAdd( HB_LogConsole():New( ));; - end ;; - if <.fil.> ;; - HB_StandardLogAdd( HB_LogFile():New( , , , ));; - end ;; - if <.mon.> ;; - HB_StandardLogAdd( HB_LogInetPort():New( , ));; - end ;; - if <.sys.> ;; - HB_StandardLogAdd( HB_LogSyslog():New( , ));; - end ;; - if <.ema.> ;; - HB_StandardLogAdd( HB_LogEmail():New( ,,,,,));; - end ;; - if <.dbg.> ;; - HB_StandardLogAdd( HB_LogDebug():New( , ) ) ;; - end ;; - HB_StandardLogName( );; - HB_OpenStandardLog() + hb_InitStandardLog() ;; + IF <.con.>;; + hb_StandardLogAdd( hb_LogConsole():New( ));; + END ;; + IF <.fil.> ;; + hb_StandardLogAdd( hb_LogFile():New( , , , ));; + END ;; + IF <.mon.> ;; + hb_StandardLogAdd( hb_LoginetPort():New( , ));; + END ;; + IF <.sys.> ;; + hb_StandardLogAdd( hb_LogSysLog():New( , ));; + END ;; + IF <.ema.> ;; + hb_StandardLogAdd( hb_LogEmail():New( ,,,,,));; + END ;; + IF <.dbg.> ;; + hb_StandardLogAdd( hb_LogDebug():New( , ) ) ;; + END ;; + hb_StandardLogName( );; + hb_OpenStandardLog() -#xcommand SET LOG STYLE => HB_SetStandardLogStyle( ) +#xcommand SET LOG STYLE => hb_SetStandardLogStyle( ) #xcommand LOG [PRIORITY ] => ; - HB_StandardLog( HB_BldLogMsg( ), ) + hb_StandardLog( hb_BldLogMsg( ), ) #xcommand LOG [PRIO ] => ; - HB_StandardLog( HB_BldLogMsg( ), ) + hb_StandardLog( hb_BldLogMsg( ), ) -#xcommand CLOSE LOG => HB_CloseStandardLog() +#xcommand CLOSE LOG => hb_CloseStandardLog() #xtranslate PRIO[RITY] DEFAULT => PRIO HB_LOG_DEFAULT #xtranslate PRIO[RITY] CRITICAL => PRIO HB_LOG_CRITICAL diff --git a/harbour/contrib/xhb/html.ch b/harbour/contrib/xhb/html.ch index 719f6463c1..269d19b31d 100644 --- a/harbour/contrib/xhb/html.ch +++ b/harbour/contrib/xhb/html.ch @@ -55,7 +55,7 @@ #xtranslate CRLF() => ( Chr( 13 ) + Chr( 10 ) ) /* -#xCommand DEFINE HTML ; +#xcommand DEFINE HTML ; [FILE ] ; [TITLE ] ; [LINKTITLE <linktitle>] ; @@ -93,7 +93,7 @@ [<nRefresh>], [<cRefreshURL>],; <cStyleScr>,<.lcache.>) */ -#xCommand DEFINE HTML ; +#xcommand DEFINE HTML ; [FILE <file>] ; [TITLE <title>] ; [LINKTITLE <linktitle>] ; @@ -137,7 +137,7 @@ <nMarginTop>, <nMarginHeight>, <nMarginWidth>, <nMarginLeft> ,; .F.,<file>) -#xCommand DEFINE CGI ; +#xcommand DEFINE CGI ; [FILE <file>] ; [TITLE <title>] ; [LINKTITLE <linktitle>] ; @@ -185,7 +185,7 @@ // [<.auth.>] -#xCommand DEFINE TABLE ; +#xcommand DEFINE TABLE ; [COLS <cols>] ; [BORDER <border>] ; [WIDTH <width>] ; @@ -218,7 +218,7 @@ <cStyle>, <id> , <nof>) -#xCommand DEFINE TABLE HEADER ; +#xcommand DEFINE TABLE HEADER ; [TEXT <cHead>] ; [COLOR <cColor>] ; [<aln:LEFT,RIGHT,CENTER,MIDDLE,TOP,TEXTTOP,BOTTOM,ABSMIDDLE,ABSCENTER,ABSBOTTOM,BASELINE>]; @@ -232,7 +232,7 @@ <nSize>, <cFntColor>, <nHeight> ) -#xCommand DEFINE CELL ; +#xcommand DEFINE CELL ; [COLOR <cColor>] ; [ALING <aln:LEFT,RIGHT,CENTER,MIDDLE,TOP,TEXTTOP,BOTTOM,ABSMIDDLE,ABSCENTER,ABSBOTTOM,BASELINE>]; [FONT <cFont>] ; @@ -258,7 +258,7 @@ <cspan>, <rspan> ,__HTML_ALING__ [<valn>], <clrdrk>, <clrlt>, <bclrlt>, <cClass>) -#xCommand TABLE CELL ; +#xcommand TABLE CELL ; [COLOR <cColor>] ; [FONT <cFont>] ; [SIZE <nSize>] ; @@ -278,7 +278,7 @@ <cspan>, <rspan> ) -#xCommand TABLE ROW ; +#xcommand TABLE ROW ; [COLOR <cColor>] ; [<aln:LEFT,RIGHT,CENTER,MIDDLE,TOP,TEXTTOP,BOTTOM,ABSMIDDLE,ABSCENTER,ABSBOTTOM,BASELINE>]; [ALIGN <aln1:LEFT,RIGHT,CENTER,MIDDLE,TOP,TEXTTOP,BOTTOM,ABSMIDDLE,ABSCENTER,ABSBOTTOM,BASELINE>]; @@ -286,7 +286,7 @@ => ; <oHtm>:NewTableRow( <cColor>, __HTML_ALING__ [<aln>], __HTML_ALING__ [<aln1>] ); -#xCommand DEFINE FONT [<cFont>] ; +#xcommand DEFINE FONT [<cFont>] ; [<ftype:BOLD,ITALIC,ULINE,UNDERLINE>] ; [SIZE <s>] ; [COLOR <c>] ; @@ -296,7 +296,7 @@ [<s>], [<c>] ) -#xCommand SET FONT [<cFont>] ; +#xcommand SET FONT [<cFont>] ; [<bold:BOLD>] ; [<itl:ITALIC>] ; [<uln:UNDERLINE>] ; @@ -310,7 +310,7 @@ [<s>], [<c>], ! <.lset.> ) -#xCommand START FONT [<cFont>] ; +#xcommand START FONT [<cFont>] ; [<bold:BOLD>] ; [<itl:ITALIC>] ; [<uln:UNDERLINE>] ; @@ -324,12 +324,12 @@ [<s>], [<c>], ! <.lset.> ) -#xCommand FONTEND[<cFont>] ; +#xcommand FONTEND[<cFont>] ; [OF <oHtm>] ; => ; <oHtm>:EndFont() -#xCommand END FONT ; +#xcommand END FONT ; [OF <oHtm>] ; => ; <oHtm>:EndFont() @@ -382,12 +382,12 @@ [<(style)>], [<(id)>] ) -#xCommand END BUTTON OF <oHtm> ; +#xcommand END BUTTON OF <oHtm> ; =>; <oHtm>:endButton() -#xCommand IMAGE <image> ; +#xcommand IMAGE <image> ; URL <url> ; [BORDER <border>] ; [HEIGHT <height>] ; @@ -406,7 +406,7 @@ <name>, <alt>, <target>, <width>,<.break.>) -#xCommand IMAGE <image> ; +#xcommand IMAGE <image> ; [BORDER <border>] ; [HEIGHT <height>] ; [WIDTH <width>] ; @@ -428,7 +428,7 @@ <name>, <alt>, ; <target>, <width>, <.break.>, <iD>, <map>, __HTML_ALING__ [<aln1>] , <hspace>) -#xCommand LINK <url> ; +#xcommand LINK <url> ; [TEXT <text>] ; [FONT <font>] ; [FONTCOLOR <clr>] ; @@ -447,7 +447,7 @@ <onclick>, <onmsover>, <onmsout>, ; <target>, <font>, <clr>, <size>, <style>, <.bld.> ,<.break.>, <cClass>) -#xCommand LINK <url> ; +#xcommand LINK <url> ; [IMAGE <image>] ; [WIDTH <width>] ; [HEIGHT <height>] ; @@ -470,7 +470,7 @@ <target>, <width>, <.break.>, <cClass>, <id>, < hspace >, __HTML_ALING__ [<aln1>] ) -#xCommand NEW FRAMEPAGE ; +#xcommand NEW FRAMEPAGE ; [TITLE <title>] ; [FILE <file>] ; OF <oFrm> ; @@ -478,7 +478,7 @@ <oFrm>:=THtmlFrameSet():New( <file>, <title> ) -#xCommand FRAMESET ; +#xcommand FRAMESET ; [TITLE <title>] ; [FILE <file>] ; [ROWS <rows,...>] ; @@ -492,7 +492,7 @@ -#xCommand FRAME ; +#xcommand FRAME ; [NAME <name>] ; [URL <url>] ; [<brd:NOBORDER>] ; @@ -509,8 +509,8 @@ [<mw>], [<mh>], [<target>], ; __HTML_SCROLL__ [<scrl>] ) -#xCommand ENDSET <oFrm> => <oFrm>:EndSet() -#xCommand END FRAMEPAGE <oFrm> => <oFrm>:End() +#xcommand ENDSET <oFrm> => <oFrm>:EndSet() +#xcommand END FRAMEPAGE <oFrm> => <oFrm>:End() #xcommand MARQUEE <cText> ; @@ -570,7 +570,7 @@ -#xCommand END MARQUEE OF <oHtm> => <oHtm>:endMarquee() +#xcommand END MARQUEE OF <oHtm> => <oHtm>:endMarquee() @@ -603,13 +603,13 @@ [FOLDER <folder>] ; OF <oHtm> ; => ; - putCounter( <oHtm>, <num>, <folder>, <dig>, <w>, <clr>, <b> ) + PutCounter( <oHtm>, <num>, <folder>, <dig>, <w>, <clr>, <b> ) /*******************************************/ /* New Commands */ /*******************************************/ -#xCommand LINKS <url> ; +#xcommand LINKS <url> ; [TEXT <text>] ; [IMAGE <image>] ; [WIDTH <width>] ; @@ -628,24 +628,24 @@ <oHtm>:putTextImageURL( <image>, <border>, <height>, <url>,; <onclick>, <onmsover>, <onmsout>, <name>, <alt> , ; <target>,<width>, <.break.>, <cClass>, <text>) -#xCommand SPAN <text> ; +#xcommand SPAN <text> ; [STYLE <cStyle>] ; OF <oHtm> ; => ; <oHtm>:Span(<text>,<cStyle>) -#xCommand Comment <text> ; +#xcommand Comment <text> ; OF <oHtm> ; => ; <oHtm>:Comment(<text>) -#xCommand LINKNAME <cName> ; +#xcommand LINKNAME <cName> ; OF <oHtm> ; => ; <oHtm>:PutLinkName(<cName>) -#xCommand CREATE OBJECT ; +#xcommand CREATE OBJECT ; [NAME <cName>] ; [TYPE <cType>] ; [CLASSID <cClassid>] ; @@ -659,34 +659,34 @@ => ; <oHtm>:ADDOBJECT(<cType>,<cClassid>,__HTML_ALING__ [<aln>],<cCode>,<.lDisable.>,<cCodeBase>,<cName>,<nWidth>,<nHeight>) -#xCommand OBJECT PARAM ; +#xcommand OBJECT PARAM ; NAME <cName> ; VALUE <cValue> ; OF <oHtm> ; => ; <oHtm>:ADDPARAM(<cName>,<cValue>) -#xCommand END OBJECT ; +#xcommand END OBJECT ; OF <oHtm> ; => ; <oHtm>:ENDOBJECT() -#xCommand MAPEND ; +#xcommand MAPEND ; OF <oHtm> ; => ; <oHtm>:EndMap() -#xCommand CELLEND ; +#xcommand CELLEND ; OF <oHtm> ; => ; <oHtm>:EndTableCell( .F. ) -#xCommand ROWEND ; +#xcommand ROWEND ; OF <oHtm> ; => ; <oHtm>:EndTableRow() -#xCommand TABLEEND ; +#xcommand TABLEEND ; OF <oHtm> ; => ; <oHtm>:EndTable() @@ -705,41 +705,41 @@ =>; <ohtm>:MapArea( <(Shape)>, <Alt>, <coord>, <Url> ) -#xtranslate __HTML_SCROLL__ => "AUTO" -#xtranslate __HTML_SCROLL__ <scrl:NO> => "NO" -#xtranslate __HTML_SCROLL__ <scrl:OFF> => "NO" -#xtranslate __HTML_SCROLL__ <scrl:ON> => "YES" -#xtranslate __HTML_SCROLL__ <scrl:YES> => "YES" -#xtranslate __HTML_SCROLL__ <scrl:AUTO> => "AUTO" +#xtranslate __HTML_SCROLL__ => "AUTO" +#xtranslate __HTML_SCROLL__ <scrl:NO> => "NO" +#xtranslate __HTML_SCROLL__ <scrl:OFF> => "NO" +#xtranslate __HTML_SCROLL__ <scrl:ON> => "YES" +#xtranslate __HTML_SCROLL__ <scrl:YES> => "YES" +#xtranslate __HTML_SCROLL__ <scrl:AUTO> => "AUTO" -#xtranslate __HTML_ALING__ => NIL -#xtranslate __HTML_ALING__ <aln:LEFT> => "LEFT" -#xtranslate __HTML_ALING__ <aln:RIGHT> => "RIGHT" -#xtranslate __HTML_ALING__ <aln:CENTER> => "center" -#xtranslate __HTML_ALING__ <aln:MIDDLE> => "MIDDLE" -#xtranslate __HTML_ALING__ <aln:TOP> => "TOP" -#xtranslate __HTML_ALING__ <aln:TEXTTOP> => "TEXTTOP" -#xtranslate __HTML_ALING__ <aln:BOTTOM> => "BOTTOM" -#xtranslate __HTML_ALING__ <aln:ABSMIDDLE> => "ABSMIDDLE" -#xtranslate __HTML_ALING__ <aln:ABSCENTER> => "ABSMIDDLE" -#xtranslate __HTML_ALING__ <aln:ABSBOTTOM> => "ABSBOTTOM" -#xtranslate __HTML_ALING__ <aln:BASELINE> => "BASELINE" +#xtranslate __HTML_ALING__ => NIL +#xtranslate __HTML_ALING__ <aln:LEFT> => "LEFT" +#xtranslate __HTML_ALING__ <aln:RIGHT> => "RIGHT" +#xtranslate __HTML_ALING__ <aln:CENTER> => "center" +#xtranslate __HTML_ALING__ <aln:MIDDLE> => "MIDDLE" +#xtranslate __HTML_ALING__ <aln:TOP> => "TOP" +#xtranslate __HTML_ALING__ <aln:TEXTTOP> => "TEXTTOP" +#xtranslate __HTML_ALING__ <aln:BOTTOM> => "BOTTOM" +#xtranslate __HTML_ALING__ <aln:ABSMIDDLE> => "ABSMIDDLE" +#xtranslate __HTML_ALING__ <aln:ABSCENTER> => "ABSMIDDLE" +#xtranslate __HTML_ALING__ <aln:ABSBOTTOM> => "ABSBOTTOM" +#xtranslate __HTML_ALING__ <aln:BASELINE> => "BASELINE" -#xtranslate __HTML_POS__ => NIL -#xtranslate __HTML_POS__ <pos:TOP> => "TOP" -#xtranslate __HTML_POS__ <pos:MIDDLE> => "MIDDLE" -#xtranslate __HTML_POS__ <pos:BOTTOM> => "BOTTOM" +#xtranslate __HTML_POS__ => NIL +#xtranslate __HTML_POS__ <pos:TOP> => "TOP" +#xtranslate __HTML_POS__ <pos:MIDDLE> => "MIDDLE" +#xtranslate __HTML_POS__ <pos:BOTTOM> => "BOTTOM" -#xtranslate __HTML_DIR__ => NIL -#xtranslate __HTML_DIR__ <dir:LEFT> => "LEFT" -#xtranslate __HTML_DIR__ <dir:RIGHT> => "RIGHT" +#xtranslate __HTML_DIR__ => NIL +#xtranslate __HTML_DIR__ <dir:LEFT> => "LEFT" +#xtranslate __HTML_DIR__ <dir:RIGHT> => "RIGHT" -#xtranslate __HTML_BEHAVE__ => NIL -#xtranslate __HTML_BEHAVE__ <bhv:SCROLL> => "SCROLL" -#xtranslate __HTML_BEHAVE__ <bhv:SLIDE> => "SLIDE" -#xtranslate __HTML_BEHAVE__ <bhv:ALTERNATE> => "ALTERNATE" -#xtranslate __HTML_BEHAVE__ <bhv:ALT> => "ALTERNATE" +#xtranslate __HTML_BEHAVE__ => NIL +#xtranslate __HTML_BEHAVE__ <bhv:SCROLL> => "SCROLL" +#xtranslate __HTML_BEHAVE__ <bhv:SLIDE> => "SLIDE" +#xtranslate __HTML_BEHAVE__ <bhv:ALTERNATE> => "ALTERNATE" +#xtranslate __HTML_BEHAVE__ <bhv:ALT> => "ALTERNATE" #xtranslate __HTML_FTYPE__ => NIL #xtranslate __HTML_FTYPE__ <ftype:ITALIC> => "<I>" diff --git a/harbour/contrib/xhb/htmlclrs.ch b/harbour/contrib/xhb/htmlclrs.ch index 1c10f94640..6302c32055 100644 --- a/harbour/contrib/xhb/htmlclrs.ch +++ b/harbour/contrib/xhb/htmlclrs.ch @@ -46,146 +46,146 @@ #ifndef _COLORS_CH -#define ALICEBLUE '#A0CF00' -#define ANTIQUEWHITE '#FFE8D0' -#define AQUA '#00FFFF' -#define AQUAMARINE '#7FFFD0' -#define AZURE '#F0FFFF' -#define BEIGE '#F0F7DF' -#define BISQUE '#FFE7C0' -#define BLACK '#000000' -#define BLANCHEDALMOND '#FFE8CF' -#define BLUE '#0000FF' -#define BLUEVIOLET '#8F28E0' -#define BROWN '#A0282F' -#define BURLYWOOD '#DFB880' -#define CADETBLUE '#5F9FA0' -#define CHARTREUSE '#7FFF00' -#define CHOCOLATE '#D0861F' -#define CORAL '#FF7F50' -#define CORNFLOWERBLUE '#6097EF' -#define CORNSILK '#FFF8DF' -#define CRIMSON '#DF173F' -#define CYAN '#00FFFF' -#define DARKBLUE '#00008F' -#define DARKCYAN '#00888F' -#define DARKGOLDENROD '#BF87F0' -#define DARKGRAY '#AFA8AF' -#define DARKGREEN '#006700' -#define DARKKHAKI '#BFB76F' -#define DARKMAGENTA '#8F008F' -#define DARKOLIVEGREEN '#50682F' -#define DARKORANGE '#FF8F00' -#define DARKORCHID '#9F30CF' -#define DARKRED '#8F0000' -#define DARKSALMON '#EF977F' -#define DARKSEAGREEN '#8FBF8F' -#define DARKSLATEBLUE '#4F3F8F' -#define DARKSLATEGRAY '#2F4F4F' -#define DARKTURQUOISE '#00CFD0' -#define DARKVIOLET '#9000D0' -#define DEEPPINK '#FF1790' -#define DEEPSKYBLUE '#00BFFF' -#define DIMGRAY '#6F686F' -#define DODGERBLUE '#1F90FF' -#define FIREBRICK '#B02020' -#define FLORALWHITE '#FFF8F0' -#define FORESTGREEN '#208820' -#define FUCHSIA '#FF00FF' -#define GAINSBORO '#DFDFDF' -#define GHOSTWHITE '#FFF8FF' -#define GOLD '#FFD700' -#define GOLDENROD '#DFA720' -#define GRAY '#808080' -#define GREEN '#008000' -#define GREENYELLOW '#AFFF2F' -#define HONEYDEW '#F0FFF0' -#define HOTPINK '#FF68B0' -#define INDIANRED '#CF5F5F' -#define INDIGO '#4F0080' -#define IVORY '#FFFFF0' -#define KHAKI '#F0E78F' -#define LAVENDER '#E0E7FF' -#define LAVENDERBLUSH '#FFF0F0' -#define LAWNGREEN '#7FFF00' -#define LEMONCHIFFON '#FFF8CF' -#define LIGHTBLUE '#AFD8E0' -#define LIGHTCORAL '#F08080' -#define LIGHTCYAN '#E0FFFF' -#define LIGHTGOLDENRODYELLOW '#FFF8D0' -#define LIGHTGREEN '#90EF90' -#define LIGHTGREY '#D0D0D0' -#define LIGHTPINK '#FFB7C0' -#define LIGHTSALMON '#FFA07F' -#define LIGHTSEAGREEN '#20B0AF' -#define LIGHTSKYBLUE '#80CFFF' -#define LIGHTSLATEGRAY '#70889F' -#define LIGHTSTEELBLUE '#B0C7DF' -#define LIGHTYELLOW '#FFFFE0' -#define LIME '#00FF00' -#define LIMEGREEN '#30CF30' -#define LINEN '#FFF0E0' -#define MAGENTA '#FF00FF' -#define MAROON '#800000' -#define MEDIUMAQUAMARINE '#60CFAF' -#define MEDIUMBLUE '#0000CF' -#define MEDIUMORCHID '#BF57D0' -#define MEDIUMPURPLE '#9070DF' -#define MEDIUMSEAGREEN '#3FB070' -#define MEDIUMSLATEBLUE '#7F68EF' -#define MEDIUMSPRINGGREEN '#00F89F' -#define MEDIUMTURQUOISE '#4FD0CF' -#define MEDIUMVIOLETRED '#C01780' -#define MIDNIGHTBLUE '#1F1870' -#define MINTCREAM '#F0FFFF' -#define MISTYROSE '#FFE7E0' -#define MOCCASIN '#FFE7B0' -#define NAVAJOWHITE '#FFDFAF' -#define NAVY '#000080' -#define OLDLACE '#FFF7E0' -#define OLIVE '#808000' -#define OLIVEDRAB '#6F8F20' -#define ORANGE '#FFA700' -#define ORANGERED '#FF4700' -#define ORCHID '#DF70D0' -#define PALEGOLDENROD '#EFE8AF' -#define PALEGREEN '#9FF89F' -#define PALETURQUOISE '#AFEFEF' -#define PALEVIOLETRED '#DF7090' -#define PAPAYAWHIP '#FFEFD0' -#define PEACHPUFF '#FFD8BF' -#define PERU '#CF873F' -#define PINK '#FFC0CF' -#define PLUM '#DFA1DF' -#define POWDERBLUE '#B0E0E0' -#define PURPLE '#800080' -#define RED '#FF0000' -#define ROSYBROWN '#BF8F8F' -#define ROYALBLUE '#4068E0' -#define SADDLEBROWN '#8F4710' -#define SALMON '#FF8070' -#define SANDYBROWN '#F0A760' -#define SEAGREEN '#2F8850' -#define SEASHELL '#FFF7EF' -#define SIENNA '#A0502F' -#define SILVER '#C0C0C0' -#define SKYBLUE '#80CFEF' -#define SLATEBLUE '#6F58CF' -#define SLATEGRAY '#708090' -#define SNOW '#FFF8FF' -#define SPRINGGREEN '#00FF7F' -#define STEELBLUE '#4080B0' -#define TAN '#D0B78F' -#define TEAL '#008080' -#define THISTLE '#DFBFDF' -#define TOMATO '#FF6040' -#define TURQUOISE '#40E0D0' -#define VIOLET '#EF80EF' -#define WHEAT '#F0DFB0' -#define WHITE '#FFFFFF' -#define WHITESMOKE '#F0F7F0' -#define YELLOW '#FFFF00' -#define YELLOWGREEN '#9FCF30' +#define ALICEBLUE "#A0CF00" +#define ANTIQUEWHITE "#FFE8D0" +#define AQUA "#00FFFF" +#define AQUAMARINE "#7FFFD0" +#define AZURE "#F0FFFF" +#define BEIGE "#F0F7DF" +#define BISQUE "#FFE7C0" +#define BLACK "#000000" +#define BLANCHEDALMOND "#FFE8CF" +#define BLUE "#0000FF" +#define BLUEVIOLET "#8F28E0" +#define BROWN "#A0282F" +#define BURLYWOOD "#DFB880" +#define CADETBLUE "#5F9FA0" +#define CHARTREUSE "#7FFF00" +#define CHOCOLATE "#D0861F" +#define CORAL "#FF7F50" +#define CORNFLOWERBLUE "#6097EF" +#define CORNSILK "#FFF8DF" +#define CRIMSON "#DF173F" +#define CYAN "#00FFFF" +#define DARKBLUE "#00008F" +#define DARKCYAN "#00888F" +#define DARKGOLDENROD "#BF87F0" +#define DARKGRAY "#AFA8AF" +#define DARKGREEN "#006700" +#define DARKKHAKI "#BFB76F" +#define DARKMAGENTA "#8F008F" +#define DARKOLIVEGREEN "#50682F" +#define DARKORANGE "#FF8F00" +#define DARKORCHID "#9F30CF" +#define DARKRED "#8F0000" +#define DARKSALMON "#EF977F" +#define DARKSEAGREEN "#8FBF8F" +#define DARKSLATEBLUE "#4F3F8F" +#define DARKSLATEGRAY "#2F4F4F" +#define DARKTURQUOISE "#00CFD0" +#define DARKVIOLET "#9000D0" +#define DEEPPINK "#FF1790" +#define DEEPSKYBLUE "#00BFFF" +#define DIMGRAY "#6F686F" +#define DODGERBLUE "#1F90FF" +#define FIREBRICK "#B02020" +#define FLORALWHITE "#FFF8F0" +#define FORESTGREEN "#208820" +#define FUCHSIA "#FF00FF" +#define GAINSBORO "#DFDFDF" +#define GHOSTWHITE "#FFF8FF" +#define GOLD "#FFD700" +#define GOLDENROD "#DFA720" +#define GRAY "#808080" +#define GREEN "#008000" +#define GREENYELLOW "#AFFF2F" +#define HONEYDEW "#F0FFF0" +#define HOTPINK "#FF68B0" +#define INDIANRED "#CF5F5F" +#define INDIGO "#4F0080" +#define IVORY "#FFFFF0" +#define KHAKI "#F0E78F" +#define LAVENDER "#E0E7FF" +#define LAVENDERBLUSH "#FFF0F0" +#define LAWNGREEN "#7FFF00" +#define LEMONCHIFFON "#FFF8CF" +#define LIGHTBLUE "#AFD8E0" +#define LIGHTCORAL "#F08080" +#define LIGHTCYAN "#E0FFFF" +#define LIGHTGOLDENRODYELLOW "#FFF8D0" +#define LIGHTGREEN "#90EF90" +#define LIGHTGREY "#D0D0D0" +#define LIGHTPINK "#FFB7C0" +#define LIGHTSALMON "#FFA07F" +#define LIGHTSEAGREEN "#20B0AF" +#define LIGHTSKYBLUE "#80CFFF" +#define LIGHTSLATEGRAY "#70889F" +#define LIGHTSTEELBLUE "#B0C7DF" +#define LIGHTYELLOW "#FFFFE0" +#define LIME "#00FF00" +#define LIMEGREEN "#30CF30" +#define LINEN "#FFF0E0" +#define MAGENTA "#FF00FF" +#define MAROON "#800000" +#define MEDIUMAQUAMARINE "#60CFAF" +#define MEDIUMBLUE "#0000CF" +#define MEDIUMORCHID "#BF57D0" +#define MEDIUMPURPLE "#9070DF" +#define MEDIUMSEAGREEN "#3FB070" +#define MEDIUMSLATEBLUE "#7F68EF" +#define MEDIUMSPRINGGREEN "#00F89F" +#define MEDIUMTURQUOISE "#4FD0CF" +#define MEDIUMVIOLETRED "#C01780" +#define MIDNIGHTBLUE "#1F1870" +#define MINTCREAM "#F0FFFF" +#define MISTYROSE "#FFE7E0" +#define MOCCASIN "#FFE7B0" +#define NAVAJOWHITE "#FFDFAF" +#define NAVY "#000080" +#define OLDLACE "#FFF7E0" +#define OLIVE "#808000" +#define OLIVEDRAB "#6F8F20" +#define ORANGE "#FFA700" +#define ORANGERED "#FF4700" +#define ORCHID "#DF70D0" +#define PALEGOLDENROD "#EFE8AF" +#define PALEGREEN "#9FF89F" +#define PALETURQUOISE "#AFEFEF" +#define PALEVIOLETRED "#DF7090" +#define PAPAYAWHIP "#FFEFD0" +#define PEACHPUFF "#FFD8BF" +#define PERU "#CF873F" +#define PINK "#FFC0CF" +#define PLUM "#DFA1DF" +#define POWDERBLUE "#B0E0E0" +#define PURPLE "#800080" +#define RED "#FF0000" +#define ROSYBROWN "#BF8F8F" +#define ROYALBLUE "#4068E0" +#define SADDLEBROWN "#8F4710" +#define SALMON "#FF8070" +#define SANDYBROWN "#F0A760" +#define SEAGREEN "#2F8850" +#define SEASHELL "#FFF7EF" +#define SIENNA "#A0502F" +#define SILVER "#C0C0C0" +#define SKYBLUE "#80CFEF" +#define SLATEBLUE "#6F58CF" +#define SLATEGRAY "#708090" +#define SNOW "#FFF8FF" +#define SPRINGGREEN "#00FF7F" +#define STEELBLUE "#4080B0" +#define TAN "#D0B78F" +#define TEAL "#008080" +#define THISTLE "#DFBFDF" +#define TOMATO "#FF6040" +#define TURQUOISE "#40E0D0" +#define VIOLET "#EF80EF" +#define WHEAT "#F0DFB0" +#define WHITE "#FFFFFF" +#define WHITESMOKE "#F0F7F0" +#define YELLOW "#FFFF00" +#define YELLOWGREEN "#9FCF30" #define _COLORS_CH #endif diff --git a/harbour/contrib/xhb/htmlform.ch b/harbour/contrib/xhb/htmlform.ch index 154e70fe53..b9cf58db4a 100644 --- a/harbour/contrib/xhb/htmlform.ch +++ b/harbour/contrib/xhb/htmlform.ch @@ -68,12 +68,12 @@ <.frame.>, <cap> ) ;; [<oFrm>:setTarget( <(target)> ) ;] ; [<oFrm>:setEncType( <(enctype)> ) ;] ; - [<oFrm>:setCapClr( <(capclr)> ) ;] ; - [<oFrm>:setCapFntClr( <(capfntclr)> ) ;] ; - [<oFrm>:setCapImage( <(capimage)> ) ;] ; - [<oFrm>:setBgImage( <(bgimg)> ) ;] ; - [<oFrm>:setFontColor( <(fntclr)> ) ;] ; - [<oFrm>:setFrmColor( <(clr)> ) ;] ; + [<oFrm>:setCapClr( <(capclr)> ) ;] ; + [<oFrm>:setCapFntClr( <(capfntclr)> ) ;] ; + [<oFrm>:setCapImage( <(capimage)> ) ;] ; + [<oFrm>:setBgImage( <(bgimg)> ) ;] ; + [<oFrm>:setFontColor( <(fntclr)> ) ;] ; + [<oFrm>:setFrmColor( <(clr)> ) ;] ; [<oFrm>:setwidth( <w> ) ;] ; [<oFrm>:setAction( <(action)> ) ;] ; [<oFrm>:setOnSubmit( <(onsubmit)> ) ;] ; @@ -82,7 +82,7 @@ #xCommand ACTIVATE <oFrm> ; =>; - <oFrm>:Put(.T.) ; <oFrm>:End() + <oFrm>:Put( .T. ) ; <oFrm>:End() // --> Controls @@ -125,15 +125,15 @@ [ <obj>:= ] THtmlControl():SetControl(; <(name)>, <rows>, <cols>, <size>, <maxchars>, ; <(value)>, ; - <(onfocus)>,<(onblur)>,<(onchange)>,<(onselect)>,; - <(onclick)>,<(onmsover)>,<(onmsout)>,<(onmsdn)>,<(onmsup)>,; - <(onkdown)>,<(onkup)>,<(onkprs)>,; - <(pic)>,<(cap)>,; - <.dis.>,<.ro.>,<.mult.>,<.chk.>,; + <(onfocus)>, <(onblur)>, <(onchange)>, <(onselect)>, ; + <(onclick)>, <(onmsover)>, <(onmsout)>, <(onmsdn)>, <(onmsup)>, ; + <(onkdown)>, <(onkup)>, <(onkprs)>, ; + <(pic)>, <(cap)>, ; + <.dis.>, <.ro.>, <.mult.>, <.chk.>, ; __ALIGN__ [<aln>], ; __WRAP__ [<wrap>], ; - __TYPE__ [<typ>],; - <style>, <id> ,<.l.>) ) + __TYPE__ [<typ>], ; + <style>, <id>, <.l.> ) ) #xCommand DEFINE <typ:EDIT,TEXT,TEXTAREA,PASSWORD,BUTTON,IMAGE,CHECKBOX,CHECK,HIDDEN,RADIO,FILE,RESET,SUBMIT,SELECT,LISTBOX> <oCtr>; @@ -164,7 +164,7 @@ [CAPTION <cap>] ; [STYLE <style>] ; [ID <id>] ; - [<l:LABEL>] ; + [<l:LABEL>] ; IN <oForm> ; => ; <oCtr> := THtmlControl() ;; @@ -174,29 +174,29 @@ [<oCtr>:SetCols( <cols> ) ;] ; [<oCtr>:SetAlign( __ALIGN__ <aln> );] ; [<oCtr>:SetWrap( __WRAP__ <wrap> );] ; - [<oCtr>:SetSource(<(source)>);] ; + [<oCtr>:SetSource( <(source)> );] ; [<oCtr>:SetMaxChars( <maxchars> );] ; [<oCtr>:SetValue( <(value)> );] ; - [<oCtr>:SetOnFocus(<(onfocus)>);] ; - [<oCtr>:SetOnBlur(<(onblur)>);] ; - [<oCtr>:SetOnChange(<(onchange)>);] ; - [<oCtr>:SetOnSelect(<(onselect)>);] ; - [<oCtr>:SetonClick(<(onclick)>);] ; - [<oCtr>:SetonMsOver(<(onmsover)>);] ; - [<oCtr>:SetonMsOut(<(onmsout)>);] ; - [<oCtr>:SetonKDown(<(onkdown)>);] ; - [<oCtr>:SetonKUp(<(onkup)>);] ; - [<oCtr>:SetonKPress(<(onkprs)>);] ; - [<oCtr>:SetPicture(<(pic)>);] ; - [<oCtr>:SetCaption(<cap>);] ; - [<oCtr>:SetStyle(<(style)>);] ; - [<oCtr>:SetId(<(id)>);] ; - [<oCtr>:SetChecked( <.checked.>);] ; - [<oCtr>:SetMultiple(<.mult.>);] ; - [<oCtr>:SetDisabled(<.dis.>);] ; - [<oCtr>:SetReadonly(<.ro.>);] ; - [<oCtr>:SetLabel(<.l.>);] ; - <oCtr>:Type := __TYPE__ <typ> ;; + [<oCtr>:SetOnFocus( <(onfocus)> );] ; + [<oCtr>:SetOnBlur( <(onblur)> );] ; + [<oCtr>:SetOnChange( <(onchange)> );] ; + [<oCtr>:SetOnSelect( <(onselect)> );] ; + [<oCtr>:SetonClick( <(onclick)> );] ; + [<oCtr>:SetonMsOver( <(onmsover)> );] ; + [<oCtr>:SetonMsOut( <(onmsout)> );] ; + [<oCtr>:SetonKDown( <(onkdown)> );] ; + [<oCtr>:SetonKUp( <(onkup)> );] ; + [<oCtr>:SetonKPress( <(onkprs)> );] ; + [<oCtr>:SetPicture( <(pic)> );] ; + [<oCtr>:SetCaption( <cap> );] ; + [<oCtr>:SetStyle( <(style)> );] ; + [<oCtr>:SetId( <(id)> );] ; + [<oCtr>:SetChecked( <.checked.> );] ; + [<oCtr>:SetMultiple( <.mult.> );] ; + [<oCtr>:SetDisabled( <.dis.> );] ; + [<oCtr>:SetReadonly( <.ro.> );] ; + [<oCtr>:SetLabel( <.l.> );] ; + <oCtr>:Type := __TYPE__ <typ> ;; <oForm>:AddControl( <oCtr> ) #xcommand DEFINE OPTION <text> [OF <oSelect>] ; @@ -221,16 +221,16 @@ #xCommand LINE BREAK ; IN <oForm> ; => ; - <oForm>:AddControl( "<BR>"+CRLF() ) + <oForm>:AddControl( "<BR>" + CRLF() ) #xCommand LINE IN <oForm> ; => ; - <oForm>:AddControl( CRLF()+'<HR WIDTH = 100%>'+CRLF() ) + <oForm>:AddControl( CRLF() + "<HR WIDTH = 100%>" + CRLF() ) #xCommand SPACE <n> IN <oForm> ; => ; - <oForm>:AddControl( replicate( " ", <n> ) ) + <oForm>:AddControl( Replicate( " ", <n> ) ) #xCommand TEXT <c> IN <oForm> ; @@ -243,33 +243,33 @@ #xCommand START GROUP <c> IN <oForm> => ; - <oForm>:AddControl( CRLF()+"<FIELDSET><LEGEND>"+<c>+"</LEGEND>"+CRLF() ) + <oForm>:AddControl( CRLF() + "<FIELDSET><LEGEND>" + <c> + "</LEGEND>" + CRLF() ) #xCommand END GROUP IN <oForm> => ; - <oForm>:AddControl( CRLF()+"</FIELDSET>"+CRLF() ) + <oForm>:AddControl( CRLF() + "</FIELDSET>" + CRLF() ) -#xtranslate __TYPE__ => "TEXT" -#xtranslate __TYPE__ <typ:EDIT> => "TEXT" -#xtranslate __TYPE__ <typ:TEXT> => "TEXT" -#xtranslate __TYPE__ <typ:TEXTAREA> => "TEXTAREA" -#xtranslate __TYPE__ <typ:PASSWORD> => "PASSWORD" -#xtranslate __TYPE__ <typ:IMAGE> => "IMAGE" -#xtranslate __TYPE__ <typ:BUTTON> => "BUTTON" -#xtranslate __TYPE__ <typ:CHECKBOX> => "CHECKBOX" -#xtranslate __TYPE__ <typ:CHECK> => "CHECKBOX" -#xtranslate __TYPE__ <typ:HIDDEN> => "HIDDEN" -#xtranslate __TYPE__ <typ:RADIO> => "RADIO" -#xtranslate __TYPE__ <typ:FILE> => "FILE" -#xtranslate __TYPE__ <typ:RESET> => "RESET" -#xtranslate __TYPE__ <typ:SUBMIT> => "SUBMIT" -#xtranslate __TYPE__ <typ:SELECT> => "SELECT" +#xtranslate __TYPE__ => "TEXT" +#xtranslate __TYPE__ <typ:EDIT> => "TEXT" +#xtranslate __TYPE__ <typ:TEXT> => "TEXT" +#xtranslate __TYPE__ <typ:TEXTAREA> => "TEXTAREA" +#xtranslate __TYPE__ <typ:PASSWORD> => "PASSWORD" +#xtranslate __TYPE__ <typ:IMAGE> => "IMAGE" +#xtranslate __TYPE__ <typ:BUTTON> => "BUTTON" +#xtranslate __TYPE__ <typ:CHECKBOX> => "CHECKBOX" +#xtranslate __TYPE__ <typ:CHECK> => "CHECKBOX" +#xtranslate __TYPE__ <typ:HIDDEN> => "HIDDEN" +#xtranslate __TYPE__ <typ:RADIO> => "RADIO" +#xtranslate __TYPE__ <typ:FILE> => "FILE" +#xtranslate __TYPE__ <typ:RESET> => "RESET" +#xtranslate __TYPE__ <typ:SUBMIT> => "SUBMIT" +#xtranslate __TYPE__ <typ:SELECT> => "SELECT" -#xtranslate __WRAP__ => NIL -#xtranslate __WRAP__ <wrap:OFF> => "OFF" -#xtranslate __WRAP__ <wrap:VIRTUAL> => "VIRTUAL" -#xtranslate __WRAP__ <wrap:PHYSICAL> => "PHYSICAL" -#xtranslate __WRAP__ <wrap:NORMAL> => "NORMAL" +#xtranslate __WRAP__ => NIL +#xtranslate __WRAP__ <wrap:OFF> => "OFF" +#xtranslate __WRAP__ <wrap:VIRTUAL> => "VIRTUAL" +#xtranslate __WRAP__ <wrap:PHYSICAL> => "PHYSICAL" +#xtranslate __WRAP__ <wrap:NORMAL> => "NORMAL" #xtranslate __ALIGN__ => NIL #xtranslate __ALIGN__ <aln:LEFT> => "LEFT" diff --git a/harbour/contrib/xhb/ttable.ch b/harbour/contrib/xhb/ttable.ch index c22cd3e332..9cab3952c1 100644 --- a/harbour/contrib/xhb/ttable.ch +++ b/harbour/contrib/xhb/ttable.ch @@ -92,7 +92,7 @@ [<new: NEW>] ; [<ro: READONLY>] ; => ; - netDbUse( <(cDBF)>, <(cAlias)>, <nSecs>, <cRDD>, ; + NetDbUse( <(cDBF)>, <(cAlias)>, <nSecs>, <cRDD>, ; <.new.>, NET_OPEN_MODE, <.ro.> ) @@ -154,7 +154,7 @@ <oObj>:ClassAdd( <"cFld">,, {| Self | [<xpression>] },,) -// --> ::undo() buffer constants +// --> ::unDo() buffer constants #define _WRITE_BUFFER 1 #define _DELETE_BUFFER 2 @@ -167,17 +167,17 @@ [STEP <n>] ; IN <oTable> ; => ; - <oTable>:Undo( <nType>, [<n>] ) + <oTable>:UnDo( <nType>, [<n>] ) #xCommand END TRANSACTION IN <oTable> => <oTable>:SetMonitor( .F. ) -#command SKIP in <o> => <o>:dbSkip(1) +#command SKIP in <o> => <o>:dbSkip( 1 ) #command SKIP <n> in <o> => <o>:dbSkip( <n> ) #command SEEK <xpr> ; [<soft: SOFTSEEK>] ; - [<last: LAST>] in <o> ; - => <o>:dbSeek( <xpr>, if( <.soft.>, .T., NIL ), if( <.last.>, .T., NIL ) ) + [<last: LAST>] in <o> ; + => <o>:dbSeek( <xpr>, iif( <.soft.>, .T., NIL ), iif( <.last.>, .T., NIL ) ) #translate CSY_TYPE Character => "C" @@ -192,7 +192,7 @@ [ TYPE <cType> ] ; [ LEN <nLen> ] ; [ DEC <nDec> ] ; - OF <oDbf> ; + OF <oDbf> ; => ; [ <oFld> := ] _TABLE_:AddField( <(cName)>,CSY_TYPE <cType>, <nLen>, <nDec>) #xCommand BUILD TABLE <o> => _TABLE_:Gentable() diff --git a/harbour/contrib/xhb/ttable.prg b/harbour/contrib/xhb/ttable.prg index d9c4b0222d..60abc01145 100644 --- a/harbour/contrib/xhb/ttable.prg +++ b/harbour/contrib/xhb/ttable.prg @@ -1441,7 +1441,7 @@ METHOD OnError( uParam ) CLASS HBTable LOCAL nPos LOCAL uRet, oErr - IF uParam != NIL .AND. Left( cMsg, 1 ) == '_' + IF uParam != NIL .AND. Left( cMsg, 1 ) == "_" cMsg := SubStr( cMsg, 2 ) ENDIF nPos := ( ::Alias )->( FieldPos( cMsg ) ) diff --git a/harbour/contrib/xhb/wintypes.ch b/harbour/contrib/xhb/wintypes.ch index f5424bd664..cb47685172 100644 --- a/harbour/contrib/xhb/wintypes.ch +++ b/harbour/contrib/xhb/wintypes.ch @@ -50,64 +50,64 @@ */ #ifndef __WINTYPES_CH - #define __WINTYPES_CH +#define __WINTYPES_CH - #include "cstruct.ch" +#include "cstruct.ch" - #define VOID CTYPE_VOID - #define UINT CTYPE_UNSIGNED_INT - #define HANDLE CTYPE_UNSIGNED_LONG - #define HICON CTYPE_UNSIGNED_LONG - #define HBITMAP CTYPE_UNSIGNED_LONG - #define HCURSOR CTYPE_UNSIGNED_LONG - #define HBRUSH CTYPE_UNSIGNED_LONG - #define LPCSTR CTYPE_CHAR_PTR - #define WNDPROC CTYPE_UNSIGNED_LONG - #define BOOL CTYPE_LONG - #define LPVOID CTYPE_VOID_PTR - #define DWORD CTYPE_UNSIGNED_LONG - #define WORD CTYPE_UNSIGNED_SHORT - #define LPCTSTR CTYPE_CHAR_PTR - #define COLORREF CTYPE_UNSIGNED_LONG - #define BYTE CTYPE_CHAR - #define TCHAR CTYPE_UNSIGNED_CHAR - #define HINSTANCE CTYPE_UNSIGNED_LONG - #define HMENU CTYPE_UNSIGNED_LONG - #define HTREEITEM CTYPE_UNSIGNED_LONG - #define INT CTYPE_INT - #define int CTYPE_INT - #define HWND CTYPE_UNSIGNED_LONG - #define LPARAM CTYPE_LONG - #define HGLOBAL CTYPE_UNSIGNED_LONG - #define WPARAM CTYPE_INT - #define HKEY CTYPE_UNSIGNED_LONG - #define char CTYPE_CHAR - #define LONG CTYPE_LONG - #define BCHAR CTYPE_UNSIGNED_CHAR - #define WCHAR CTYPE_UNSIGNED_SHORT - #define DOUBLE CTYPE_DOUBLE - #define LPTSTR CTYPE_CHAR_PTR - #define LPSTR CTYPE_CHAR_PTR - #define ULONG CTYPE_UNSIGNED_LONG - #define UCHAR CTYPE_UNSIGNED_CHAR - #define SHORT CTYPE_SHORT - #define USHORT CTYPE_UNSIGNED_SHORT - #define PVOID CTYPE_VOID_PTR - #define ULONG_PTR CTYPE_UNSIGNED_LONG_PTR +#define VOID CTYPE_VOID +#define UINT CTYPE_UNSIGNED_INT +#define HANDLE CTYPE_UNSIGNED_LONG +#define HICON CTYPE_UNSIGNED_LONG +#define HBITMAP CTYPE_UNSIGNED_LONG +#define HCURSOR CTYPE_UNSIGNED_LONG +#define HBRUSH CTYPE_UNSIGNED_LONG +#define LPCSTR CTYPE_CHAR_PTR +#define WNDPROC CTYPE_UNSIGNED_LONG +#define BOOL CTYPE_LONG +#define LPVOID CTYPE_VOID_PTR +#define DWORD CTYPE_UNSIGNED_LONG +#define WORD CTYPE_UNSIGNED_SHORT +#define LPCTSTR CTYPE_CHAR_PTR +#define COLORREF CTYPE_UNSIGNED_LONG +#define BYTE CTYPE_CHAR +#define TCHAR CTYPE_UNSIGNED_CHAR +#define HINSTANCE CTYPE_UNSIGNED_LONG +#define HMENU CTYPE_UNSIGNED_LONG +#define HTREEITEM CTYPE_UNSIGNED_LONG +#define INT CTYPE_INT +#define int CTYPE_INT +#define HWND CTYPE_UNSIGNED_LONG +#define LPARAM CTYPE_LONG +#define HGLOBAL CTYPE_UNSIGNED_LONG +#define WPARAM CTYPE_INT +#define HKEY CTYPE_UNSIGNED_LONG +#define char CTYPE_CHAR +#define LONG CTYPE_LONG +#define BCHAR CTYPE_UNSIGNED_CHAR +#define WCHAR CTYPE_UNSIGNED_SHORT +#define DOUBLE CTYPE_DOUBLE +#define LPTSTR CTYPE_CHAR_PTR +#define LPSTR CTYPE_CHAR_PTR +#define ULONG CTYPE_UNSIGNED_LONG +#define UCHAR CTYPE_UNSIGNED_CHAR +#define SHORT CTYPE_SHORT +#define USHORT CTYPE_UNSIGNED_SHORT +#define PVOID CTYPE_VOID_PTR +#define ULONG_PTR CTYPE_UNSIGNED_LONG_PTR - #define LPOFNHOOKPROC CTYPE_UNSIGNED_LONG - #define LPCFHOOKPROC CTYPE_UNSIGNED_LONG - #define LPFRHOOKPROC CTYPE_UNSIGNED_LONG - #define LPPAGESETUPHOOK CTYPE_UNSIGNED_LONG - #define LPPAGEPAINTHOOK CTYPE_UNSIGNED_LONG - #define LPPRINTHOOKPROC CTYPE_UNSIGNED_LONG - #define LPSETUPHOOKPROC CTYPE_UNSIGNED_LONG +#define LPOFNHOOKPROC CTYPE_UNSIGNED_LONG +#define LPCFHOOKPROC CTYPE_UNSIGNED_LONG +#define LPFRHOOKPROC CTYPE_UNSIGNED_LONG +#define LPPAGESETUPHOOK CTYPE_UNSIGNED_LONG +#define LPPAGEPAINTHOOK CTYPE_UNSIGNED_LONG +#define LPPRINTHOOKPROC CTYPE_UNSIGNED_LONG +#define LPSETUPHOOKPROC CTYPE_UNSIGNED_LONG - #define BFFCALLBACK CTYPE_UNSIGNED_LONG +#define BFFCALLBACK CTYPE_UNSIGNED_LONG - #define HDC CTYPE_UNSIGNED_LONG - #define HIMAGELIST CTYPE_UNSIGNED_LONG +#define HDC CTYPE_UNSIGNED_LONG +#define HIMAGELIST CTYPE_UNSIGNED_LONG - #ytranslate CTYPE_INT(<x>) => Int(<x>) /* Fixes conflict with INT() function */ +#ytranslate CTYPE_Int( <x> ) => Int( <x> ) /* Fixes conflict with Int() function */ #endif /* __WINTYPES_CH */ diff --git a/harbour/contrib/xhb/xhb.ch b/harbour/contrib/xhb/xhb.ch index b03a466092..51b24d1f0c 100644 --- a/harbour/contrib/xhb/xhb.ch +++ b/harbour/contrib/xhb/xhb.ch @@ -61,31 +61,31 @@ #pragma -ks+ REQUEST XHB_LIB - #xtranslate __Keyboard([<x,...>]) => xhb__Keyboard(<x>) - #xtranslate __CopyFile([<x,...>]) => xhb_CopyFile(<x>) + #xtranslate __Keyboard( [<x,...>] ) => xhb__Keyboard( <x> ) + #xtranslate __CopyFile( [<x,...>] ) => xhb_CopyFile( <x> ) - #xuntranslate AIns( => - #xuntranslate ADel( => + #xuntranslate AIns( => + #xuntranslate ADel( => - #xtranslate AIns(<a>,<n>,[<x,...>]) => xhb_AIns(<a>,<n>,<x>) - #xtranslate ADel(<a>,<n>,<l>) => xhb_ADel(<a>,<n>,<l>) + #xtranslate AIns( <a>, <n>, [<x,...>] ) => xhb_AIns( <a>, <n>, <x> ) + #xtranslate ADel( <a>, <n>, <l> ) => xhb_ADel( <a>, <n>, <l> ) - #xuntranslate NetName( => - #xuntranslate MemoWrit( => + #xuntranslate NetName( => + #xuntranslate MemoWrit( => - #xtranslate NetName([<x,...>]) => xhb_NetName(<x>) - #xtranslate MemoWrit([<x,...>]) => xhb_MemoWrit(<x>) + #xtranslate NetName( [<x,...>] ) => xhb_NetName( <x> ) + #xtranslate MemoWrit( [<x,...>] ) => xhb_MemoWrit( <x> ) - #xtranslate SaveScreen([<x,...>]) => xhb_SaveScreen(<x>) - #xtranslate RestScreen([<x,...>]) => xhb_RestScreen(<x>) - #xtranslate RTrim([<x,...>]) => xhb_RTrim(<x>) - #xtranslate Trim([<x,...>]) => xhb_Trim(<x>) - #xtranslate AllTrim([<x,...>]) => xhb_AllTrim(<x>) + #xtranslate SaveScreen( [<x,...>] ) => xhb_SaveScreen( <x> ) + #xtranslate RestScreen( [<x,...>] ) => xhb_RestScreen( <x> ) + #xtranslate RTrim( [<x,...>] ) => xhb_RTrim( <x> ) + #xtranslate Trim( [<x,...>] ) => xhb_Trim( <x> ) + #xtranslate AllTrim( [<x,...>] ) => xhb_AllTrim( <x> ) /* _SET_TRACE* / TraceLog() */ - #xtranslate Set(_SET_TRACE [,<x,...>]) => xhb_setTrace( <x> ) - #xtranslate Set(_SET_TRACEFILE [,<x,...>]) => xhb_setTraceFile( <x> ) - #xtranslate Set(_SET_TRACESTACK [,<x,...>]) => xhb_setTraceStack( <x> ) + #xtranslate Set( _SET_TRACE [,<x,...>] ) => xhb_SetTrace( <x> ) + #xtranslate Set( _SET_TRACEFILE [,<x,...>] ) => xhb_SetTraceFile( <x> ) + #xtranslate Set( _SET_TRACESTACK [,<x,...>] ) => xhb_SetTraceStack( <x> ) #endif diff --git a/harbour/contrib/xhb/xhbcls.ch b/harbour/contrib/xhb/xhbcls.ch index 662a703857..98a0259051 100644 --- a/harbour/contrib/xhb/xhbcls.ch +++ b/harbour/contrib/xhb/xhbcls.ch @@ -102,7 +102,7 @@ [SCOPE <scope>] [<persist: PERSISTENT>] ; [<case: NOUPPER>] => ; __clsAddMsg( <Class>():classH, #<Message>, ; - {| Self | HB_SYMBOL_UNUSED( Self ), <code> }, ; + {| Self | HB_SYMBOL_UNUsed( Self ), <code> }, ; HB_OO_MSG_INLINE, NIL, ; __xhb_cls_scope( <scope>, <.persist.> ) ) @@ -112,7 +112,7 @@ [SCOPE <scope>] [<persist: PERSISTENT>] ; [<case: NOUPPER>] => ; __clsAddMsg( <Class>():classH, #<Message>, ; - {| Self, <params> | HB_SYMBOL_UNUSED( Self ), <code> }, ; + {| Self, <params> | HB_SYMBOL_UNUsed( Self ), <code> }, ; HB_OO_MSG_INLINE, NIL, ; __xhb_cls_scope( <scope>, <.persist.> ) ) diff --git a/harbour/extras/gfspell/spell.prg b/harbour/extras/gfspell/spell.prg index f596273584..0120faf709 100644 --- a/harbour/extras/gfspell/spell.prg +++ b/harbour/extras/gfspell/spell.prg @@ -969,7 +969,7 @@ FUNCTION Sp_Split( cWord ) cWord2 := SubStr( cWord, x ) IF Len( cWord1 ) > 1 .AND. Len( cWord2 ) > 1 IF SP_Check( cWord1 ) .AND. SP_Check( cWord2 ) - AAdd( arr_, cWord1 + ' ' + cWord2 ) + AAdd( arr_, cWord1 + " " + cWord2 ) ENDIF ENDIF NEXT diff --git a/harbour/extras/hbvpdf/hbvpdf.prg b/harbour/extras/hbvpdf/hbvpdf.prg index 45cc3484ce..daa997a359 100644 --- a/harbour/extras/hbvpdf/hbvpdf.prg +++ b/harbour/extras/hbvpdf/hbvpdf.prg @@ -1163,7 +1163,7 @@ FUNCTION pdfText( cString, nTop, nLeft, nLength, nTab, nJustify, cUnits, cColor, LOCAL lParagraph, nSpace, nNew, nTokenLen, nCRLF, nTokens, nLen __defaultNIL( @nTab, -1 ) - __defaultNIL( @cUnits, 'R' ) + __defaultNIL( @cUnits, "R" ) __defaultNIL( @nJustify, 4 ) // justify __defaultNIL( @lPrint, .T. ) __defaultNIL( @cColor, "" ) @@ -1363,9 +1363,9 @@ FUNCTION pdfOpenHeader( cFile ) IF ! Empty( cFile ) cFile := AllTrim( cFile ) IF Len( cFile ) > 12 .OR. ; - At( ' ', cFile ) > 0 .OR. ; - ( At( ' ', cFile ) == 0 .AND. Len( cFile ) > 8 ) .OR. ; - ( ( nAt := At( '.', cFile ) ) > 0 .AND. Len( SubStr( cFile, nAt + 1 ) ) > 3 ) + At( " ", cFile ) > 0 .OR. ; + ( At( " ", cFile ) == 0 .AND. Len( cFile ) > 8 ) .OR. ; + ( ( nAt := At( ".", cFile ) ) > 0 .AND. Len( SubStr( cFile, nAt + 1 ) ) > 3 ) COPY File ( cFile ) TO temp.tmp cFile := "temp.tmp" ENDIF @@ -1442,7 +1442,7 @@ FUNCTION pdfDisableHeader( cId ) FUNCTION pdfSaveHeader( cFile ) - Array2File( 'temp.tmp', t_aReport[ HEADER ] ) + Array2File( "temp.tmp", t_aReport[ HEADER ] ) COPY file temp.tmp to ( cFile ) RETURN NIL @@ -1809,7 +1809,7 @@ FUNCTION pdfCreateHeader( _file, _size, _orient, _lpi, _width ) FUNCTION pdfImageInfo( cFile ) - LOCAL cTemp := Upper( SubStr( cFile, RAt( '.', cFile ) + 1 ) ), aTemp := {} + LOCAL cTemp := Upper( SubStr( cFile, RAt( ".", cFile ) + 1 ) ), aTemp := {} DO CASE CASE cTemp == "TIF" @@ -1833,10 +1833,10 @@ FUNCTION pdfTIFFInfo( cFile ) nHandle := FOpen( cFile ) - c2 := ' ' + c2 := " " FRead( nHandle, @c2, 2 ) FRead( nHandle, @c2, 2 ) - cIFDNext := ' ' + cIFDNext := " " FRead( nHandle, @cIFDNext, 4 ) cTemp := Space( 12 ) @@ -1847,7 +1847,7 @@ FUNCTION pdfTIFFInfo( cFile ) nIFD := Bin2L( cIFDNext ) FSeek( nHandle, nIFD ) - // ? '*** IFD ' + hb_ntos( ++nPages ) + // ? "*** IFD " + hb_ntos( ++nPages ) FRead( nHandle, @c2, 2 ) nFields := Bin2I( c2 ) @@ -1896,9 +1896,9 @@ FUNCTION pdfTIFFInfo( cFile ) IF nFieldType == ASCII --nCount ENDIF - // ? 'Tag' - // ?? ' ' + padr( nTag, 10 ) - // cTag := '' + // ? "Tag" + // ?? " " + padr( nTag, 10 ) + // cTag := "" DO CASE CASE nTag == 256 /* @@ -1907,11 +1907,11 @@ FUNCTION pdfTIFFInfo( cFile ) Type = SHORT or LONG The number of columns in the image, i.e., the number of pixels per scanline. */ - // ?? 'ImageWidth' - // cTag := 'ImageWidth' + // ?? "ImageWidth" + // cTag := "ImageWidth" #if 0 IF nFieldType != SHORT .AND. nFieldType != LONG - Alert( 'Wrong Type for ImageWidth' ) + Alert( "Wrong Type for ImageWidth" ) ENDIF #endif IF nFieldType == SHORT @@ -1927,11 +1927,11 @@ FUNCTION pdfTIFFInfo( cFile ) Type = SHORT or LONG The number of rows (sometimes described as scanlines) in the image. */ - // ?? 'ImageLength' - // cTag := 'ImageLength' + // ?? "ImageLength" + // cTag := "ImageLength" #if 0 IF nFieldType != SHORT .AND. nFieldType != LONG - Alert( 'Wrong Type for ImageLength' ) + Alert( "Wrong Type for ImageLength" ) ENDIF #endif IF nFieldType == SHORT @@ -1949,17 +1949,17 @@ FUNCTION pdfTIFFInfo( cFile ) Allowable values for Baseline TIFF grayscale images are 4 and 8, allowing either 16 or 256 distinct shades of gray. */ - // ?? 'BitsPerSample' - // cTag := 'BitsPerSample' + // ?? "BitsPerSample" + // cTag := "BitsPerSample" nTemp := 0 IF nFieldType == SHORT nTemp := Bin2W( cValues ) ELSE - // alert('Wrong Type for BitsPerSample') + // Alert( "Wrong Type for BitsPerSample" ) ENDIF nBits := nTemp // IF nTemp != 4 .and. nTemp != 8 - // alert('Wrong Value for BitsPerSample') + // Alert( "Wrong Value for BitsPerSample" ) // ENDIF CASE nTag == 259 /* @@ -1978,16 +1978,16 @@ FUNCTION pdfTIFFInfo( cFile ) unaffected. Baseline TIFF readers must handle all three compression schemes. */ - // ?? 'Compression' - // cTag := 'Compression' + // ?? "Compression" + // cTag := "Compression" /*nTemp := 0 IF nFieldType == SHORT nTemp := bin2w( cValues ) ELSE - //alert('Wrong Type for Compression') + // Alert( "Wrong Type for Compression" ) ENDIF*/ // IF nTemp != 1 .and. nTemp != 2 .and. nTemp != 32773 - // alert('Wrong Value for Compression') + // Alert( "Wrong Value for Compression" ) // ENDIF CASE nTag == 262 /* @@ -2001,16 +2001,16 @@ FUNCTION pdfTIFFInfo( cFile ) value is imaged as white. If this value is specified for Compression=2, the image should display and print reversed. */ - // ?? 'PhotometricInterpretation' - // cTag := 'PhotometricInterpretation' + // ?? "PhotometricInterpretation" + // cTag := "PhotometricInterpretation" nTemp := -1 IF nFieldType == SHORT nTemp := Bin2W( cValues ) ELSE - // alert('Wrong Type for PhotometricInterpretation') + // Alert( "Wrong Type for PhotometricInterpretation" ) ENDIF IF nTemp != 0 .AND. nTemp != 1 .AND. nTemp != 2 .AND. nTemp != 3 - // alert('Wrong Value for PhotometricInterpretation') + // Alert( "Wrong Value for PhotometricInterpretation" ) ENDIF CASE nTag == 264 /* @@ -2021,10 +2021,10 @@ FUNCTION pdfTIFFInfo( cFile ) N = 1 No default. See also Threshholding. */ - // ?? 'CellWidth' - // cTag := 'CellWidth' + // ?? "CellWidth" + // cTag := "CellWidth" IF nFieldType != SHORT - // alert('Wrong Type for CellWidth') + // Alert( "Wrong Type for CellWidth" ) ENDIF CASE nTag == 265 /* @@ -2037,10 +2037,10 @@ FUNCTION pdfTIFFInfo( cFile ) This field should only be present if Threshholding = 2 No default. See also Threshholding. */ - // ?? 'CellLength' - // cTag := 'CellLength' + // ?? "CellLength" + // cTag := "CellLength" IF nFieldType != SHORT - // alert('Wrong Type for CellLength') + // Alert( "Wrong Type for CellLength" ) ENDIF CASE nTag == 266 /* @@ -2050,10 +2050,10 @@ FUNCTION pdfTIFFInfo( cFile ) Type = SHORT N = 1 */ - // ?? 'FillOrder' - // cTag := 'FillOrder' + // ?? "FillOrder" + // cTag := "FillOrder" IF nFieldType != SHORT - // alert('Wrong Type for FillOrder') + // Alert( "Wrong Type for FillOrder" ) ENDIF CASE nTag == 273 /* @@ -2062,10 +2062,10 @@ FUNCTION pdfTIFFInfo( cFile ) Type = SHORT or LONG For each strip, the byte offset of that strip. */ - // ?? 'StripOffsets' - // cTag := 'StripOffsets' + // ?? "StripOffsets" + // cTag := "StripOffsets" IF nFieldType != SHORT .AND. nFieldType != LONG - // alert('Wrong Type for StripOffsets') + // Alert( "Wrong Type for StripOffsets" ) ENDIF IF nFieldType == SHORT @@ -2082,10 +2082,10 @@ FUNCTION pdfTIFFInfo( cFile ) The number of components per pixel. This number is 3 for RGB images, unless extra samples are present. See the ExtraSamples field for further information. */ - // ?? 'SamplesPerPixel' - // cTag := 'SamplesPerPixel' + // ?? "SamplesPerPixel" + // cTag := "SamplesPerPixel" IF nFieldType != SHORT - // alert('Wrong Type for SamplesPerPixel') + // Alert( "Wrong Type for SamplesPerPixel" ) ENDIF CASE nTag == 278 /* @@ -2098,10 +2098,10 @@ FUNCTION pdfTIFFInfo( cFile ) third strip. (The data in the last strip is not padded with 6 extra rows of dummy data.) */ - // ?? 'RowsPerStrip' - // cTag := 'RowsPerStrip' + // ?? "RowsPerStrip" + // cTag := "RowsPerStrip" IF nFieldType != SHORT .AND. nFieldType != LONG - // alert('Wrong Type for RowsPerStrip') + // Alert( "Wrong Type for RowsPerStrip" ) ENDIF CASE nTag == 279 /* @@ -2110,10 +2110,10 @@ FUNCTION pdfTIFFInfo( cFile ) Type = SHORT or LONG For each strip, the number of bytes in that strip after any compression. */ - // ?? 'StripByteCounts' - // cTag := 'StripByteCounts' + // ?? "StripByteCounts" + // cTag := "StripByteCounts" IF nFieldType != SHORT .AND. nFieldType != LONG - // alert('Wrong Type for StripByteCounts') + // Alert( "Wrong Type for StripByteCounts" ) ENDIF IF nFieldType == SHORT @@ -2132,10 +2132,10 @@ FUNCTION pdfTIFFInfo( cFile ) The number of pixels per ResolutionUnit in the ImageWidth (typically, horizontal - see Orientation) direction. */ - // ?? 'XResolution' - // cTag := 'XResolution' + // ?? "XResolution" + // cTag := "XResolution" IF nFieldType != RATIONAL - // alert('Wrong Type for XResolution') + // Alert( "Wrong Type for XResolution" ) ENDIF xRes := Bin2L( SubStr( cValues, 1, 4 ) ) CASE nTag == 283 @@ -2146,17 +2146,17 @@ FUNCTION pdfTIFFInfo( cFile ) The number of pixels per ResolutionUnit in the ImageLength (typically, vertical) direction. */ - // ?? 'YResolution' - // cTag := 'YResolution' + // ?? "YResolution" + // cTag := "YResolution" IF nFieldType != RATIONAL - // alert('Wrong Type for YResolution') + // Alert( "Wrong Type for YResolution" ) ENDIF yRes := Bin2L( SubStr( cValues, 1, 4 ) ) CASE nTag == 284 - // ?? 'PlanarConfiguration' - // cTag := 'PlanarConfiguration' + // ?? "PlanarConfiguration" + // cTag := "PlanarConfiguration" IF nFieldType != SHORT - // alert('Wrong Type for PlanarConfiguration') + // Alert( "Wrong Type for PlanarConfiguration" ) ENDIF CASE nTag == 288 /* @@ -2168,10 +2168,10 @@ FUNCTION pdfTIFFInfo( cFile ) Not recommended for general interchange. See also FreeByteCounts. */ - // ?? 'FreeOffsets' - // cTag := 'FreeOffsets' + // ?? "FreeOffsets" + // cTag := "FreeOffsets" IF nFieldType != LONG - // alert('Wrong Type for FreeOffsets') + // Alert( "Wrong Type for FreeOffsets" ) ENDIF CASE nTag == 289 /* @@ -2183,10 +2183,10 @@ FUNCTION pdfTIFFInfo( cFile ) Not recommended for general interchange. See also FreeOffsets. */ - // ?? 'FreeByteCounts' - // cTag := 'FreeByteCounts' + // ?? "FreeByteCounts" + // cTag := "FreeByteCounts" IF nFieldType != LONG - // alert('Wrong Type for FreeByteCounts') + // Alert( "Wrong Type for FreeByteCounts" ) ENDIF CASE nTag == 296 /* @@ -2200,22 +2200,22 @@ FUNCTION pdfTIFFInfo( cFile ) 3 = Centimeter. Default = 2 (inch). */ - // ?? 'ResolutionUnit' - // cTag := 'ResolutionUnit' + // ?? "ResolutionUnit" + // cTag := "ResolutionUnit" nTemp := 0 IF nFieldType == SHORT nTemp := Bin2W( cValues ) ELSE - // alert('Wrong Type for ResolutionUnit') + // Alert( "Wrong Type for ResolutionUnit" ) ENDIF IF nTemp != 1 .AND. nTemp != 2 .AND. nTemp != 3 - // alert('Wrong Value for ResolutionUnit') + // Alert( "Wrong Value for ResolutionUnit" ) ENDIF CASE nTag == 305 - // ?? 'Software' - // cTag := 'Software' + // ?? "Software" + // cTag := "Software" IF nFieldType != ASCII - // alert('Wrong Type for Software') + // Alert( "Wrong Type for Software" ) ENDIF CASE nTag == 306 /* @@ -2228,10 +2228,10 @@ FUNCTION pdfTIFFInfo( cFile ) clock, and one space character between the date and the time. The length of the string, including the terminating NUL, is 20 bytes. */ - // ?? 'DateTime' - // cTag := 'DateTime' + // ?? "DateTime" + // cTag := "DateTime" IF nFieldType != ASCII - // alert('Wrong Type for DateTime') + // Alert( "Wrong Type for DateTime" ) ENDIF CASE nTag == 315 /* @@ -2241,10 +2241,10 @@ FUNCTION pdfTIFFInfo( cFile ) Type = ASCII Note: some older TIFF files used this tag for storing Copyright information. */ - // ?? 'Artist' - // cTag := 'Artist' + // ?? "Artist" + // cTag := "Artist" IF nFieldType != ASCII - // alert('Wrong Type for Artist') + // Alert( "Wrong Type for Artist" ) ENDIF CASE nTag == 320 /* @@ -2260,10 +2260,10 @@ FUNCTION pdfTIFFInfo( cFile ) then the Blue values. In the ColorMap, black is represented by 0,0,0 and white is represented by 65535, 65535, 65535. */ - // ?? 'ColorMap' - // cTag := 'ColorMap' + // ?? "ColorMap" + // cTag := "ColorMap" IF nFieldType != SHORT - // alert('Wrong Type for ColorMap') + // Alert( "Wrong Type for ColorMap" ) ENDIF CASE nTag == 338 /* @@ -2273,10 +2273,10 @@ FUNCTION pdfTIFFInfo( cFile ) Type = SHORT N = m */ - // ?? 'ExtraSamples' - // cTag := 'ExtraSamples' + // ?? "ExtraSamples" + // cTag := "ExtraSamples" IF nFieldType != SHORT - // alert('Wrong Type for ExtraSamples') + // Alert( "Wrong Type for ExtraSamples" ) ENDIF CASE nTag == 33432 /* @@ -2289,68 +2289,68 @@ FUNCTION pdfTIFFInfo( cFile ) any dates and statements of claims. For example, Copyright, John Smith, 19xx. All rights reserved. */ - // ?? 'Copyright' - // cTag := 'Copyright' + // ?? "Copyright" + // cTag := "Copyright" IF nFieldType != ASCII - // alert('Wrong Type for Copyright') + // Alert( "Wrong Type for Copyright" ) ENDIF OTHERWISE - // ?? 'Unknown' - // cTag := 'Unknown' + // ?? "Unknown" + // cTag := "Unknown" ENDCASE #if 0 ?? PadR( cTag, 30 ) - ?? ' type ' + PadR( aType[ nFieldType ], 10 ) + ' count ' + hb_ntos( nCount ) + ' <' + ?? " type " + PadR( aType[ nFieldType ], 10 ) + " count " + hb_ntos( nCount ) + " <" DO CASE CASE nFieldType == BYTE FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Asc( SubStr( cValues, nI, 1 ) ) ) + ?? " " + hb_ntos( Asc( SubStr( cValues, nI, 1 ) ) ) NEXT CASE nFieldType == ASCII - ?? ' ' + ?? " " FOR nI := 1 TO nCount ?? SubStr( cValues, nI, 1 ) NEXT CASE nFieldType == SHORT FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Bin2W( SubStr( cValues, ( nI - 1 ) * 2 + 1, 2 ) ) ) + ?? " " + hb_ntos( Bin2W( SubStr( cValues, ( nI - 1 ) * 2 + 1, 2 ) ) ) NEXT CASE nFieldType == LONG FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 4 + 1, 4 ) ) ) + ?? " " + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 4 + 1, 4 ) ) ) NEXT CASE nFieldType == RATIONAL FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 8 + 1, 4 ) ) ) + '/' + hb_ntos( Bin2L( SubStr( cValues, nI + 4, 4 ) ) ) + ?? " " + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 8 + 1, 4 ) ) ) + "/" + hb_ntos( Bin2L( SubStr( cValues, nI + 4, 4 ) ) ) NEXT CASE nFieldType == SBYTE FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Asc( SubStr( cValues, nI, 1 ) ) ) + ?? " " + hb_ntos( Asc( SubStr( cValues, nI, 1 ) ) ) NEXT CASE nFieldType == UNDEFINED FOR nI := 1 TO nCount - ?? ' ' + SubStr( cValues, nI, 1 ) + ?? " " + SubStr( cValues, nI, 1 ) NEXT CASE nFieldType == SSHORT FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Bin2I( SubStr( cValues, ( nI - 1 ) * 2 + 1, 2 ) ) ) + ?? " " + hb_ntos( Bin2I( SubStr( cValues, ( nI - 1 ) * 2 + 1, 2 ) ) ) NEXT CASE nFieldType == SLONG FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 4 + 1, 4 ) ) ) + ?? " " + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 4 + 1, 4 ) ) ) NEXT CASE nFieldType == SRATIONAL FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 8 + 1, 4 ) ) ) + '/' + hb_ntos( Bin2L( SubStr( cValues, nI + 4, 4 ) ) ) + ?? " " + hb_ntos( Bin2L( SubStr( cValues, ( nI - 1 ) * 8 + 1, 4 ) ) ) + "/" + hb_ntos( Bin2L( SubStr( cValues, nI + 4, 4 ) ) ) NEXT CASE nFieldType == FLOAT CASE nFieldType == DOUBLE FOR nI := 1 TO nCount - ?? ' ' + hb_ntos( ctof( SubStr( cValues, ( nI - 1 ) * 8 + 1, 8 ) ) ) + ?? " " + hb_ntos( ctof( SubStr( cValues, ( nI - 1 ) * 8 + 1, 8 ) ) ) NEXT ENDCASE - ?? ' >' + ?? " >" #endif NEXT FRead( nHandle, @cIFDNext, 4 ) @@ -2528,7 +2528,7 @@ STATIC FUNCTION WriteData( hFile, xData ) ELSEIF HB_ISDATE( xData ) cData += I2Bin( 8 ) + DToS( xData ) ELSEIF HB_ISLOGICAL( xData ) - cData += I2Bin( 1 ) + iif( xData, 'T', 'F' ) + cData += I2Bin( 1 ) + iif( xData, "T", "F" ) ELSEIF HB_ISARRAY( xData ) cData += I2Bin( Len( xData ) ) ELSE @@ -2549,7 +2549,7 @@ STATIC FUNCTION File2Array( cFile, nLen, hFile ) ENDIF cData := Space( 3 ) FRead( hFile, @cData, 3 ) - IF !( Left( cData, 1 ) == 'A' ) + IF !( Left( cData, 1 ) == "A" ) RETURN aRay ENDIF nLen := Bin2I( Right( cData, 2 ) ) @@ -2562,7 +2562,7 @@ STATIC FUNCTION File2Array( cFile, nLen, hFile ) ENDIF cType := PadL( cData, 1 ) nDataLen := Bin2I( Right( cData, 2 ) ) - IF !( cType == 'A' ) + IF !( cType == "A" ) cData := Space( nDataLen ) nBytes := FRead( hFile, @cData, nDataLen ) IF nBytes < nDataLen @@ -2571,15 +2571,15 @@ STATIC FUNCTION File2Array( cFile, nLen, hFile ) ENDIF nDepth++ AAdd( aRay, NIL ) - IF cType == 'C' + IF cType == "C" aRay[ nDepth ] := cData - ELSEIF cType == 'N' + ELSEIF cType == "N" aRay[ nDepth ] := Val( cData ) - ELSEIF cType == 'D' + ELSEIF cType == "D" aRay[ nDepth ] := CToD( Left( cData, 4 ) + "/" + SubStr( cData, 5, 2 ) + "/" + SubStr( cData, 7, 2 ) ) // stod(cData) - ELSEIF cType == 'L' - aRay[ nDepth ] := ( cData == 'T' ) - ELSEIF cType == 'A' + ELSEIF cType == "L" + aRay[ nDepth ] := ( cData == "T" ) + ELSEIF cType == "A" aRay[ nDepth ] := File2Array(, nDataLen, hFile ) ENDIF ENDDO diff --git a/harbour/extras/httpsrv/cgifunc.prg b/harbour/extras/httpsrv/cgifunc.prg index 6c66441129..07a18febdf 100644 --- a/harbour/extras/httpsrv/cgifunc.prg +++ b/harbour/extras/httpsrv/cgifunc.prg @@ -343,11 +343,11 @@ FUNCTION uhttpd_URLEncode( cString, lComplete ) CASE ( cChar >= "A" .AND. cChar <= "Z" ) .OR. ; ( cChar >= "a" .AND. cChar <= "z" ) .OR. ; ( cChar >= "0" .AND. cChar <= "9" ) .OR. ; - cChar == '.' .OR. cChar == ',' .OR. cChar == '&' .OR. ; - cChar == '/' .OR. cChar == ';' .OR. cChar == '_' + cChar == "." .OR. cChar == "," .OR. cChar == "&" .OR. ; + cChar == "/" .OR. cChar == ";" .OR. cChar == "_" cRet += cChar - CASE iif( ! lComplete, cChar == ':' .OR. cChar == '?' .OR. cChar == '=', .F. ) + CASE iif( ! lComplete, cChar == ":" .OR. cChar == "?" .OR. cChar == "=", .F. ) cRet += cChar OTHERWISE @@ -482,7 +482,7 @@ FUNCTION uhttpd_OutputString( cString, aTranslate, lProtected ) LOCAL cHtml __defaultNIL( @lProtected, .F. ) - __defaultNIL( @aTranslate, { { '"', '"' }, { ' ', ' ' } } ) + __defaultNIL( @aTranslate, { { '"', """ }, { " ", " " } } ) // TraceLog( "OutputString( cString, aTranslate, lProtected )", cString, aTranslate, lProtected ) IF lProtected @@ -497,9 +497,9 @@ FUNCTION uhttpd_OutputString( cString, aTranslate, lProtected ) FUNCTION uhttpd_HtmlSpecialChars( cString, cQuote_style ) LOCAL aTranslations := { ; - { '&', '&' }, ; - { '<', '<' }, ; - { '>', '>' } } + { "&", "&" }, ; + { "<", "<" }, ; + { ">", ">" } } RETURN uhttpd_HtmlConvertChars( cString, cQuote_style, aTranslations ) diff --git a/harbour/extras/httpsrv/modules/tableservletdb.prg b/harbour/extras/httpsrv/modules/tableservletdb.prg index 4a428cce0a..1d8ee9d648 100644 --- a/harbour/extras/httpsrv/modules/tableservletdb.prg +++ b/harbour/extras/httpsrv/modules/tableservletdb.prg @@ -65,7 +65,7 @@ FUNCTION HRBMAIN() hGets := _REQUEST - DEFAULT hGets TO { => } + hb_default( @hGets, { => } ) IF hb_HHasKey( hGets, "page" ) @@ -116,7 +116,7 @@ FUNCTION HRBMAIN() uhttpd_SetHeader( "Content-Type", "text/xml" ) uhttpd_Write( '<?xml version="1.0" encoding="ISO-8859-1"?>' ) - uhttpd_Write( '<pages><page>No Data</page></pages>' ) + uhttpd_Write( "<pages><page>No Data</page></pages>" ) ENDIF @@ -353,7 +353,7 @@ METHOD xmlEncode( input ) CLASS TableManager FOR i := 1 TO Len( input ) c := SubStr( input, i, 1 ) SWITCH c - CASE '&' + CASE "&" out += "&" EXIT CASE "'" @@ -362,14 +362,14 @@ METHOD xmlEncode( input ) CLASS TableManager CASE '"' out += """ EXIT - CASE '<' + CASE "<" out += "<" EXIT - CASE '>' + CASE ">" out += ">" EXIT #if 0 - CASE ' ' + CASE " " out += " " EXIT #endif diff --git a/harbour/extras/httpsrv/session.prg b/harbour/extras/httpsrv/session.prg index f68f75aca1..600e45fc9d 100644 --- a/harbour/extras/httpsrv/session.prg +++ b/harbour/extras/httpsrv/session.prg @@ -272,7 +272,7 @@ METHOD Start( cSID ) CLASS uhttpd_Session // Should we define the SID? IF lDefine_SID - cSID := ::cName + '=' + ::cSID + cSID := ::cName + "=" + ::cSID _REQUEST[ ::cName ] := ::cSID ENDIF @@ -282,7 +282,7 @@ METHOD Start( cSID ) CLASS uhttpd_Session // Start session IF ! ::Open( ::cSavePath, ::cName ) - uhttpd_Die( 'ERROR: Failed to open session file' ) + uhttpd_Die( "ERROR: Failed to open session file" ) ENDIF // Read session data @@ -337,11 +337,11 @@ METHOD Close() CLASS uhttpd_Session // Save session IF ! ::Write( ::cSID, cVal ) - uhttpd_Die( 'Session could not be saved.' ) + uhttpd_Die( "Session could not be saved." ) ENDIF // Close session IF ! Eval( ::bClose ) - uhttpd_Die( 'Session could not be closed.' ) + uhttpd_Die( "Session could not be closed." ) ENDIF ::nActiveSessions-- @@ -826,7 +826,7 @@ METHOD Decode( cData ) CLASS uhttpd_Session SWITCH ValType( xVal ) #if 0 - CASE 'O' + CASE "O" // TraceLog( "Decode - xVal - Object", xVal ) IF xVal:classname == "TASSOCIATIVEARRAY" // TraceLog( "Decode - xVal - Object - TAssociativeArray - Keys", xVal:Keys ) @@ -838,7 +838,7 @@ METHOD Decode( cData ) CLASS uhttpd_Session EXIT #endif - CASE 'A' // Le variabili sono conservate come array { VarName, Value } + CASE "A" // Le variabili sono conservate come array { VarName, Value } // TraceLog( "Decode - xVal - Array", xVal ) // ::oCGI:ToLogFile( "Decode - xVal - Array = " + hb_CStr( xVal ) + ", Len = " + hb_CStr( Len( xVal ) ), "/pointtoit/tmp/log.txt" ) FOR EACH aElem IN xVal @@ -861,24 +861,24 @@ METHOD SendCacheLimiter() CLASS uhttpd_Session LOCAL dDate DO CASE - CASE ::cCache_Limiter == 'nocache' - // uhttpd_SetHeader( 'Expires', 'Thu, 19 Nov 1981 08:52:00 GMT' ) - uhttpd_SetHeader( 'Expires', uhttpd_DateToGMT( ,, -1, ) ) - uhttpd_SetHeader( 'Cache-Control', 'no-cache' ) - // uhttpd_SetHeader("Cache-Control", "no-store, no-cache, must-revalidate") // HTTP/1.1 - // uhttpd_SetHeader("Cache-Control", "post-check=0, pre-check=0", .F. ) - uhttpd_SetHeader( 'Pragma', 'no-cache' ) - CASE ::cCache_Limiter == 'private' - uhttpd_SetHeader( 'Expires', 'Thu, 19 Nov 1981 08:52:00 GMT' ) - uhttpd_SetHeader( 'Cache-Control', 'private, max-age=' + hb_ntos( ::nCache_Expire * 60 ) ) + CASE ::cCache_Limiter == "nocache" + // uhttpd_SetHeader( "Expires", "Thu, 19 Nov 1981 08:52:00 GMT" ) + uhttpd_SetHeader( "Expires", uhttpd_DateToGMT( ,, -1, ) ) + uhttpd_SetHeader( "Cache-Control", "no-cache" ) + // uhttpd_SetHeader( "Cache-Control", "no-store, no-cache, must-revalidate" ) // HTTP/1.1 + // uhttpd_SetHeader( "Cache-Control", "post-check=0, pre-check=0", .F. ) + uhttpd_SetHeader( "Pragma", "no-cache" ) + CASE ::cCache_Limiter == "private" + uhttpd_SetHeader( "Expires", "Thu, 19 Nov 1981 08:52:00 GMT" ) + uhttpd_SetHeader( "Cache-Control", "private, max-age=" + hb_ntos( ::nCache_Expire * 60 ) ) IF hb_FGetDateTime( hb_argv( 0 ), @dDate ) - uhttpd_SetHeader( 'Last-Modified', uhttpd_DateToGMT( dDate ) ) + uhttpd_SetHeader( "Last-Modified", uhttpd_DateToGMT( dDate ) ) ENDIF - CASE ::cCache_Limiter == 'public' - uhttpd_SetHeader( 'Expires', uhttpd_DateToGMT( ,,, ::nCache_Expire * 60 ) ) - uhttpd_SetHeader( 'Cache-Control', 'public, max-age=' + hb_ntos( ::nCache_Expire * 60 ) ) + CASE ::cCache_Limiter == "public" + uhttpd_SetHeader( "Expires", uhttpd_DateToGMT( ,,, ::nCache_Expire * 60 ) ) + uhttpd_SetHeader( "Cache-Control", "public, max-age=" + hb_ntos( ::nCache_Expire * 60 ) ) IF hb_FGetDateTime( hb_argv( 0 ), @dDate ) - uhttpd_SetHeader( 'Last-Modified', uhttpd_DateToGMT( dDate ) ) + uhttpd_SetHeader( "Last-Modified", uhttpd_DateToGMT( dDate ) ) ENDIF OTHERWISE uhttpd_Die( "ERROR: Caching method " + ::cCache_Limiter + " not implemented." ) diff --git a/harbour/extras/httpsrv/uhttpd.prg b/harbour/extras/httpsrv/uhttpd.prg index 90832d488e..b17184d8f9 100644 --- a/harbour/extras/httpsrv/uhttpd.prg +++ b/harbour/extras/httpsrv/uhttpd.prg @@ -1239,7 +1239,7 @@ STATIC FUNCTION ParseRequest( cRequest ) // hb_toOutDebug( "GET: cFields = %s, hVars = %s, _GET = %s, _REQUEST = %s\n\r", cFields, hb_ValToExp( hVars ), hb_ValToExp( _GET ), hb_ValToExp( _REQUEST ) ) // POST - IF "POST" $ Upper( _SERVER[ 'REQUEST_METHOD' ] ) + IF "POST" $ Upper( _SERVER[ "REQUEST_METHOD" ] ) cFields := ATail( aRequest ) IF ! Empty( cFields ) hVars := uhttpd_GetVars( cFields ) @@ -1252,7 +1252,7 @@ STATIC FUNCTION ParseRequest( cRequest ) // hb_toOutDebug( "POST: cFields = %s, hVars = %s, _POST = %s, _REQUEST = %s\n\r", cFields, hb_ValToExp( hVars ), hb_ValToExp( _POST ), hb_ValToExp( _REQUEST ) ) // COOKIES - cFields := _SERVER[ 'HTTP_COOKIE' ] + cFields := _SERVER[ "HTTP_COOKIE" ] IF ! Empty( cFields ) hVars := uhttpd_GetVars( cFields, ";" ) hb_HMerge( _COOKIE, hVars ) @@ -1450,7 +1450,7 @@ STATIC PROCEDURE WriteToLog( cRequest ) cAccess := _SERVER[ "REMOTE_ADDR" ] + " - - [" + Right( cDate, 2 ) + "/" + ; aMonths[ Val( SubStr( cDate, 5, 2 ) ) ] + ; - "/" + Left( cDate, 4 ) + ":" + cTime + ' ' + cBias + '] "' + ; + "/" + Left( cDate, 4 ) + ":" + cTime + " " + cBias + '] "' + ; Left( cRequest, At( CR_LF, cRequest ) - 1 ) + '" ' + ; hb_ntos( t_nStatusCode ) + " " + iif( nSize == 0, "-", hb_ntos( nSize ) ) + ; ' "' + iif( Empty( cReferer ), "-", cReferer ) + '" "' + _SERVER[ "HTTP_USER_AGENT" ] + ; diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index fa40e28956..ac2af0cbf1 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -2998,7 +2998,7 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel ) /* Silently ignore these. These options can be used to store options processed by other tools allowing them to keep additional information - in .hb? script files. */ + in .hbp/.hbm script files. */ CASE Left( cParamL, Len( "-workdir=" ) ) == "-workdir="