mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-20 11:09:42 +02:00
+ sscanf
git-svn-id: trunk@604 -
This commit is contained in:
florian
parent
b53bd80bf4
commit
0d79442d0f
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -5315,6 +5315,7 @@ tests/test/units/system/ttrunc.pp svneol=native#text/plain
|
||||
tests/test/units/sysutils/execansi.pp svneol=native#text/plain
|
||||
tests/test/units/sysutils/execedbya.pp svneol=native#text/plain
|
||||
tests/test/units/sysutils/extractquote.pp svneol=native#text/plain
|
||||
tests/test/units/sysutils/tsscanf.pp svneol=native#text/plain
|
||||
tests/test/uprocext1.pp svneol=native#text/plain
|
||||
tests/test/uprocext2.pp svneol=native#text/plain
|
||||
tests/test/utasout.pp svneol=native#text/plain
|
||||
|
||||
@ -69,7 +69,7 @@ Function UpperCase(Const S : String) : String;
|
||||
Var
|
||||
i : Integer;
|
||||
P : PChar;
|
||||
|
||||
|
||||
begin
|
||||
Result := S;
|
||||
UniqueString(Result);
|
||||
@ -80,7 +80,7 @@ begin
|
||||
Inc(P);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
{ LowerCase returns a copy of S where all uppercase characters ( from A to Z )
|
||||
have been converted to lowercase }
|
||||
|
||||
@ -89,7 +89,7 @@ Function Lowercase(Const S : String) : String;
|
||||
Var
|
||||
i : Integer;
|
||||
P : PChar;
|
||||
|
||||
|
||||
begin
|
||||
Result := S;
|
||||
UniqueString(Result);
|
||||
@ -100,7 +100,7 @@ begin
|
||||
Inc(P);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
|
||||
{ CompareStr compares S1 and S2, the result is the based on
|
||||
substraction of the ascii values of the characters in S1 and S2
|
||||
@ -212,7 +212,7 @@ end;
|
||||
{==============================================================================}
|
||||
|
||||
function GenericAnsiUpperCase(const s: string): string;
|
||||
var
|
||||
var
|
||||
len, i: integer;
|
||||
begin
|
||||
len := length(s);
|
||||
@ -223,7 +223,7 @@ end;
|
||||
|
||||
|
||||
function GenericAnsiLowerCase(const s: string): string;
|
||||
var
|
||||
var
|
||||
len, i: integer;
|
||||
begin
|
||||
len := length(s);
|
||||
@ -234,7 +234,7 @@ end;
|
||||
|
||||
|
||||
function GenericAnsiCompareStr(const S1, S2: string): PtrInt;
|
||||
Var
|
||||
Var
|
||||
I,L1,L2 : SizeInt;
|
||||
begin
|
||||
Result:=0;
|
||||
@ -251,7 +251,7 @@ begin
|
||||
end;
|
||||
|
||||
function GenericAnsiCompareText(const S1, S2: string): PtrInt;
|
||||
Var
|
||||
Var
|
||||
I,L1,L2 : SizeInt;
|
||||
begin
|
||||
Result:=0;
|
||||
@ -424,56 +424,56 @@ function AnsiUpperCase(const s: string): string;{$ifdef SYSUTILSINLINE}inline;{$
|
||||
begin
|
||||
result:=widestringmanager.UpperAnsiStringProc(s);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
|
||||
function AnsiLowerCase(const s: string): string;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.LowerAnsiStringProc(s);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
|
||||
function AnsiCompareStr(const S1, S2: string): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.CompareStrAnsiStringProc(s1,s2);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
|
||||
function AnsiCompareText(const S1, S2: string): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.CompareTextAnsiStringProc(s1,s2);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
|
||||
function AnsiStrComp(S1, S2: PChar): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.StrCompAnsiStringProc(s1,s2);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
function AnsiStrIComp(S1, S2: PChar): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.StrICompAnsiStringProc(s1,s2);
|
||||
result:=widestringmanager.StrICompAnsiStringProc(s1,s2);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
function AnsiStrLComp(S1, S2: PChar; MaxLen: cardinal): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.StrLCompAnsiStringProc(s1,s2,maxlen);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
function AnsiStrLIComp(S1, S2: PChar; MaxLen: cardinal): integer;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.StrLICompAnsiStringProc(s1,s2,maxlen);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
function AnsiStrLower(Str: PChar): PChar;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.StrLowerAnsiStringProc(Str);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
|
||||
function AnsiStrUpper(Str: PChar): PChar;{$ifdef SYSUTILSINLINE}inline;{$endif}
|
||||
begin
|
||||
result:=widestringmanager.StrUpperAnsiStringProc(Str);
|
||||
@ -757,7 +757,7 @@ function StrToInt(const S: string): integer;
|
||||
var Error: word;
|
||||
begin
|
||||
Val(S, result, Error);
|
||||
if Error <> 0 then raise EConvertError.createfmt(SInValidInteger,[S]);
|
||||
if Error <> 0 then raise EConvertError.createfmt(SInvalidInteger,[S]);
|
||||
end ;
|
||||
|
||||
|
||||
@ -766,7 +766,7 @@ var Error: word;
|
||||
|
||||
begin
|
||||
Val(S, result, Error);
|
||||
if Error <> 0 then raise EConvertError.createfmt(SInValidInteger,[S]);
|
||||
if Error <> 0 then raise EConvertError.createfmt(SInvalidInteger,[S]);
|
||||
end;
|
||||
|
||||
|
||||
@ -1028,9 +1028,9 @@ Begin
|
||||
else if (P<>0) then // we have a decimalseparator
|
||||
begin
|
||||
P := Length(Result);
|
||||
While (P>0) and (Result[P] = '0') Do
|
||||
While (P>0) and (Result[P] = '0') Do
|
||||
Dec(P);
|
||||
If (P>0) and (Result[P]=DecimalSeparator) Then
|
||||
If (P>0) and (Result[P]=DecimalSeparator) Then
|
||||
Dec(P);
|
||||
SetLength(Result, P);
|
||||
end;
|
||||
@ -1769,7 +1769,7 @@ function FormatCurr(const Format: string; Value: Currency): string;
|
||||
begin
|
||||
Result := FormatFloat(Format, Value);
|
||||
end;
|
||||
|
||||
|
||||
|
||||
{==============================================================================}
|
||||
{ extra functions }
|
||||
@ -2068,3 +2068,144 @@ const
|
||||
#240, #241, #242, #243, #244, #245, #246, #247,
|
||||
#248, #249, #250, #251, #252, #253, #254, #255 );
|
||||
|
||||
|
||||
function sscanf(const s: string; const fmt : string;const Pointers : array of Pointer) : Integer;
|
||||
var
|
||||
i,j,n,m : SizeInt;
|
||||
s1 : string;
|
||||
|
||||
function GetInt : Integer;
|
||||
begin
|
||||
s1 := '';
|
||||
while (s[n] = ' ') and (Length(s) > n) do
|
||||
inc(n);
|
||||
while (s[n] in ['0'..'9', '+', '-'])
|
||||
and (Length(s) >= n) do
|
||||
begin
|
||||
s1 := s1+s[n];
|
||||
inc(n);
|
||||
end;
|
||||
Result := Length(s1);
|
||||
end;
|
||||
|
||||
|
||||
function GetFloat : Integer;
|
||||
begin
|
||||
s1 := '';
|
||||
while (s[n] = ' ') and (Length(s) > n) do
|
||||
inc(n);
|
||||
while (s[n] in ['0'..'9', '+', '-', '.', 'e', 'E'])
|
||||
and (Length(s) >= n) do
|
||||
begin
|
||||
s1 := s1+s[n];
|
||||
inc(n);
|
||||
end;
|
||||
Result := Length(s1);
|
||||
end;
|
||||
|
||||
|
||||
function GetString : Integer;
|
||||
begin
|
||||
s1 := '';
|
||||
while (s[n] = ' ') and (Length(s) > n) do
|
||||
inc(n);
|
||||
while (s[n] <> ' ') and (Length(s) >= n) do
|
||||
begin
|
||||
s1 := s1+s[n];
|
||||
inc(n);
|
||||
end;
|
||||
Result := Length(s1);
|
||||
end;
|
||||
|
||||
|
||||
function ScanStr(c : Char) : Boolean;
|
||||
begin
|
||||
while (s[n] <> c) and (Length(s) > n) do inc(n);
|
||||
inc(n);
|
||||
If (n <= Length(s)) then
|
||||
Result := True
|
||||
else
|
||||
Result := False;
|
||||
end;
|
||||
|
||||
|
||||
function GetFmt : Integer;
|
||||
begin
|
||||
Result := -1;
|
||||
while true do
|
||||
begin
|
||||
|
||||
while (fmt[m] = ' ') and (Length(fmt) > m) do
|
||||
inc(m);
|
||||
|
||||
if (m >= Length(fmt)) then
|
||||
break;
|
||||
|
||||
if (fmt[m] = '%') then
|
||||
begin
|
||||
inc(m);
|
||||
case fmt[m] of
|
||||
'd': Result := vtInteger;
|
||||
'f': Result := vtExtended;
|
||||
's': Result := vtString;
|
||||
else
|
||||
raise EFormatError.CreateFmt(SInvalidFormat,[fmt]);
|
||||
end;
|
||||
inc(m);
|
||||
break;
|
||||
end;
|
||||
|
||||
if not(ScanStr(fmt[m])) then
|
||||
break;
|
||||
inc(m);
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
begin
|
||||
n := 1;
|
||||
m := 1;
|
||||
Result := 0;
|
||||
|
||||
for i:=0 to High(Pointers) do
|
||||
begin
|
||||
j := GetFmt;
|
||||
case j of
|
||||
vtInteger :
|
||||
begin
|
||||
if GetInt > 0 then
|
||||
begin
|
||||
plongint(Pointers[i])^:=StrToInt(s1);
|
||||
inc(Result);
|
||||
end
|
||||
else
|
||||
break;
|
||||
|
||||
end;
|
||||
|
||||
vtExtended :
|
||||
begin
|
||||
if GetFloat>0 then
|
||||
begin
|
||||
pextended(Pointers[i])^:=StrToFloat(s1);
|
||||
inc(Result);
|
||||
end
|
||||
else
|
||||
break;
|
||||
end;
|
||||
|
||||
vtString :
|
||||
begin
|
||||
if GetString > 0 then
|
||||
begin
|
||||
pansistring(Pointers[i])^:=s1;
|
||||
inc(Result);
|
||||
end
|
||||
else
|
||||
break;
|
||||
end;
|
||||
else
|
||||
break;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -150,6 +150,8 @@ Function FormatFloat(Const Format : String; Value : Extended) : String;
|
||||
Function IsDelimiter(const Delimiters, S: string; Index: Integer): Boolean;
|
||||
function FormatCurr(const Format: string; Value: Currency): string;
|
||||
|
||||
function SScanf(const s: string; const fmt : string;const Pointers : array of Pointer) : Integer;
|
||||
|
||||
{// MBCS Functions. No MBCS yet, so mostly these are calls to the regular counterparts.}
|
||||
Type
|
||||
TMbcsByteType = (mbSingleByte, mbLeadByte, mbTrailByte);
|
||||
|
||||
@ -129,6 +129,7 @@ type
|
||||
|
||||
{ String conversion errors }
|
||||
EConvertError = class(Exception);
|
||||
EFormatError = class(Exception);
|
||||
|
||||
{ Other errors }
|
||||
EAbort = Class(Exception);
|
||||
|
||||
@ -536,38 +536,3 @@ begin
|
||||
end;
|
||||
end;
|
||||
|
||||
{
|
||||
Revision 1.1 2003/10/06 21:01:06 peter
|
||||
* moved classes unit to rtl
|
||||
|
||||
Revision 1.17 2003/09/06 20:46:07 marco
|
||||
* 3 small VP fixes from Noah Silva. One (OutOfMemory error) failed.
|
||||
|
||||
Revision 1.16 2003/04/06 11:06:39 michael
|
||||
+ Added exception classname to output of unhandled exception for better identification
|
||||
|
||||
Revision 1.15 2003/03/18 08:28:23 michael
|
||||
Patch from peter for Abort routine
|
||||
|
||||
Revision 1.14 2003/03/17 15:11:51 armin
|
||||
+ someone AssertErrorHandler, BackTraceFunc and Dump_Stack so that pointer instead of longint is needed
|
||||
|
||||
Revision 1.13 2003/01/01 20:58:07 florian
|
||||
+ added invalid instruction exception
|
||||
|
||||
Revision 1.12 2002/10/07 19:43:24 florian
|
||||
+ empty prototypes for the AnsiStr* multi byte functions added
|
||||
|
||||
Revision 1.11 2002/09/07 16:01:22 peter
|
||||
* old logs removed and tabs fixed
|
||||
|
||||
Revision 1.10 2002/07/16 13:57:39 florian
|
||||
* raise takes now a void pointer as at and frame address
|
||||
instead of a longint, fixed
|
||||
|
||||
Revision 1.9 2002/01/25 17:42:03 peter
|
||||
* interface helpers
|
||||
|
||||
Revision 1.8 2002/01/25 16:23:03 peter
|
||||
* merged filesearch() fix
|
||||
}
|
||||
|
||||
18
tests/test/units/sysutils/tsscanf.pp
Normal file
18
tests/test/units/sysutils/tsscanf.pp
Normal file
@ -0,0 +1,18 @@
|
||||
{$mode objfpc}
|
||||
{$h+}
|
||||
uses
|
||||
sysutils;
|
||||
var
|
||||
e : extended;
|
||||
s : string;
|
||||
l : longint;
|
||||
begin
|
||||
sscanf('asdf 1.2345 1234','%s %f %d',[@s,@e,@l]);
|
||||
if (e<>1.2345) or
|
||||
(l<>1234) or
|
||||
(s<>'asdf') then
|
||||
halt(1);
|
||||
// writeln(s,' ',e,' ',l);
|
||||
writeln('ok');
|
||||
end.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user