app/src/gambas3/.src/Debug/Design.module

@@ -306,6 +306,7 @@ Public Sub Debug_Read(Data As String)
   Dim sError As String
   Dim sWhere As String
   Dim iPos As Integer
+  Dim sComp As String
 
   'Debug Quote(Data)
   $sBuffer &= Data
@@ -359,32 +360,39 @@ Public Sub Debug_Read(Data As String)
       Endif
     
       aPos = Split(Trim(aData[2]), " ")
+      While aPos.Count
+        If aPos.Last <> "?" Then Break
+        aPos.Remove(aPos.Max)
+      Wend
   
       For Each sPos In aPos
 
         If sPos = "?" Then Continue
-        aFrame = Scan(sPos, "*.*.*")
+        aFrame = Scan(sPos, "[[]*].*.*.*")
 
-        sClass = aFrame[0]
+        sComp = aFrame[0]
+        sClass = aFrame[1]
         iLine = 0
-        Try iLine = CInt(aFrame[2])
+        Try iLine = CInt(aFrame[3])
 
         If sClass Then
           iPos = RInStr(sClass, ":")
           If iPos Then sClass = Mid$(sClass, iPos + 1)
-          If Project.Exist(sClass) Then Break
+          If sComp = "$" And If iLine Then Break
           sClass = ""
         Endif
 
       Next
   
-      If iLine = 0 Then sClass = ""
+      'If iLine = 0 Then sClass = ""
       
       $sError = ""
+      
       If aData[1] Then 
         If sClass Then SetPosition(sClass, iLine)
       Else
         If Not sClass Or If SetPosition(sClass, iLine) Then 
+          If Not DebugInside Then
             If $bIgnoreNextInfo Then 
               $bIgnoreNextInfo = False
             Else
@@ -393,6 +401,7 @@ Public Sub Debug_Read(Data As String)
             Return
           Endif
         Endif
+      Endif
   
       FDebugInfo.DefineVariable(Trim(aData[3]), Trim(aData[4]))
 

app/src/gambas3/.src/Debug/FDebugInfo.class

@@ -95,31 +95,61 @@ Public Sub EnableStack(bOn As Boolean)
   
 End
 
-Public Sub FillStack(aPos As String[]) As Boolean
+Public Sub FillStack(aStack As String[]) As Boolean
   
   Dim sPos As String
   Dim iInd As Integer
   Dim sKey As String
   Dim W As Integer
+  Dim sStack As String
+  Dim iPos As Integer
+  Dim sComp As String
+  Dim sLastComp As String = "$"
+  Dim hCompFont As Font
   
   Object.Lock(lvwStack)
   
-  If lvwStack.Count And If aPos[0] = lvwStack[0].Text Then
+  If lvwStack.Count And If aStack[0] = lvwStack[0].Tag Then
     sKey = lvwStack.Key
   Else
     sKey = 0
   Endif
   
+  hCompFont = lvwStack.Font.Copy()
+  hCompFont.Bold = True
+  hCompFont.Grade = -2
+  
   lvwStack.Clear
   
   W = Desktop.Scale * 16
-  For Each sPos In aPos
-    If sPos = "?" Then
+  For Each sStack In aStack
+    If sStack = "?" Then
       lvwStack.Add(iInd, "(" & ("native code") & ")").Foreground = Color.LightForeground
     Else
-      lvwStack.Add(iInd, sPos)
+      sPos = sStack
+      If sPos Begins "[" Then
+        iPos = InStr(sPos, "].")
+        If iPos Then
+          sComp = Mid$(sPos, 2, iPos - 2)
+          sPos = Mid$(sPos, iPos + 2)
+        Endif
+      Endif
+      
+      If sComp <> sLastComp Then
+        sLastComp = sComp
+        If sComp = "$" Then sComp = "(" & ("Project") & ")"
+        With lvwStack.Add("@" & CStr(iInd), sComp)
+          .Background = Color.Merge(Color.TextBackground, Color.LightForeground)
+          .Font = hCompFont
+        End With
+      Endif
+      
+      If sPos Not Ends ".0" Then 
+        lvwStack.Add(iInd, sPos).Tag = sStack
         W = Max(W, lvwStack.Font.TextWidth(sPos))
       Endif
+      
+    Endif
     Inc iInd
   Next
   
@@ -139,14 +169,17 @@ Public Sub lvwStack_Click()
   
   Dim sLoc As String
   
+  If Not lvwStack.Current.Tag Then Return
+  
   Design.Command("@" & lvwStack.Key)
   FDebugExpr.RefreshAll
   RefreshAllWatch
   
-  sLoc = lvwStack.Current.Text
+  sLoc = lvwStack.Current.Tag
   If InStr(sLoc, "(") Then Return
+  If sLoc Not Begins "[$]." Then Return
   
-  Project.Goto(sLoc)
+  Project.Goto(Mid$(sLoc, 5))
   
 Catch
   

main/gbx/gbx_debug.c

@@ -74,7 +74,12 @@ const char *DEBUG_get_position(CLASS *cp, FUNCTION *fp, PCODE *pc)
 {
 #if DEBUG_MEMORY
 	static char buffer[256];
+	const int buffer_size = sizeof(buffer);
+#else
+	char *buffer = COMMON_buffer;
+	const int buffer_size = COMMON_BUF_MAX;
 #endif
+
 	ushort line = 0;
 
 	if (!cp || !pc)
@@ -83,21 +88,22 @@ const char *DEBUG_get_position(CLASS *cp, FUNCTION *fp, PCODE *pc)
 	if (fp != NULL && fp->debug)
 		calc_line_from_position(cp, fp, pc, &line);
 
-#if DEBUG_MEMORY
-	snprintf(buffer, sizeof(buffer), "%s.%s.%d",
-		cp ? cp->name : "?",
+	if (cp->component)
+	{
+		snprintf(buffer, buffer_size, "[%s].%s.%s.%d",
+			cp->component->name, cp->name,
 			(fp && fp->debug) ? fp->debug->name : "?",
 			line);
-
-	return buffer;
-#else
-	snprintf(COMMON_buffer, COMMON_BUF_MAX, "%.64s.%.64s.%d",
+	}
+	else
+	{
+		snprintf(buffer, buffer_size, "%s.%s.%d",
 			cp->name,
 			(fp && fp->debug) ? fp->debug->name : "?",
 			line);
+	}
 
-	return COMMON_buffer;
-#endif
+	return buffer;
 }
 
 

main/lib/debug/debug.c

@@ -648,12 +648,8 @@ void DEBUG_backtrace(FILE *out)
 {
 	int i, n;
 	STACK_CONTEXT *context;
-	ushort line;
 
-	if (CP)
 	fprintf(out, "%s", DEBUG_get_current_position());
-	else
-		fprintf(out, "?");
 
 	//for (i = 0; i < (STACK_frame_count - 1); i++)
 	n = 0;
@@ -663,7 +659,9 @@ void DEBUG_backtrace(FILE *out)
 		if (!context)
 			break;
 
-		if (context->pc)
+		n += fprintf(out, " %s", DEBUG_get_position(context->cp, context->fp, context->pc));
+
+		/*if (context->pc)
 		{
 			line = 0;
 			if (DEBUG_calc_line_from_position(context->cp, context->fp, context->pc, &line))
@@ -672,7 +670,7 @@ void DEBUG_backtrace(FILE *out)
 				n += fprintf(out, " %s.%s.%d", context->cp->name, context->fp->debug->name, line);
 		}
 		else if (context->cp)
-			n += fprintf(out, " ?");
+			n += fprintf(out, " ?");*/
 		
 		if (n >= (DEBUG_OUTPUT_MAX_SIZE / 2))
 		{
@@ -1063,25 +1061,30 @@ void DEBUG_breakpoint(int id)
 
 const char *DEBUG_get_position(CLASS *cp, FUNCTION *fp, PCODE *pc)
 {
-	if (pc)
-	{
+	const char *comp_name;
+	const char *class_name;
+	const char *func_name;
 	ushort line = 0;
 
-		if (fp != NULL && fp->debug)
-			DEBUG_calc_line_from_position(cp, fp, pc, &line);
+	if (!cp)
+		return "?";
 
-		snprintf(DEBUG_buffer, sizeof(DEBUG_buffer), "%.64s.%.64s.%d",
-			cp ? cp->name : "?",
-			(fp && fp->debug) ? fp->debug->name : "?",
-			line);
-	}
+	class_name = cp->name;
+	if (cp->component)
+		comp_name = cp->component->name;
 	else
+		comp_name = "$";
+
+	if (fp && fp->debug)
 	{
-		snprintf(DEBUG_buffer, sizeof(DEBUG_buffer), "%.64s.%.64s",
-			cp ? cp->name : "?",
-			(fp && fp->debug) ? fp->debug->name : "?");
+		func_name = fp->debug->name;
+		if (pc)
+			DEBUG_calc_line_from_position(cp, fp, pc, &line);
 	}
+	else
+		func_name = "?";
 
+	snprintf(DEBUG_buffer, sizeof(DEBUG_buffer), "[%s].%s.%s.%d", comp_name, class_name, func_name, line);
 	return DEBUG_buffer;
 }
 

main/lib/debug/debug.h

@@ -47,7 +47,7 @@ EXTERN char DEBUG_buffer[];
 EXTERN char *DEBUG_fifo;
 #endif
 
-#define DEBUG_BUFFER_MAX 255
+#define DEBUG_BUFFER_MAX 512
 
 #define GB_DEBUG (*DEBUG_interface)