From d51ccfbc1361d57546cef7eb272b618c3c3b38ae Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 23 Oct 2020 10:34:17 +0000 Subject: [PATCH] * Fixed buggy support for + between long strings --- packages/rtl/classes.pas | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/rtl/classes.pas b/packages/rtl/classes.pas index d5be6c2..0c2cd86 100644 --- a/packages/rtl/classes.pas +++ b/packages/rtl/classes.pas @@ -1249,7 +1249,8 @@ type toComma, // , toDot, // . toEqual, // = - toColon // : + toColon, // : + toPlus // + ); TParser = class(TObject) @@ -9843,7 +9844,8 @@ const ',', '.', '=', - ':' + ':', + '+' ); function TParser.GetTokenName(aTok: TParserToken): string; @@ -10251,6 +10253,7 @@ begin '.' : SetToken(toDot); '=' : SetToken(toEqual); ':' : SetToken(toColon); + '+' : SetToken(toPlus); else HandleUnknown; end; @@ -10379,7 +10382,7 @@ var ws : string; begin ws:=left+parser.TokenString; - while (parser.NextToken = classes.toString) and (Parser.TokenString='+') do + while parser.NextToken = toPlus do begin parser.NextToken; // Get next string fragment if not (parser.Token=Classes.toString) then