paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 16:39:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ Made sure it compiles with official 0.99.8

Browse Source
This commit is contained in:
michael 1998-10-02 12:17:17 +00:00
parent 0e7268a3ea
commit cf6ce49cb1
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtl/objpas/sysstr.inc
View File

@ -429,9 +429,11 @@ end ;
{ FmtLoadStr returns the string resource Ident and formats it accordingly } { FmtLoadStr returns the string resource Ident and formats it accordingly }
{$ifdef autoobjpas}
function FmtLoadStr(Ident: integer; const Args: array of const): string; function FmtLoadStr(Ident: integer; const Args: array of const): string;
begin begin
end; end;
{$endif}
Const Const
feInvalidFormat = 1; feInvalidFormat = 1;
@ -453,7 +455,7 @@ begin
Halt(1); Halt(1);
end; end;
{$ifdef AUTOOBJPAS}
Function Format (Const Fmt : String; const Args : Array of const) : String; Function Format (Const Fmt : String; const Args : Array of const) : String;
Var ChPos,OldPos,ArgPos,DoArg,Len : Longint; Var ChPos,OldPos,ArgPos,DoArg,Len : Longint;
@ -691,7 +693,7 @@ begin
Oldpos:=chpos; Oldpos:=chpos;
end; end;
end; end;
{$endif}
{==============================================================================} {==============================================================================}
{ extra functions } { extra functions }
@ -887,7 +889,10 @@ end ;
{ {
$Log$ $Log$
Revision 1.6 1998-10-02 10:42:17 michael Revision 1.7 1998-10-02 12:17:17 michael
+ Made sure it compiles with official 0.99.8
Revision 1.6 1998/10/02 10:42:17 michael
+ Initial implementation of format + Initial implementation of format
Revision 1.5 1998/10/01 16:05:37 michael Revision 1.5 1998/10/01 16:05:37 michael
@ -904,7 +909,10 @@ end ;
Update from gertjan Schouten, plus small fix for linux Update from gertjan Schouten, plus small fix for linux
$Log$ $Log$
Revision 1.6 1998-10-02 10:42:17 michael Revision 1.7 1998-10-02 12:17:17 michael
+ Made sure it compiles with official 0.99.8
Revision 1.6 1998/10/02 10:42:17 michael
+ Initial implementation of format + Initial implementation of format
Revision 1.5 1998/10/01 16:05:37 michael Revision 1.5 1998/10/01 16:05:37 michael

15
rtl/objpas/sysutils.pp
View File

@ -54,7 +54,9 @@ interface
fhelpcontext : longint; fhelpcontext : longint;
public public
constructor create(const msg : string); constructor create(const msg : string);
{$ifdef autoobjpas}
constructor createfmt(const msg : string; const args : array of const); constructor createfmt(const msg : string; const args : array of const);
{$endif}
constructor createres(ident : longint); constructor createres(ident : longint);
{ !!!! } { !!!! }
property helpcontext : longint read fhelpcontext write fhelpcontext; property helpcontext : longint read fhelpcontext write fhelpcontext;
@ -141,14 +143,14 @@ interface
{!!!!!} {!!!!!}
end; end;
{$ifdef autoobjpas}
constructor exception.createfmt(const msg : string; const args : array of const); constructor exception.createfmt(const msg : string; const args : array of const);
begin begin
inherited create; inherited create;
fmessage:=Format(msg,args); fmessage:=Format(msg,args);
end; end;
{$endif}
constructor exception.createres(ident : longint); constructor exception.createres(ident : longint);
@ -205,7 +207,11 @@ begin
EInoutError(E).ErrorCode:=IOresult; // Clears InOutRes !! EInoutError(E).ErrorCode:=IOresult; // Clears InOutRes !!
end; end;
else else
{$ifdef autoobjpas}
E:=Exception.CreateFmt (SUnKnownRunTimeError,[Errno]); E:=Exception.CreateFmt (SUnKnownRunTimeError,[Errno]);
{$else}
E:=Exception.Create(SUnknownRunTimeError);
{$endif}
end; end;
Raise E {at Address}; Raise E {at Address};
end; end;
@ -231,7 +237,10 @@ begin
end. end.
{ {
$Log$ $Log$
Revision 1.11 1998-10-01 16:04:11 michael Revision 1.12 1998-10-02 12:17:18 michael
+ Made sure it compiles with official 0.99.8
Revision 1.11 1998/10/01 16:04:11 michael
+ Added RTL error handling + Added RTL error handling
Revision 1.10 1998/09/24 23:45:27 peter Revision 1.10 1998/09/24 23:45:27 peter