bf68197ca0
* harbour/ChangeLog
* harbour/harbour.spec
* reverted translation to UTF8 - Tomaz please check your editor
settings and disable automatic translation to UTF8. It's not
the first as such situation happens.
* harbour/include/hbclass.ch
+ added two missing PP directives
! protected against some repeated external definitions
* harbour/source/pp/Makefile
* harbour/source/pp/hbppgen.c
* harbour/source/pp/ppcore.c
* harbour/source/common/hbver.c
* harbour/source/common/hbverdsp.c
* harbour/source/main/harbour.c
* harbour/source/vm/cmdarg.c
* harbour/utils/hbpp/hbpp.c
* harbour/include/hbpp.h
* harbour/include/hbcomp.h
* harbour/include/hbver.h
* harbour/include/hbapi.h
* harbour/make_vcce.mak
* harbour/make_b32.mak
* harbour/make_vc.mak
* harbour/make_gcc.mak
+ added support for dynamically set during compilation ChangeLog entry
ChangeLog ID and SVN revision and compilation flags
Now hbppgen creates in include directory hbverbld.h file with
information extracted from ChangeLog. New hbppgen parameters:
Syntax: ./hbppgen <file>[.prg] [options]
Options: -i<path> add #include file search path
-c[<file>] look for ChangeLog file
-o<file> creates .c file with PP rules
-v<file> creates .h file with version information
-w write preprocessed (.ppo) input file
-q disable information messages
+ added new C functions:
int hb_verSvnID( void )
- retrieves ChangeLog SVN revision number
const char * hb_verSvnChangeLogID( void )
- retrieves a static buffer containing ChangeLog ID string
const char * hb_verSvnLastEntry( void )
- retrieves a static buffer containing ChangeLog last entry string
const char * hb_verFlagsC( void )
- retrieves a static buffer containing build time C compiler
flags in C_USR envvar
const char * hb_verFlagsL( void )
- retrieves a static buffer containing build time linker
flags in L_USR envvar
const char * hb_verFlagsPRG( void )
- retrieves a static buffer containing build time Harbour compiler
flags in PRG_USR envvar
+ added new default PP defines which can be used in .prg code compiled
by Harbour compiler: HB_VER_LENTRY, HB_VER_CHLID, HB_VER_SVNID
* harbour/source/rtl/gtxwc/gtxwc.c
* formatting
* harbour/source/rtl/gttrm/gttrm.c
! fixed redrawing GPM mouse pointer after screen updating
* harbour/source/rtl/gtstd/gtstd.c
* harbour/source/rtl/gtpca/gtpca.c
* updated for compilation even if some POSIX macros are not supported
f.e. problems with some DJGPP versions reported recently
* harbour/source/debug/dbgentry.c
* harbour/source/debug/dbgtobj.prg
* harbour/source/debug/dbgbrwsr.prg
* harbour/source/debug/dbgthsh.prg
* harbour/source/debug/tbrwtext.prg
* harbour/source/debug/dbgwa.prg
* harbour/source/debug/debugger.prg
* harbour/source/debug/dbghelp.prg
* harbour/source/debug/dbgtarr.prg
! Fixed object inspector in the debugger.
! Added HbDbBrowser:invalidate() message. Fixes work area browsing in debugger.
! Added an minimalistic TBrowse implementation that is just enough
for internal use by the debugger. Fixes miscellaneous problems e.g.
when debugging a piece of code with RELATIONs turned on.
Fixes by Phil Krylov borrowed from xHarbour.
334 lines
11 KiB
Plaintext
334 lines
11 KiB
Plaintext
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* The Debugger Hash Inspector
|
|
*
|
|
* Copyright 2006 Francesco Saverio Giudice <info / at / fsgiudice / dot / com>
|
|
* www - http://www.xharbour.org
|
|
* www - http://www.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. 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 "hbclass.ch"
|
|
|
|
#include "common.ch"
|
|
#include "inkey.ch"
|
|
#include "setcurs.ch"
|
|
|
|
CREATE CLASS HBDbHash
|
|
|
|
VAR aWindows INIT {}
|
|
VAR TheHash
|
|
VAR hashName
|
|
VAR nCurWindow INIT 0
|
|
VAR lEditable
|
|
|
|
METHOD New( hHash, cVarName, lEditable )
|
|
|
|
METHOD addWindows( hHash, nRow )
|
|
METHOD doGet( oBrowse, pItem, nSet )
|
|
METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, hHash )
|
|
|
|
ENDCLASS
|
|
|
|
METHOD New( hHash, cVarName, lEditable ) CLASS HBDbHash
|
|
|
|
DEFAULT lEditable TO .T.
|
|
|
|
::hashName := cVarName
|
|
::TheHash := hHash
|
|
::lEditable := lEditable
|
|
|
|
::addWindows( ::TheHash )
|
|
|
|
RETURN Self
|
|
|
|
METHOD addWindows( hHash, nRow ) CLASS HBDbHash
|
|
LOCAL oBrwSets
|
|
LOCAL nSize := Len( hHash )
|
|
LOCAL oWndSets
|
|
LOCAL nWidth
|
|
LOCAL nColWidth
|
|
LOCAL oCol
|
|
LOCAL nKeyLen
|
|
|
|
IF nSize < MaxRow() - 2
|
|
IF nRow != NIL
|
|
oWndSets := HBDbWindow():New( GetTopPos( nRow ), 5, getBottomPos( nRow + nSize + 1 ), MaxCol() - 5, ::hashName + "[1.." + LTrim( Str( nSize, 6 ) ) + "]", "N/W" )
|
|
ELSE
|
|
oWndSets := HBDbWindow():New( 1, 5, 2 + nSize, MaxCol() - 5, ::hashName + "[1.." + LTrim( Str( nSize, 6 ) ) + "]", "N/W" )
|
|
ENDIF
|
|
ELSE
|
|
oWndSets := HBDbWindow():New( 1, 5, MaxRow() - 2, MaxCol() - 5, ::hashName + "[1.." + LTrim( Str( nSize, 6 ) ) + "]", "N/W" )
|
|
ENDIF
|
|
::nCurWindow++
|
|
oWndSets:lFocused := .T.
|
|
AAdd( ::aWindows, oWndSets )
|
|
|
|
nWidth := oWndSets:nRight - oWndSets:nLeft - 1
|
|
oBrwSets := HBDbBrowser():New( oWndSets:nTop + 1, oWndSets:nLeft + 1, oWndSets:nBottom - 1, oWndSets:nRight - 1 )
|
|
oBrwSets:autolite := .F.
|
|
oBrwSets:ColorSpec := __Dbg():ClrModal()
|
|
oBrwSets:Cargo := { 1, {} } // Actual highligthed row
|
|
AAdd( oBrwSets:Cargo[ 2 ], hHash )
|
|
|
|
oBrwSets:AddColumn( oCol := TBColumnNew( "", { || ::hashName + "[" + HashKeyString( hHash, oBrwSets:cargo[ 1 ] ) + "]" } ) )
|
|
|
|
// calculate max key length
|
|
nKeyLen := 0
|
|
hb_HEval( hHash, {| k, v, p | HB_SYMBOL_UNUSED( k ), HB_SYMBOL_UNUSED( v ), nKeyLen := Max( nKeyLen, Len( ::hashName + "[" + HashKeyString( hHash, p ) + "]" ) ) } )
|
|
oCol:width := nKeyLen
|
|
oCol:DefColor := { 1, 2 }
|
|
nColWidth := oCol:Width
|
|
|
|
oBrwSets:AddColumn( oCol := TBColumnNew( "" ,{ || PadR( __dbgValToStr( hb_HValueAt( hHash, oBrwSets:cargo[ 1 ] ) ), nWidth - nColWidth - 1 ) } ) )
|
|
|
|
/* 09/08/2004 - <maurilio.longo@libero.it>
|
|
Setting a fixed width like it is done in the next line of code wich I've
|
|
commented exploits a bug of current tbrowse, that is, if every column is
|
|
narrower than tbrowse but the sum of them is wider tbrowse paints
|
|
one above the other if code like the one inside RefreshVarsS() is called.
|
|
(That code is used to have current row fully highlighted and not only
|
|
current cell). Reproducing this situation on a smaller sample with
|
|
clipper causes that only column two is visible after first stabilization.
|
|
|
|
I think tbrowse should trim columns up until the point where at leat
|
|
two are visible in the same moment, I leave this fix to tbrowse for
|
|
the reader ;)
|
|
oCol:width := 50
|
|
*/
|
|
|
|
oCol:DefColor:= { 1, 3 }
|
|
|
|
oBrwSets:goTopBlock := { || oBrwSets:cargo[ 1 ] := 1 }
|
|
oBrwSets:goBottomBlock := { || oBrwSets:cargo[ 1 ] := Len( oBrwSets:cargo[ 2 ][ 1 ] ) }
|
|
oBrwSets:skipBlock := { |nPos| ( nPos := HashBrowseSkip(nPos, oBrwSets), oBrwSets:cargo[ 1 ] := ;
|
|
oBrwSets:cargo[ 1 ] + nPos, nPos ) }
|
|
|
|
::aWindows[ ::nCurWindow ]:bPainted := { || ( oBrwSets:forcestable(), RefreshVarsS( oBrwSets ) ) }
|
|
::aWindows[ ::nCurWindow ]:bKeyPressed := { | nKey | ::SetsKeyPressed( nKey, oBrwSets,;
|
|
::aWindows[ ::nCurWindow ],::hashName, hHash ) }
|
|
|
|
SetCursor( SC_NONE )
|
|
|
|
::aWindows[ ::nCurWindow ]:ShowModal()
|
|
|
|
RETURN Self
|
|
|
|
METHOD doGet( oBrowse, pItem, nSet ) CLASS HBDbHash
|
|
|
|
#ifndef HB_NO_READDBG
|
|
|
|
LOCAL nKey
|
|
LOCAL GetList := {}
|
|
LOCAL lScoreSave := Set( _SET_SCOREBOARD, .F. )
|
|
LOCAL lExitSave := Set( _SET_EXIT, .T. )
|
|
LOCAL bInsSave := SetKey( K_INS )
|
|
LOCAL cValue := PadR( __dbgValToStr( HB_HValueAt( pItem, nSet ) ),;
|
|
oBrowse:nRight - oBrowse:nLeft - oBrowse:GetColumn( 1 ):width )
|
|
|
|
// make sure browse is stable
|
|
oBrowse:forceStable()
|
|
// if confirming new record, append blank
|
|
|
|
// set insert key to toggle insert mode and cursor
|
|
SetKey( K_INS, { || SetCursor( iif( ReadInsert( ! ReadInsert() ),;
|
|
SC_NORMAL, SC_INSERT ) ) } )
|
|
|
|
// initial cursor setting
|
|
SetCursor( iif( ReadInsert(), SC_INSERT, SC_NORMAL ) )
|
|
|
|
// create a corresponding GET
|
|
@ Row(), oBrowse:nLeft + oBrowse:GetColumn( 1 ):width + 1 GET cValue ;
|
|
VALID iif( Type( cValue ) == "UE", ( Alert( "Expression error" ), .F. ), .T. )
|
|
|
|
READ
|
|
|
|
IF LastKey() == K_ENTER
|
|
HB_HValueAt( pItem, nSet, &cValue )
|
|
ENDIF
|
|
|
|
SetCursor( SC_NONE )
|
|
Set( _SET_SCOREBOARD, lScoreSave )
|
|
Set( _SET_EXIT, lExitSave )
|
|
SetKey( K_INS, bInsSave )
|
|
|
|
// check exit key from get
|
|
nKey := LastKey()
|
|
IF nKey == K_UP .OR. nKey == K_DOWN .OR. nKey == K_PGUP .OR. nKey == K_PGDN
|
|
KEYBOARD Chr( nKey )
|
|
ENDIF
|
|
|
|
#else
|
|
|
|
HB_SYMBOL_UNUSED( oBrowse )
|
|
HB_SYMBOL_UNUSED( pItem )
|
|
HB_SYMBOL_UNUSED( nSet )
|
|
|
|
#endif
|
|
|
|
RETURN NIL
|
|
|
|
METHOD SetsKeyPressed( nKey, oBrwSets, oWnd, cName, hHash ) CLASS HBDbHash
|
|
|
|
LOCAL nSet := oBrwSets:cargo[ 1 ]
|
|
LOCAL cOldname := ::hashName
|
|
LOCAL uValue
|
|
|
|
DO CASE
|
|
CASE nKey == K_UP
|
|
oBrwSets:Up()
|
|
|
|
CASE nKey == K_DOWN
|
|
oBrwSets:Down()
|
|
|
|
CASE nKey == K_HOME .OR. nKey == K_CTRL_PGUP .OR. nKey == K_CTRL_HOME
|
|
oBrwSets:GoTop()
|
|
|
|
CASE nKey == K_END .OR. nKey == K_CTRL_PGDN .OR. nKey == K_CTRL_END
|
|
oBrwSets:GoBottom()
|
|
|
|
CASE nKey == K_PGDN
|
|
oBrwSets:pageDown()
|
|
|
|
CASE nKey == K_PGUP
|
|
oBrwSets:PageUp()
|
|
|
|
CASE nKey == K_ENTER
|
|
|
|
uValue := HB_HValueAt( hHash, nSet )
|
|
|
|
IF ValType( uValue ) == "H"
|
|
|
|
IF Len( uValue ) == 0
|
|
Alert( "Hash is empty" )
|
|
ELSE
|
|
SetPos( ownd:nBottom, ownd:nLeft )
|
|
::aWindows[ ::nCurwindow ]:lFocused := .F.
|
|
|
|
::hashName:= ::hashName + "[" + HashKeyString( hHash, nSet ) + "]"
|
|
::AddWindows( HB_HValueAt( hHash, nSet ), oBrwSets:RowPos + oBrwSets:nTop )
|
|
::hashName := cOldName
|
|
|
|
ADel( ::aWindows, ::nCurWindow )
|
|
ASize( ::awindows, Len( ::awindows ) - 1 )
|
|
IF ::nCurwindow == 0
|
|
::nCurwindow := 1
|
|
ELSE
|
|
::nCurwindow--
|
|
ENDIF
|
|
ENDIF
|
|
ELSEIF ISBLOCK( uValue ) .OR. ValType( uValue ) == "P"
|
|
Alert( "Value cannot be edited" )
|
|
ELSE
|
|
IF ::lEditable
|
|
oBrwSets:RefreshCurrent()
|
|
IF ISOBJECT( uValue )
|
|
__DbgObject( uValue, cName + "[" + HashKeyString( hHash, nSet ) + "]" )
|
|
ELSEIF ISARRAY( uValue )
|
|
__DbgArrays( uValue, cName + "[" + HashKeyString( hHash, nSet ) + "]" )
|
|
ELSE
|
|
::doGet( oBrwSets, hHash, nSet )
|
|
ENDIF
|
|
oBrwSets:RefreshCurrent()
|
|
oBrwSets:ForceStable()
|
|
ELSE
|
|
Alert( "Value cannot be edited" )
|
|
ENDIF
|
|
ENDIF
|
|
|
|
ENDCASE
|
|
|
|
RefreshVarsS( oBrwSets )
|
|
|
|
::aWindows[ ::nCurwindow ]:SetCaption( cName + "[" + LTrim( Str( oBrwSets:cargo[ 1 ] ) ) + ".." + ;
|
|
LTrim( Str( Len( hHash ) ) ) + "]" )
|
|
|
|
RETURN self
|
|
|
|
FUNCTION __dbgHashes( hHash, cVarName, lEditable )
|
|
RETURN HBDbHash():New( hHash, cVarName, lEditable )
|
|
|
|
STATIC FUNCTION GetTopPos( nPos )
|
|
RETURN iif( ( MaxRow() - nPos ) < 5, MaxRow() - nPos, nPos )
|
|
|
|
STATIC FUNCTION GetBottomPos( nPos )
|
|
RETURN iif( nPos < MaxRow() - 2, nPos, MaxRow()-2 )
|
|
|
|
STATIC PROCEDURE RefreshVarsS( oBrowse )
|
|
|
|
LOCAL nLen := oBrowse:colCount
|
|
|
|
IF nLen == 2
|
|
oBrowse:deHilite():colPos := 2
|
|
ENDIF
|
|
oBrowse:deHilite():forceStable()
|
|
|
|
IF nLen == 2
|
|
oBrowse:hilite():colPos := 1
|
|
ENDIF
|
|
oBrowse:hilite()
|
|
|
|
RETURN
|
|
|
|
STATIC FUNCTION HashBrowseSkip( nPos, oBrwSets )
|
|
RETURN iif( oBrwSets:cargo[ 1 ] + nPos < 1, 0 - oBrwSets:cargo[ 1 ] + 1 , ;
|
|
iif( oBrwSets:cargo[ 1 ] + nPos > Len( oBrwSets:cargo[ 2 ][ 1 ] ), ;
|
|
Len( oBrwSets:cargo[ 2 ][ 1 ] ) - oBrwSets:cargo[ 1 ], nPos ) )
|
|
|
|
STATIC FUNCTION HashKeyString( hHash, nAt )
|
|
|
|
LOCAL xVal := HB_HKeyAt( hHash, nAt )
|
|
LOCAL cType := ValType( xVal )
|
|
|
|
DO CASE
|
|
CASE cType == "C" ; RETURN '"' + xVal + '"'
|
|
CASE cType == "D" ; RETURN '"' + DToC( xVal ) + '"'
|
|
CASE cType == "N" ; RETURN LTrim( Str( xVal ) )
|
|
ENDCASE
|
|
|
|
RETURN AllTrim( HB_CStr( xVal ) )
|