diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fa7e0dd477..911ec8e67c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,22 @@ The license applies to all entries newer than 2009-04-28. */ +2012-11-10 15:14 UTC+0100 Viktor Szakats (harbour syenar.net) + * config/postinst.hb + * utils/hbmk2/hbmk2.prg + + preserve casing of HB_FUNC_EXCLUDE/HB_FUNC_INCLUDE + exception directives in .hbx files + + * contrib/hbwin/hbwin.hbx + * applied casing the HB_FUNC_EXCLUDE function name + + * contrib/hbwin/hbolesrv.c + * contrib/hbwin/tests/olesrv1.prg + * contrib/hbwin/tests/olesrv2.prg + * contrib/hbwin/tests/olesrv3.prg + * contrib/hbwin/tests/olesrv4.prg + * applied same casing to sources + 2012-11-10 15:00 UTC+0100 Viktor Szakats (harbour syenar.net) * extras/gtwvw/gtwvw.hbx + applied casing for some of the function names @@ -275,7 +291,7 @@ * contrib/hbct/token2.c * src/compiler/harbour.y * src/compiler/harbour.yyc - * deleted unncessary casts + * deleted unnecessary casts 2012-11-09 19:53 UTC+0100 Viktor Szakats (harbour syenar.net) * src/rtl/hbgtcore.c diff --git a/harbour/config/postinst.hb b/harbour/config/postinst.hb index 48d55159ef..d273342ca4 100644 --- a/harbour/config/postinst.hb +++ b/harbour/config/postinst.hb @@ -656,12 +656,12 @@ STATIC PROCEDURE __hb_extern_get_exception_list( cInputName, /* @ */ aInclude, / IF ! Empty( cFile := MemoRead( cInputName ) ) IF ! Empty( pRegex := hb_regexComp( "[[:space:]]" + _HB_FUNC_INCLUDE_ + "[[:space:]]([a-zA-Z0-9_].[^ \t\n\r]*)", .T., .T. ) ) FOR EACH tmp IN hb_regexAll( pRegex, StrTran( cFile, Chr( 13 ) ),,,,, .T. ) - AAdd( aInclude, Upper( tmp[ 2 ] ) ) + AAdd( aInclude, tmp[ 2 ] ) NEXT ENDIF IF ! Empty( pRegex := hb_regexComp( "[[:space:]]" + _HB_FUNC_EXCLUDE_ + "[[:space:]]([a-zA-Z0-9_].[^ \t\n\r]*)", .T., .T. ) ) FOR EACH tmp IN hb_regexAll( pRegex, StrTran( cFile, Chr( 13 ) ),,,,, .T. ) - AAdd( aExclude, Upper( tmp[ 2 ] ) ) + AAdd( aExclude, tmp[ 2 ] ) NEXT ENDIF IF ! Empty( pRegex := hb_regexComp( "^DYNAMIC ([a-zA-Z0-9_]*)$", .T., .T. ) ) @@ -740,7 +740,7 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName ) ELSE aExtern := {} FOR EACH tmp IN aFuncList - IF AScan( aInclude, {| flt | hb_WildMatch( flt, tmp, .T. ) } ) > 0 + IF AScan( aInclude, {| flt | hb_WildMatchI( flt, tmp, .T. ) } ) > 0 AAdd( aExtern, tmp ) ENDIF NEXT @@ -748,7 +748,7 @@ STATIC FUNCTION __hb_extern_gen( aFuncList, cOutputName ) FOR EACH tmp IN aExtern IF ! hb_WildMatch( "HB_GT_*_DEFAULT", tmp, .T. ) .AND. ; ! hb_WildMatch( _HB_SELF_PREFIX + "*" + _HB_SELF_SUFFIX, tmp, .T. ) .AND. ; - AScan( aExclude, {| flt | hb_WildMatch( flt, tmp, .T. ) } ) == 0 + AScan( aExclude, {| flt | hb_WildMatchI( flt, tmp, .T. ) } ) == 0 cExtern += "DYNAMIC " + hb_HGetDef( hDynamic, tmp, tmp ) + hb_eol() ENDIF NEXT diff --git a/harbour/contrib/hbwin/hbolesrv.c b/harbour/contrib/hbwin/hbolesrv.c index 310f652ad0..1671b4af4a 100644 --- a/harbour/contrib/hbwin/hbolesrv.c +++ b/harbour/contrib/hbwin/hbolesrv.c @@ -843,7 +843,7 @@ BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, PVOID pvReserved ) return fResult; } -/* WIN_OleServerInit( , , ; +/* win_oleServerInit( , , ; * [ | | | ], ; * [ | ] ) */ diff --git a/harbour/contrib/hbwin/hbwin.hbx b/harbour/contrib/hbwin/hbwin.hbx index d15c983041..8f85dfd4f6 100644 --- a/harbour/contrib/hbwin/hbwin.hbx +++ b/harbour/contrib/hbwin/hbwin.hbx @@ -5,7 +5,7 @@ * // HB_FUNC_EXCLUDE */ -// HB_FUNC_EXCLUDE WIN_OLESERVERINIT +// HB_FUNC_EXCLUDE win_oleServerInit /* -------------------------------------------------------------------- * WARNING: Automatically generated code below. DO NOT EDIT! diff --git a/harbour/contrib/hbwin/tests/olesrv1.prg b/harbour/contrib/hbwin/tests/olesrv1.prg index 00aac12485..5dc3950f9d 100644 --- a/harbour/contrib/hbwin/tests/olesrv1.prg +++ b/harbour/contrib/hbwin/tests/olesrv1.prg @@ -26,9 +26,9 @@ PROCEDURE DllMain() /* Initialize OLE server ID and name. - * WIN_OleServerInit() should be executed from DllMain() + * win_oleServerInit() should be executed from DllMain() * - * WIN_OleServerInit( , , ; + * win_oleServerInit( , , ; * [ | | | ], ; * [ | ] ) -> * @@ -97,7 +97,7 @@ PROCEDURE DllMain() * It allows to create OLE server which will accept unknown messages * redirecting them to some other code, i.e.: * if netio_connect( cServer,,, cPasswd ) - * WIN_OleServerInit( cClassID, cServerName, @netio_funcExec(), .T. ) + * win_oleServerInit( cClassID, cServerName, @netio_funcExec(), .T. ) * endif * initialize OLE server which redirects all messages to default netio * connection established by netio_connect(). @@ -110,7 +110,7 @@ PROCEDURE DllMain() * http://xharbour.com/index.asp?page=add_on_oleserver&show_sub=7&show_i=1 */ - WIN_OleServerInit( CLS_ID, CLS_Name, {|| OleNetioSrv():new() }, .T. ) + win_oleServerInit( CLS_ID, CLS_Name, {|| OleNetioSrv():new() }, .T. ) RETURN diff --git a/harbour/contrib/hbwin/tests/olesrv2.prg b/harbour/contrib/hbwin/tests/olesrv2.prg index 9247886be9..aca7768335 100644 --- a/harbour/contrib/hbwin/tests/olesrv2.prg +++ b/harbour/contrib/hbwin/tests/olesrv2.prg @@ -29,9 +29,9 @@ PROCEDURE DllMain() hAction[ "GETDATA" ] := @get_data() // DISPID=5 /* Initialize OLE server ID and name. - * WIN_OleServerInit() should be executed from DllMain() + * win_oleServerInit() should be executed from DllMain() */ - WIN_OleServerInit( CLS_ID, CLS_Name, hAction, .T. ) + win_oleServerInit( CLS_ID, CLS_Name, hAction, .T. ) RETURN diff --git a/harbour/contrib/hbwin/tests/olesrv3.prg b/harbour/contrib/hbwin/tests/olesrv3.prg index 13a4ee11c3..c3c4dc123c 100644 --- a/harbour/contrib/hbwin/tests/olesrv3.prg +++ b/harbour/contrib/hbwin/tests/olesrv3.prg @@ -23,9 +23,9 @@ PROCEDURE DllMain() M->Property1 := "MyProperty" /* Initialize OLE server ID and name. - * WIN_OleServerInit() should be executed from DllMain() + * win_oleServerInit() should be executed from DllMain() */ - WIN_OleServerInit( CLS_ID, CLS_Name ) + win_oleServerInit( CLS_ID, CLS_Name ) RETURN diff --git a/harbour/contrib/hbwin/tests/olesrv4.prg b/harbour/contrib/hbwin/tests/olesrv4.prg index 00ed870ab5..0e38958cf6 100644 --- a/harbour/contrib/hbwin/tests/olesrv4.prg +++ b/harbour/contrib/hbwin/tests/olesrv4.prg @@ -21,7 +21,7 @@ PROCEDURE DllMain() - WIN_OleServerInit( CLS_ID, CLS_Name, OleObjServer():new() ) + win_oleServerInit( CLS_ID, CLS_Name, OleObjServer():new() ) RETURN diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 63c5cef94c..0e69384646 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -12466,12 +12466,12 @@ STATIC PROCEDURE __hb_extern_get_exception_list( cInputName, /* @ */ aInclude, / IF ! Empty( cFile := MemoRead( cInputName ) ) IF ! Empty( pRegex := hb_regexComp( "[[:space:]]" + _HB_FUNC_INCLUDE_ + "[[:space:]]([a-zA-Z0-9_].[^ \t\n\r]*)", .T., .T. ) ) FOR EACH tmp IN hb_regexAll( pRegex, StrTran( cFile, Chr( 13 ) ),,,,, .T. ) - AAdd( aInclude, Upper( tmp[ 2 ] ) ) + AAdd( aInclude, tmp[ 2 ] ) NEXT ENDIF IF ! Empty( pRegex := hb_regexComp( "[[:space:]]" + _HB_FUNC_EXCLUDE_ + "[[:space:]]([a-zA-Z0-9_].[^ \t\n\r]*)", .T., .T. ) ) FOR EACH tmp IN hb_regexAll( pRegex, StrTran( cFile, Chr( 13 ) ),,,,, .T. ) - AAdd( aExclude, Upper( tmp[ 2 ] ) ) + AAdd( aExclude, tmp[ 2 ] ) NEXT ENDIF IF ! Empty( pRegex := hb_regexComp( "^DYNAMIC ([a-zA-Z0-9_]*)$", .T., .T. ) ) @@ -12550,7 +12550,7 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName ) ELSE aExtern := {} FOR EACH tmp IN aFuncList - IF AScan( aInclude, {| flt | hb_WildMatch( flt, tmp, .T. ) } ) > 0 + IF AScan( aInclude, {| flt | hb_WildMatchI( flt, tmp, .T. ) } ) > 0 AAdd( aExtern, tmp ) ENDIF NEXT @@ -12558,7 +12558,7 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName ) FOR EACH tmp IN aExtern IF ! hb_WildMatch( "HB_GT_*_DEFAULT", tmp, .T. ) .AND. ; ! hb_WildMatch( _HB_SELF_PREFIX + "*" + _HB_SELF_SUFFIX, tmp, .T. ) .AND. ; - AScan( aExclude, {| flt | hb_WildMatch( flt, tmp, .T. ) } ) == 0 + AScan( aExclude, {| flt | hb_WildMatchI( flt, tmp, .T. ) } ) == 0 cExtern += "DYNAMIC " + hb_HGetDef( hDynamic, tmp, tmp ) + hb_eol() ENDIF NEXT