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

locals are restored when returning from a function or proc

Browse Source
This commit is contained in:
Antonio Linares
2001-02-14 11:44:58 +00:00
parent 40695491c9
commit 85f036f8b2
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
harbour/source/debug/debugger.prg
View File

@@ -137,6 +137,7 @@ procedure __dbgEntry( uParam1, uParam2, uParam3 ) // debugger entry point
AAdd( s_oDebugger:aVars, { cLocalName, nLocalIndex, "Local", ProcName( 1 ) } )
endif
endif
AAdd( s_oDebugger:aCallStack[ 1 ][ 2 ], { cLocalName, nLocalIndex, "Local", ProcName( 1 ) } )
endif
if s_oDebugger:oBrwVars != nil
s_oDebugger:oBrwVars:RefreshAll()
@@ -198,8 +199,7 @@ CLASS TDebugger
METHOD New()
METHOD Activate( cModuleName )
METHOD All() INLINE ::lShowPublics := ::lShowPrivates := ::lShowStatics := ;
::lShowLocals := ::lAll := ! ::lAll, If( ::lAll, ::ShowVars(), ::HideVars() )
METHOD All()
METHOD Animate() INLINE ::lAnimate := .t., ::Step()
@@ -345,6 +345,15 @@ METHOD Activate( cModuleName ) CLASS TDebugger
return nil
METHOD All() CLASS TDebugger
::lShowPublics := ::lShowPrivates := ::lShowStatics := ;
::lShowLocals := ::lAll := ! ::lAll
If( ::lAll, ::ShowVars(), ::HideVars() )
return nil
METHOD BarDisplay() CLASS TDebugger
local cClrItem := __DbgColors()[ 8 ]
@@ -797,6 +806,8 @@ METHOD HandleEvent() CLASS TDebugger
case nKey == K_F5
::Go()
case nKey == K_F6
::ShowWorkAreas()
case nKey == K_F8 .or. nKey == 255
::Step()
@@ -954,7 +965,7 @@ METHOD ShowCallStack() CLASS TDebugger
n := iif( nSkip > 0, Min( Len( ::aCallStack ), n + nSkip ),;
Max( 1, n + nSkip ) ), n - nPos }
::oBrwStack:AddColumn( TBColumnNew( "", { || PadC( ::aCallStack[ n ], 14 ) } ) )
::oBrwStack:AddColumn( TBColumnNew( "", { || PadC( ::aCallStack[ n ][ 1 ], 14 ) } ) )
::oBrwStack:ForceStable()
::oWndStack:bPainted = { || ::oBrwStack:ColorSpec := __DbgColors()[ 2 ] + "," + ;
__DbgColors()[ 5 ] + "," + __DbgColors()[ 4 ],;
@@ -1028,6 +1039,12 @@ METHOD LoadVars() CLASS TDebugger // updates monitored variables
endif
endif
if ::lShowLocals
for n = 1 to Len( ::aCallStack[ 1 ][ 2 ] )
AAdd( ::aVars, ::aCallStack[ 1 ][ 2 ][ n ] )
next
endif
if ::lSortVars
::Sort()
endif
@@ -1160,11 +1177,7 @@ METHOD ShowCode( cModuleName ) CLASS TDebugger
ASize( ::aCallStack, Len( ::aCallStack ) + 1 )
AIns( ::aCallStack, 1 )
if Len( ::aCallStack ) == 1
::aCallStack[ 1 ] := ProcName( 3 ) // cFunction
else
::aCallStack[ 1 ] := ProcName( 2 ) // cFunction
endif
::aCallStack[ 1 ] = { cFunction, {} } // function name and locals array
if ::oWndStack != nil
::oBrwStack:RefreshAll()