fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-11-10 15:14 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* 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
This commit is contained in:
Viktor Szakats
2012-11-10 14:16:36 +00:00
parent 168c86cf98
commit 7e9902a67e
9 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -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

8
harbour/config/postinst.hb
View File

@@ -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

2
harbour/contrib/hbwin/hbolesrv.c
View File

@@ -843,7 +843,7 @@ BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, PVOID pvReserved )
return fResult;
}
/* WIN_OleServerInit( <cClassID>, <cServerName>, ;
/* win_oleServerInit( <cClassID>, <cServerName>, ;
* [ <hAction> | <oAction> | <bAction> | <sAction> ], ;
* [ <lHashClone> | <lAcceptAll> ] )
*/

2
harbour/contrib/hbwin/hbwin.hbx
View File

@@ -5,7 +5,7 @@
* // HB_FUNC_EXCLUDE <func>
*/
// HB_FUNC_EXCLUDE WIN_OLESERVERINIT
// HB_FUNC_EXCLUDE win_oleServerInit
/* --------------------------------------------------------------------
* WARNING: Automatically generated code below. DO NOT EDIT!

8
harbour/contrib/hbwin/tests/olesrv1.prg
View File

@@ -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( <cClassID>, <cServerName>, ;
* win_oleServerInit( <cClassID>, <cServerName>, ;
* [ <hAction> | <oAction> | <bAction> | <sAction> ], ;
* [ <lHashClone> | <lAcceptAll> ] ) -> <lServerActive>
*
@@ -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

4
harbour/contrib/hbwin/tests/olesrv2.prg
View File

@@ -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

4
harbour/contrib/hbwin/tests/olesrv3.prg
View File

@@ -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

2
harbour/contrib/hbwin/tests/olesrv4.prg
View File

@@ -21,7 +21,7 @@
PROCEDURE DllMain()
WIN_OleServerInit( CLS_ID, CLS_Name, OleObjServer():new() )
win_oleServerInit( CLS_ID, CLS_Name, OleObjServer():new() )
RETURN

8
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -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