Merged revisions 3610 via svnmerge from

svn+ssh://svn.freepascal.org/FPC/svn/fpc/trunk

........
  r3610 | michael | 2006-05-21 11:57:47 +0200 (Sun, 21 May 2006) | 1 line
  
  + Added delphi compatibility Error procedure
........

git-svn-id: branches/fixes_2_0@3611 -

rtl/inc/system.inc

@@ -754,6 +754,12 @@ Begin
   Halt(0);
 End;
 
+Procedure Error(RunTimeError : TRunTimeError);
+
+begin
+  RunError(RuntimeErrorExitCodes[RunTimeError]);
+end;
+
 
 function do_isdevice(handle:thandle):boolean;forward;
 

rtl/inc/systemh.inc

@@ -212,7 +212,7 @@ Type
 
   HRESULT             = type Longint;
   TDateTime           = type Double;
-  Error               = type Longint;
+  TError               = type Longint;
 
   PSingle             = ^Single;
   PDouble             = ^Double;
@@ -247,7 +247,7 @@ Type
   PAnsiString         = ^AnsiString;
 
   PDate               = ^TDateTime;
-  PError              = ^Error;
+  PError              = ^TError;
   PVariant            = ^Variant;
   POleVariant         = ^OleVariant;
 
@@ -602,6 +602,28 @@ Function GetThreadID:TThreadID;{$ifdef SYSTEMINLINE}inline;{$endif}
                           Init / Exit / ExitProc
 *****************************************************************************}
 
+type
+  TRuntimeError = 
+    (reNone, reOutOfMemory, reInvalidPtr, reDivByZero, reRangeError, 
+     reIntOverflow, reInvalidOp, reZeroDivide, reOverflow, reUnderflow, 
+     reInvalidCast, reAccessViolation, rePrivInstruction, reControlBreak, 
+     reStackOverflow, reVarTypeCast, reVarInvalidOp, reVarDispatch, 
+     reVarArrayCreate, reVarNotArray, reVarArrayBounds, reAssertionFailed,
+     reExternalException, reIntfCastError, reSafeCallError, reQuit, 
+     reCodesetConversion);
+
+Const
+  // Please keep locations corresponding to location in array above
+  RuntimeErrorExitCodes : Array[TRuntimeError] of Byte = (
+     0  , 203, 204, 200,  201,
+     215, 207, 200, 205,  206,
+     219, 216, 218, 217,  
+     202, 220, 221, 222,
+     223, 224, 225, 227,
+     0  , 228, 229, 233, 
+     234);    
+
+Procedure Error(RunTimeError : TRunTimeError);
 Function  Paramcount:Longint;
 Function  ParamStr(l:Longint):string;
 Procedure Dump_Stack(var f : text;bp:pointer);

rtl/inc/variant.inc

@@ -303,9 +303,9 @@ operator :=(const source : tdatetime) dest : variant;{$ifdef SYSTEMINLINE}inline
   end;
 
 
-operator :=(const source : error) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : terror) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
-    Variantmanager.varfromInt(Dest,Source,-sizeof(error));
+    Variantmanager.varfromInt(Dest,Source,-sizeof(terror));
   end;
   
 {**********************************************************************
@@ -493,7 +493,7 @@ operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inlin
   end;
 
 
-operator :=(const source : variant) dest : error;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : variant) dest : terror;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
     dest:=variantmanager.vartoint(source);
   end;
@@ -785,7 +785,7 @@ operator :=(const source : olevariant) dest : tdatetime;{$ifdef SYSTEMINLINE}inl
   end;
 
 
-operator :=(const source : olevariant) dest : error;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : olevariant) dest : terror;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
     dest:=variantmanager.vartoint(variant(tvardata(source)));
   end;
@@ -938,9 +938,9 @@ operator :=(const source : tdatetime) dest : olevariant;{$ifdef SYSTEMINLINE}inl
   end;
 
 
-operator :=(const source : error) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : terror) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
   begin
-    variantmanager.olevarfromint(dest,source,-sizeof(error));
+    variantmanager.olevarfromint(dest,source,-sizeof(terror));
   end;
 {**********************************************************************
                       Variant manager functions

rtl/inc/varianth.inc

@@ -247,7 +247,7 @@ operator :=(const source : comp) dest : variant;{$ifdef SYSTEMINLINE}inline;{$en
 { Misc. }
 operator :=(const source : currency) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : tdatetime) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
-operator :=(const source : error) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : terror) dest : variant;{$ifdef SYSTEMINLINE}inline;{$endif}
 
 {**********************************************************************
                        from Variant assignments
@@ -297,7 +297,7 @@ operator :=(const source : variant) dest : olevariant;{$ifdef SYSTEMINLINE}inlin
 { Misc. }
 operator :=(const source : variant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : variant) dest : tdatetime;{$ifdef SYSTEMINLINE}inline;{$endif}
-operator :=(const source : variant) dest : error;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : variant) dest : terror;{$ifdef SYSTEMINLINE}inline;{$endif}
 
 {**********************************************************************
                          Operators
@@ -372,7 +372,7 @@ operator :=(const source : olevariant) dest : comp;{$ifdef SYSTEMINLINE}inline;{
 { Misc. }
 operator :=(const source : olevariant) dest : currency;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : olevariant) dest : tdatetime;{$ifdef SYSTEMINLINE}inline;{$endif}
-operator :=(const source : olevariant) dest : error;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : olevariant) dest : terror;{$ifdef SYSTEMINLINE}inline;{$endif}
 
 {**********************************************************************
                          to OLEVariant assignments
@@ -419,7 +419,7 @@ operator :=(const source : comp) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{
 { Misc. }
 operator :=(const source : currency) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 operator :=(const source : tdatetime) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
-operator :=(const source : error) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
+operator :=(const source : terror) dest : olevariant;{$ifdef SYSTEMINLINE}inline;{$endif}
 
 {**********************************************************************
                              OLEVariant Operators