diff --git a/ChangeLog.txt b/ChangeLog.txt index 041de32c6b..fce287d7c0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2016-01-09 20:09 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * contrib/hbfoxpro/hbfoxpro.hbp + * contrib/hbfoxpro/hbfoxpro.hbx + + contrib/hbfoxpro/relfunc.c + + added FoxPro compatible functions: + Between( , , ) -> + InList( , [, ] ) -> + 2016-01-09 03:16 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/vm/hvm.c + allow to compare symbol items with == operator, i.e.: diff --git a/contrib/hbfoxpro/hbfoxpro.hbp b/contrib/hbfoxpro/hbfoxpro.hbp index ce36120d53..3181163d9b 100644 --- a/contrib/hbfoxpro/hbfoxpro.hbp +++ b/contrib/hbfoxpro/hbfoxpro.hbp @@ -13,3 +13,4 @@ occurs.prg dbfunc.c miscfunc.c +relfunc.c diff --git a/contrib/hbfoxpro/hbfoxpro.hbx b/contrib/hbfoxpro/hbfoxpro.hbx index 8b29644ced..60729fa565 100644 --- a/contrib/hbfoxpro/hbfoxpro.hbx +++ b/contrib/hbfoxpro/hbfoxpro.hbx @@ -22,11 +22,13 @@ #endif DYNAMIC AElement +DYNAMIC Between DYNAMIC Filter DYNAMIC fox_At DYNAMIC fox___DynCall DYNAMIC FSize DYNAMIC Id +DYNAMIC InList DYNAMIC InsMode DYNAMIC Key DYNAMIC LineNo diff --git a/contrib/hbfoxpro/relfunc.c b/contrib/hbfoxpro/relfunc.c new file mode 100644 index 0000000000..2c0290cd71 --- /dev/null +++ b/contrib/hbfoxpro/relfunc.c @@ -0,0 +1,87 @@ +/* + * Harbour Project source code: + * FoxPro compatible functions BETWEEN(), INLIST() + * + * Copyright 2016 Przemyslaw Czerpak + * www - http://harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING.txt. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#include "hbapi.h" +#include "hbapiitm.h" + +HB_FUNC( BETWEEN ) +{ + HB_BOOL fResult = HB_FALSE; + if( hb_pcount() == 3 ) + { + PHB_ITEM pItem = hb_param( 1, HB_IT_ANY ); + int iResult1, iResult2; + + if( hb_itemCompare( pItem, hb_param( 1, HB_IT_ANY ), HB_FALSE, &iResult1 ) && + hb_itemCompare( pItem, hb_param( 2, HB_IT_ANY ), HB_FALSE, &iResult2 ) ) + fResult = iResult1 >= 0 && iResult2 <= 0; + } + hb_retl( fResult ); +} + +HB_FUNC( INLIST ) +{ + HB_BOOL fResult = HB_FALSE; + int iPCount = hb_pcount(); + + if( iPCount > 1 ) + { + PHB_ITEM pValue = hb_param( 1, HB_IT_ANY ); + int iParam; + + for( iParam = 2; iParam < iPCount; ++iParam ) + { + if( hb_itemEqual( pValue, hb_param( iParam, HB_IT_ANY ) ) ) + { + fResult = HB_TRUE; + break; + } + } + } + hb_retl( fResult ); +}