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

* Fix quotestring and add quotedstr

Browse Source
This commit is contained in:
michael 2018-08-10 07:19:14 +00:00
parent 231bb41627
commit 5b3bc69a41
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/rtl/sysutils.pas
View File

@ -210,6 +210,7 @@ Type
function StringReplace(aOriginal, aSearch, aReplace : string; Flags : TStringReplaceFlags) : String; function StringReplace(aOriginal, aSearch, aReplace : string; Flags : TStringReplaceFlags) : String;
function QuoteString(aOriginal : String; AQuote : Char) : String; function QuoteString(aOriginal : String; AQuote : Char) : String;
function QuotedStr(const s: string; QuoteChar : Char = ''''): string;
function IsDelimiter(const Delimiters, S: string; Index: Integer): Boolean; function IsDelimiter(const Delimiters, S: string; Index: Integer): Boolean;
function AdjustLineBreaks(const S: string): string; function AdjustLineBreaks(const S: string): string;
function AdjustLineBreaks(const S: string; Style: TTextLineBreakStyle): string; function AdjustLineBreaks(const S: string; Style: TTextLineBreakStyle): string;
@ -2072,12 +2073,14 @@ end;
Function QuoteString(aOriginal : String; AQuote : Char) : String; Function QuoteString(aOriginal : String; AQuote : Char) : String;
Var begin
REString : String; Result:=AQuote+StringReplace(aOriginal,aQuote,aQuote+aQuote,[rfReplaceAll])+AQuote;
end;
function QuotedStr(const s: string; QuoteChar : Char = ''''): string;
begin begin
REString:=TJSString(aQuote).replace(TJSRegexp.new(aOriginal,'g'),'\\$1'); Result:=QuoteString(S,QuoteChar);
Result:=AQuote+TJSString(aOriginal).replace(TJSRegexp.new(REString,'g'),'$1\$1')+AQuote;
end; end;
function IsDelimiter(const Delimiters, S: string; Index: Integer): Boolean; function IsDelimiter(const Delimiters, S: string; Index: Integer): Boolean;
@ -3834,6 +3837,7 @@ begin
Result:='0'+Result; Result:='0'+Result;
end; end;
{ TFormatSettings } { TFormatSettings }
function TFormatSettings.GetCurrencyDecimals: Byte; function TFormatSettings.GetCurrencyDecimals: Byte;