* Remove TUseBoolStr type

This commit is contained in:
michael 2020-08-10 15:09:24 +00:00
parent 767287d442
commit 3ed3dc7f1c

View File

@ -1093,52 +1093,48 @@ Type
Function TestBit(const Index:TNativeUIntBitIndex) :Boolean; inline; Function TestBit(const Index:TNativeUIntBitIndex) :Boolean; inline;
end; end;
{$SCOPEDENUMS ON}
TUseBoolStrs = (False, True);
{$SCOPEDENUMS OFF}
TBooleanHelper = Type Helper for Boolean TBooleanHelper = Type Helper for Boolean
public public
Class Function Parse(const S: string): Boolean; inline; static; Class Function Parse(const S: string): Boolean; inline; static;
Class Function Size: Integer; inline; static; Class Function Size: Integer; inline; static;
Class Function ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; static; Class Function ToString(const AValue: Boolean; UseBoolStrs: Boolean = false): string; overload; inline; static;
Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static; Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static;
Public Public
Function ToInteger: Integer; inline; Function ToInteger: Integer; inline;
Function ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function ToString(UseBoolStrs: Boolean = False): string; overload; inline;
end; end;
TByteBoolHelper = Type Helper for ByteBool TByteBoolHelper = Type Helper for ByteBool
public public
Class Function Parse(const S: string): Boolean; inline; static; Class Function Parse(const S: string): Boolean; inline; static;
Class Function Size: Integer; inline; static; Class Function Size: Integer; inline; static;
Class Function ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; static; Class Function ToString(const AValue: Boolean; UseBoolStrs : Boolean = False): string; overload; inline; static;
Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static; Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static;
Public Public
Function ToInteger: Integer; inline; Function ToInteger: Integer; inline;
Function ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function ToString(UseBoolStrs: Boolean = False): string; overload; inline;
end; end;
TWordBoolHelper = Type Helper for WordBool TWordBoolHelper = Type Helper for WordBool
public public
Class Function Parse(const S: string): Boolean; inline; static; Class Function Parse(const S: string): Boolean; inline; static;
Class Function Size: Integer; inline; static; Class Function Size: Integer; inline; static;
Class Function ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; static; Class Function ToString(const AValue: Boolean; UseBoolStrs: Boolean = False): string; overload; inline; static;
Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static; Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static;
Public Public
Function ToInteger: Integer; inline; Function ToInteger: Integer; inline;
Function ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function ToString(UseBoolStrs: boolean = False): string; overload; inline;
end; end;
TLongBoolHelper = Type Helper for LongBool TLongBoolHelper = Type Helper for LongBool
public public
Class Function Parse(const S: string): Boolean; inline; static; Class Function Parse(const S: string): Boolean; inline; static;
Class Function Size: Integer; inline; static; Class Function Size: Integer; inline; static;
Class Function ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; static; Class Function ToString(const AValue: Boolean; UseBoolStrs: Boolean= False): string; overload; inline; static;
Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static; Class Function TryToParse(const S: string; out AValue: Boolean): Boolean; inline; static;
public public
Function ToInteger: Integer; inline; Function ToInteger: Integer; inline;
Function ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function ToString(UseBoolStrs: Boolean = False): string; overload; inline;
end; end;
@ -7753,10 +7749,10 @@ begin
Result:=1; Result:=1;
end; end;
Class Function TBooleanHelper.ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Class Function TBooleanHelper.ToString(const AValue: Boolean; UseBoolStrs: Boolean = False): string; overload; inline;
begin begin
Result:=BoolToStr(AValue,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(AValue,True);
end; end;
Class Function TBooleanHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline; Class Function TBooleanHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline;
@ -7771,10 +7767,10 @@ begin
Result:=Integer(Self); Result:=Integer(Self);
end; end;
Function TBooleanHelper.ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function TBooleanHelper.ToString(UseBoolStrs: Boolean= False): string; overload; inline;
begin begin
Result:=BoolToStr(Self,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(Self,True);
end; end;
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
@ -7793,10 +7789,10 @@ begin
Result:=1; Result:=1;
end; end;
Class Function TByteBoolHelper.ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Class Function TByteBoolHelper.ToString(const AValue: Boolean; UseBoolStrs: Boolean = False): string; overload; inline;
begin begin
Result:=BoolToStr(AValue,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(AValue,True);
end; end;
Class Function TByteBoolHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline; Class Function TByteBoolHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline;
@ -7811,10 +7807,10 @@ begin
Result:=Integer(Self); Result:=Integer(Self);
end; end;
Function TByteBoolHelper.ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function TByteBoolHelper.ToString(UseBoolStrs: Boolean = False): string; overload; inline;
begin begin
Result:=BoolToStr(Self,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(Self,True);
end; end;
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
@ -7833,10 +7829,10 @@ begin
Result:=2; Result:=2;
end; end;
Class Function TWordBoolHelper.ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Class Function TWordBoolHelper.ToString(const AValue: Boolean; UseBoolStrs: boolean = False): string; overload; inline;
begin begin
Result:=BoolToStr(AValue,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(AValue,True);
end; end;
Class Function TWordBoolHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline; Class Function TWordBoolHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline;
@ -7851,10 +7847,10 @@ begin
Result:=Integer(Self); Result:=Integer(Self);
end; end;
Function TWordBoolHelper.ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function TWordBoolHelper.ToString(UseBoolStrs: Boolean = False): string; overload; inline;
begin begin
Result:=BoolToStr(Self,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(Self,True);
end; end;
{ --------------------------------------------------------------------- { ---------------------------------------------------------------------
@ -7874,10 +7870,10 @@ begin
Result:=4; Result:=4;
end; end;
Class Function TLongBoolHelper.ToString(const AValue: Boolean; UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Class Function TLongBoolHelper.ToString(const AValue: Boolean; UseBoolStrs: Boolean = False): string; overload; inline;
begin begin
Result:=BoolToStr(AValue,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(AValue,True);
end; end;
Class Function TLongBoolHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline; Class Function TLongBoolHelper.TryToParse(const S: string; out AValue: Boolean): Boolean; inline;
@ -7892,10 +7888,10 @@ begin
Result:=Integer(Self); Result:=Integer(Self);
end; end;
Function TLongBoolHelper.ToString(UseBoolStrs: TUseBoolStrs = TUseBoolStrs.False): string; overload; inline; Function TLongBoolHelper.ToString(UseBoolStrs: Boolean = False): string; overload; inline;
begin begin
Result:=BoolToStr(Self,UseBoolStrs=TUseBoolStrs.True); Result:=BoolToStr(Self,True);
end; end;
end. end.