Hi Przemek,
attached the new version and test program I used to check it.
I hope now it is right.
best regards
Francesco
Francesco Saverio Giudice ha scritto:
Hi Przemek,
yes, my fault.
I will fix it in a while.
best regards
Francesco
Index: include/hbset.h
===================================================================
--- include/hbset.h (revision 9514)
+++ include/hbset.h (working copy)
@@ -254,6 +254,7 @@
extern HB_EXPORT HB_FHANDLE hb_setGetAltHan( void );
extern HB_EXPORT BOOL hb_setGetCentury( void );
+extern HB_EXPORT BOOL hb_setSetCentury( BOOL );
extern HB_EXPORT HB_FHANDLE hb_setGetExtraHan( void );
extern HB_EXPORT HB_FHANDLE hb_setGetPrintHan( void );
extern HB_EXPORT BOOL hb_setGetAlternate( void );
Index: source/vm/set.c
===================================================================
--- source/vm/set.c (revision 9514)
+++ source/vm/set.c (working copy)
@@ -200,7 +200,7 @@
if( pFilename->szName )
{
int iLen = ( int ) strlen( pFilename->szName );
- if( ( iLen == 3 &&
+ if( ( iLen == 3 &&
( hb_stricmp( pFilename->szName, "PRN" ) == 0 ||
hb_stricmp( pFilename->szName, "CON" ) == 0 ) ) ||
( iLen == 4 &&
@@ -301,34 +301,13 @@
hb_setSetItem( HB_SET_CANCEL, hb_param( 1, HB_IT_LOGICAL ) );
}
-HB_FUNC( __SETCENTURY )
+HB_EXPORT BOOL hb_setSetCentury( BOOL new_century_setting )
{
PHB_SET_STRUCT pSet = hb_stackSetStruct();
BOOL old_century_setting = pSet->hb_set_century;
+ pSet->hb_set_century = new_century_setting;
/*
- * Change the setting if the parameter is a logical value, or is
- * either "ON" or "OFF" (regardless of case)
- */
- if( ISLOG( 1 ) )
- pSet->hb_set_century = hb_parl( 1 );
- else if( ISCHAR( 1 ) )
- {
- char * szString = hb_parc( 1 );
- ULONG ulLen = hb_parclen( 1 );
-
- if( ulLen >= 2
- && toupper( ( UCHAR ) szString[ 0 ] ) == 'O'
- && toupper( ( UCHAR ) szString[ 1 ] ) == 'N' )
- pSet->hb_set_century = TRUE;
- else if( ulLen >= 3
- && toupper( ( UCHAR ) szString[ 0 ] ) == 'O'
- && toupper( ( UCHAR ) szString[ 1 ] ) == 'F'
- && toupper( ( UCHAR ) szString[ 2 ] ) == 'F' )
- pSet->hb_set_century = FALSE;
- }
-
- /*
* Finally, if the setting changed, adjust the current date format to use
* the correct number of year digits.
*/
@@ -391,9 +370,61 @@
}
/* Return the previous setting */
- hb_retl( old_century_setting );
+ return ( old_century_setting ) ;
}
+HB_FUNC( __SETCENTURY )
+{
+ BOOL new_century_setting;
+ BOOL set_new_value = FALSE;
+
+ /*
+ * Change the setting if the parameter is a logical value, or is
+ * either "ON" or "OFF" (regardless of case)
+ */
+ if( ISLOG( 1 ) )
+ {
+ new_century_setting = hb_parl( 1 );
+ set_new_value = TRUE;
+ }
+ else if( ISCHAR( 1 ) )
+ {
+ char * szString = hb_parc( 1 );
+ ULONG ulLen = hb_parclen( 1 );
+
+ if( ulLen >= 2
+ && toupper( ( UCHAR ) szString[ 0 ] ) == 'O'
+ && toupper( ( UCHAR ) szString[ 1 ] ) == 'N' )
+ {
+ new_century_setting = TRUE;
+ set_new_value = TRUE;
+ }
+ else if( ulLen >= 3
+ && toupper( ( UCHAR ) szString[ 0 ] ) == 'O'
+ && toupper( ( UCHAR ) szString[ 1 ] ) == 'F'
+ && toupper( ( UCHAR ) szString[ 2 ] ) == 'F' )
+ {
+ new_century_setting = FALSE;
+ set_new_value = TRUE;
+ }
+ }
+
+ /* in case of parameters error or missing */
+ if ( !set_new_value )
+ {
+ /* get current value so I can return it */
+ PHB_SET_STRUCT pSet = hb_stackSetStruct();
+
+ /* do nothing and return current century set */
+ hb_retl( pSet->hb_set_century );
+ }
+ else
+ {
+ /* call C level function to set century */
+ hb_retl( hb_setSetCentury( new_century_setting ) );
+ }
+}
+
HB_FUNC( SET )
{
PHB_SET_STRUCT pSet = hb_stackSetStruct();
@@ -958,7 +989,7 @@
/* Return NIL if called with invalid SET specifier */
break;
-#if 0
+#if 0
/*
* intentionally removed default: clause to enable C compiler warning
* when not all HB_SET_* cases are implemented. [druzus]
@@ -1516,7 +1547,7 @@
case HB_SET_HBOUTLOGINFO:
case HB_SET_INVALID_:
break;
-#if 0
+#if 0
/*
* intentionally removed default: clause to enable C compiler warning
* when not all HB_SET_* cases are implemented. [druzus]
@@ -1634,7 +1665,7 @@
case HB_SET_HBOUTLOGINFO:
case HB_SET_INVALID_:
break;
-#if 0
+#if 0
/*
* intentionally removed default: clause to enable C compiler warning
* when not all HB_SET_* cases are implemented. [druzus]
@@ -1733,7 +1764,7 @@
case HB_SET_TRIMFILENAME:
case HB_SET_INVALID_:
break;
-#if 0
+#if 0
/*
* intentionally removed default: clause to enable C compiler warning
* when not all HB_SET_* cases are implemented. [druzus]
@@ -1832,7 +1863,7 @@
case HB_SET_HBOUTLOGINFO:
case HB_SET_INVALID_:
break;
-#if 0
+#if 0
/*
* intentionally removed default: clause to enable C compiler warning
* when not all HB_SET_* cases are implemented. [druzus]
PROCEDURE Main()
LOCAL lCentury
// Get current Century
lCentury = __SETCENTURY()
? "Get Century = ", __SETCENTURY()
? "Set Century .T. , Old = ", __SETCENTURY( .T. )
? "Set Century .F. , Old = ", __SETCENTURY( .F. )
? "Set Century ON , Old = ", __SETCENTURY( "ON" )
? "Set Century OFF , Old = ", __SETCENTURY( "OFF" )
? "Set Century NIL , Old = ", __SETCENTURY( NIL )
? "Set Century 1 , Old = ", __SETCENTURY( 1 )
? "Set Century '' , Old = ", __SETCENTURY( "" )
? "Set Century 'ERR', Old = ", __SETCENTURY( "ERR" )
? "Get Century = ", __SETCENTURY()
?
TEST_CENTURY()
RETURN
#pragma BEGINDUMP
#include "hbapi.h"
#include "hbset.h"
HB_FUNC( TEST_CENTURY )
{
BOOL bCentury;
bCentury = hb_setGetCentury();
printf( "Century = %i\n\r", bCentury );
bCentury = hb_setSetCentury( TRUE );
printf( "Century = %i\n\r", bCentury );
bCentury = hb_setSetCentury( FALSE );
printf( "Century = %i\n\r", bCentury );
}
#pragma ENDDUMP
_______________________________________________
Harbour mailing list
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
