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

2006-07-27 01:18 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu)

Browse Source 
* harbour/source/rtl/dbedit.prg
     ! Previous non-strict compatible part made fully compatible by
       dropping an Eval() on the field value block. Strict branch
       and NOTE removed.
This commit is contained in:
Viktor Szakats
2006-07-26 23:23:42 +00:00
parent cb87fbf546
commit faea7efcd0
2 changed files with 9 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -8,6 +8,12 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2006-07-27 01:18 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu)
* harbour/source/rtl/dbedit.prg
! Previous non-strict compatible part made fully compatible by
dropping an Eval() on the field value block. Strict branch
and NOTE removed.
2006-07-26 22:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbapi.h
* harbour/include/hbexpra.c

42
harbour/source/rtl/dbedit.prg
View File

@@ -50,8 +50,6 @@
*
*/
#include "hbsetup.ch"
#include "common.ch"
#include "dbedit.ch"
#include "inkey.ch"
@@ -164,34 +162,6 @@ FUNCTION dbEdit(;
cBlock := FieldName( nPos )
cHeading := cBlock
ENDIF
#ifdef HB_C52_STRICT
IF Type( cBlock ) == "M"
bBlock := {|| " <Memo> " }
ELSEIF "->" $ cBlock
IF Upper( cAlias ) == "M"
bBlock := MemvarBlock( cBlock )
ELSEIF Upper( cAlias ) == "FIELD"
bBlock := FieldWBlock( cFieldName, Select() )
ELSE
bBlock := FieldWBlock( cFieldName, Select( cAlias ) )
ENDIF
ELSEIF !Empty( FieldPos( cBlock ) )
bBlock := FieldWBlock( cBlock, Select() )
ELSE
bBlock := NIL
ENDIF
IF bBlock == NIL
bBlock := &( "{||" + cBlock + "}" )
ENDIF
#else
/* Simplified logic compared to CA-Cl*pper. In the latter there
is logic to detect several typical cBlock types (memvar,
@@ -200,17 +170,11 @@ FUNCTION dbEdit(;
simple macro compilation will result in faster code for all
situations. As Maurilio Longo has pointed, there is no point in
creating codeblocks which are able to _assign_ values, as dbEdit()
is actually a read-only function. [vszakats] */
is a read-only function. [vszakats] */
bBlock := &( "{||" + cBlock + "}" )
bBlock := iif( Type( cBlock ) == "M", {|| " <Memo> " }, &( "{||" + cBlock + "}" ) )
/* NOTE: There is an extra Eval() here compared to CA-Cl*pper. */
IF ISMEMO( Eval( bBlock ) )
bBlock := {|| " <Memo> " }
ENDIF
#endif
/* ; */
IF ISARRAY( xColumnHeaders ) .AND. Len( xColumnHeaders ) >= nPos .AND. ISCHARACTER( xColumnHeaders[ nPos ] )
cHeading := xColumnHeaders[ nPos ]