[Wxdsgn-svn] SF.net SVN: wxdsgn: [729] branches/VC_Debugger/wxdevcpp/source/debugger.pas

[<lo...@us...>]

Revision: 729
          http://svn.sourceforge.net/wxdsgn/?rev=729&view=rev
Author:   lowjoel
Date:     2006-12-15 15:36:19 -0800 (Fri, 15 Dec 2006)

Log Message:
-----------
-Fixed possible dead-cast
-Fixed the debugger error detection, they use error codes to pick up errors (E.g. access violations) so we just need to parse the codes to know what error it is.

Modified Paths:
--------------
    branches/VC_Debugger/wxdevcpp/source/debugger.pas

Modified: branches/VC_Debugger/wxdevcpp/source/debugger.pas
===================================================================
--- branches/VC_Debugger/wxdevcpp/source/debugger.pas	2006-12-15 23:33:29 UTC (rev 728)
+++ branches/VC_Debugger/wxdevcpp/source/debugger.pas	2006-12-15 23:36:19 UTC (rev 729)
@@ -913,11 +913,11 @@
   CurLine: String;
 
   procedure ParseError(const line: string);
-  begin
-    if RegExp.Exec(line, '\((.*)\): Access Violation - code c0000005 \((.*)\)') then
+  begin                  
+    if RegExp.Substitute('$3') = 'c0000005' then
       OnAccessViolation
-    else if RegExp.Exec(line, '\((.*)\): Control-C exception - code 40010005 \((.*)\)') then
-    else if RegExp.Exec(line, '\((.*)\): Break instruction exception - code 80000003 \((.*)\)') then
+    else if RegExp.Substitute('$3') = '40010005' then
+    else if RegExp.Substitute('$3') = '80000003' then
       if IgnoreBreakpoint then
         IgnoreBreakpoint := False
       else
@@ -958,7 +958,7 @@
     begin
       if LowerCase(RegExp.Substitute('$1')) = LowerCase(ChangeFileExt(ExtractFileName(Filename), '')) then
         OnNoDebuggingSymbolsFound;
-    end
+    end                       
     else if RegExp.Exec(line, '\((.*)\): (.*) - code ([0-9a-fA-F]{1,8}) \((.*)\)') then
       ParseError(line)
     else if RegExp.Exec(line, 'Breakpoint ([0-9]+) hit') then
@@ -973,24 +973,34 @@
   RegExp := TRegExpr.Create;
   MainForm.DebugOutput.Lines.BeginUpdate;
 
-  while Pos(#10, Output) > 0 do
-  begin
-    //Extract the current line
-    CurLine := Copy(Output, 0, Pos(#10, Output) - 1);
+  try
+    while Pos(#10, Output) > 0 do
+    begin
+      //Extract the current line
+      CurLine := Copy(Output, 0, Pos(#10, Output) - 1);
 
-    //Process the output
-    if not AnsiStartsStr('DBGHELP: ', CurLine) then
-      MainForm.DebugOutput.Lines.Add(CurLine);
-    ParseOutput(CurLine);
+      //Process the output
+      if not AnsiStartsStr('DBGHELP: ', CurLine) then
+        MainForm.DebugOutput.Lines.Add(CurLine);
+      ParseOutput(CurLine);
 
-    //Remove those that we've already processed
-    Delete(Output, 1, Pos(#10, Output));
-  end;
+      //Remove those that we've already processed
+      Delete(Output, 1, Pos(#10, Output));
+    end;
 
-  if Length(Output) > 0 then
-  begin
-    MainForm.DebugOutput.Lines.Add(Output);
-    ParseOutput(Output);
+    if Length(Output) > 0 then
+    begin
+      MainForm.DebugOutput.Lines.Add(Output);
+      ParseOutput(Output);
+    end;
+  except
+    on E: Exception do
+    begin
+      MainForm.DebugOutput.Lines.EndUpdate;
+      SendMessage(MainForm.DebugOutput.Handle, $00B6, 0, MainForm.DebugOutput.Lines.Count);
+      RegExp.Free;
+      raise;
+    end;
   end;
 
   //Clean up
@@ -1704,7 +1714,7 @@
   I, Depth: Integer;
   RegExp: TRegExpr;
 begin
-  if CurrentCommand <> nil then
+  if (CurrentCommand <> nil) and (CurrentCommand.Data.ClassName = 'string') then
     Name := string(CurrentCommand.Data);
   RegExp := TRegExpr.Create;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.