X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGBase.java b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGBase.java
index f814943..56fa8d1 100644
--- a/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGBase.java
+++ b/net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGBase.java
@@ -15,44 +15,48 @@ public class PHPDBGBase {
 	// Constants
 	// php-engine commands/events
 	public static final int DBGC_REPLY			= 0x0000;				// reply to previous DBGA_REQUEST request
-	public static final int DBGC_STARTUP		= 0x0001;				// script startup
-	public static final int DBGC_END			= 0x0002;				// script done
+	public static final int DBGC_STARTUP			= 0x0001;				// script startup
+	public static final int DBGC_END				= 0x0002;				// script done
 	public static final int DBGC_BREAKPOINT		= 0x0003;				// user definded breakpoint occured
 	public static final int DBGC_STEPINTO_DONE	= 0x0004;				// step to the next statement is completed
 	public static final int DBGC_STEPOVER_DONE	= 0x0005;				// step to the next statement is completed
-	public static final int DBGC_STEPOUT_DONE	= 0x0006;				// step to the next statement is completed
+	public static final int DBGC_STEPOUT_DONE		= 0x0006;				// step to the next statement is completed
 	public static final int DBGC_EMBEDDED_BREAK	= 0x0007;				// breakpoint caused by DebugBreak() function
 	public static final int DBGC_ERROR			= 0x0010;				// error occured
-	public static final int DBGC_LOG			= 0x0011;				// logging support
-	public static final int DBGC_SID			= 0x0012;				// send SID
+	public static final int DBGC_LOG				= 0x0011;				// logging support
+	public static final int DBGC_SID				= 0x0012;				// send SID
 	public static final int DBGC_PAUSE			= 0x0013;				// pause current session as soon as possible
 
-	public static final char[] DBGA_CONTINUE	= IntToChar4(0x8001);	// php should continue run
-	public static final char[] DBGA_STOP		= IntToChar4(0x8002);
-	public static final char[] DBGA_STEPINTO	= IntToChar4(0x8003);
-	public static final char[] DBGA_STEPOVER	= IntToChar4(0x8004);
+	public static final char[] DBGA_CONTINUE		= IntToChar4(0x8001);	// php should continue run
+	public static final char[] DBGA_STOP			= IntToChar4(0x8002);
+	public static final char[] DBGA_STEPINTO		= IntToChar4(0x8003);
+	public static final char[] DBGA_STEPOVER		= IntToChar4(0x8004);
 	public static final char[] DBGA_STEPOUT		= IntToChar4(0x8005);
 	public static final char[] DBGA_IGNORE		= IntToChar4(0x8006);
 	public static final char[] DBGA_REQUEST		= IntToChar4(0x8010);	// debugger client requests some information from PHP engine
 
 	public static final int FRAME_STACK			= 100000;				// "call:stack" - e.g. backtrace
-	public static final int FRAME_SOURCE		= 100100;				// source text
+	public static final int FRAME_SOURCE			= 100100;				// source text
 	public static final int FRAME_SRC_TREE		= 100200;				// tree of source files
-	public static final int FRAME_RAWDATA		= 100300;				// raw data or string
+	public static final int FRAME_RAWDATA			= 100300;				// raw data or string
 	public static final int FRAME_ERROR			= 100400;				// error notification
 	public static final int FRAME_EVAL			= 100500;				// evaluating/watching
-	public static final int FRAME_BPS			= 100600;				// set/remove breakpoint
-	public static final int FRAME_BPL			= 100700;				// breakpoint(s) request = get the list
-	public static final int FRAME_VER			= 100800;				// version request
-	public static final int FRAME_SID			= 100900;				// session id info
+	public static final int FRAME_BPS				= 100600;				// set/remove breakpoint
+	public static final int FRAME_BPL				= 100700;				// breakpoint(s) request = get the list
+	public static final int FRAME_VER				= 100800;				// version request
+	public static final int FRAME_SID				= 100900;				// session id info
 	public static final int FRAME_SRCLINESINFO	= 101000;				// source lines info
-	public static final int FRAME_SRCCTXINFO	= 101100;				// source contexts info
-	public static final int FRAME_LOG			= 101200;				// logging
+	public static final int FRAME_SRCCTXINFO		= 101100;				// source contexts info
+	public static final int FRAME_LOG				= 101200;				// logging
 	public static final int FRAME_PROF			= 101300;				// profiler
-	public static final int FRAME_PROF_C		= 101400;				// profiler counter/accuracy
-	public static final int FRAME_SET_OPT		= 101500;				// set/update options
+	public static final int FRAME_PROF_C			= 101400;				// profiler counter/accuracy
+	public static final int FRAME_SET_OPT			= 101500;				// set/update options
 
-	public static final char[] DBGSYNC 			= { 0, 0, (char) 89, (char) 83};	// DBG syncronization chars
+	public static final int CURLOC_SCOPE_ID 		= 1; 					// nested locations are 2,3... and so on in backward order,
+																			//  so 2 represents most out-standing stack context
+	public static final int GLOBAL_SCOPE_ID 		= -1; 					// it is global context, not stacked
+
+	public static final char[] DBGSYNC 			= { 0, 0, (char) 89, (char) 83 };	// DBG syncronization chars
 
 	// Session Types
 	public static final int DBG_COMPAT			= 0x0001;
@@ -61,21 +65,21 @@ public class PHPDBGBase {
 	public static final int DBG_EMB				= 0x0004;
 
 	public static final int BPS_DELETED			= 0;
-	public static final int BPS_DISABLED		= 1;
+	public static final int BPS_DISABLED			= 1;
 	public static final int BPS_ENABLED			= 2;
 	public static final int BPS_UNRESOLVED		= 0x100;
 
 	public static final int E_ERROR				= (1<<0L);
-	public static final int E_WARNING			= (1<<1L);
+	public static final int E_WARNING				= (1<<1L);
 	public static final int E_PARSE				= (1<<2L);
-	public static final int E_NOTICE			= (1<<3L);
-	public static final int E_CORE_ERROR		= (1<<4L);
+	public static final int E_NOTICE				= (1<<3L);
+	public static final int E_CORE_ERROR			= (1<<4L);
 	public static final int E_CORE_WARNING		= (1<<5L);
 	public static final int E_COMPILE_ERROR		= (1<<6L);
-	public static final int E_COMPILE_WARNING	= (1<<7L);
-	public static final int E_USER_ERROR		= (1<<8L);
+	public static final int E_COMPILE_WARNING		= (1<<7L);
+	public static final int E_USER_ERROR			= (1<<8L);
 	public static final int E_USER_WARNING		= (1<<9L);
-	public static final int E_USER_NOTICE		= (1<<10L);
+	public static final int E_USER_NOTICE			= (1<<10L);
 
 	public PHPDBGBase() {
 	}
@@ -163,18 +167,18 @@ public class PHPDBGBase {
 	 * @return     The string which contains the bytes as strings.
 	 *             E.g.: (123) (11) (46) (213) ...
 	 */
-	public static String CharArrayToString (char[] cha) {
-		String ret = new String ();
-		int    i;
-		int    p;
-
-		for (i = 0; i < cha.length; i++) {							// For all bytes within the input buffer
-			p   = (int) cha[i];										// Convert the byte into an integer value
-			ret = ret + "(" + String.valueOf (p) + ") ";			// Add the value
-		}
-
-		return ret;
-	}
+//	public static String CharArrayToString (char[] cha) {
+//		String ret = new String ();
+//		int    i;
+//		int    p;
+//
+//		for (i = 0; i < cha.length; i++) {							// For all bytes within the input buffer
+//			p   = (int) cha[i];										// Convert the byte into an integer value
+//			ret = ret + "(" + String.valueOf (p) + ") ";			// Add the value
+//		}
+//
+//		return ret;
+//	}
 
 	/**
 	 *