paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-25 10:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed buggy support for + between long strings

Browse Source
This commit is contained in:
michael 2020-10-23 10:34:17 +00:00
parent 01d9516261
commit d51ccfbc13
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/rtl/classes.pas
View File

@ -1249,7 +1249,8 @@ type
toComma, // , toComma, // ,
toDot, // . toDot, // .
toEqual, // = toEqual, // =
toColon // : toColon, // :
toPlus // +
); );
TParser = class(TObject) TParser = class(TObject)
@ -9843,7 +9844,8 @@ const
',', ',',
'.', '.',
'=', '=',
':' ':',
'+'
); );
function TParser.GetTokenName(aTok: TParserToken): string; function TParser.GetTokenName(aTok: TParserToken): string;
@ -10251,6 +10253,7 @@ begin
'.' : SetToken(toDot); '.' : SetToken(toDot);
'=' : SetToken(toEqual); '=' : SetToken(toEqual);
':' : SetToken(toColon); ':' : SetToken(toColon);
'+' : SetToken(toPlus);
else else
HandleUnknown; HandleUnknown;
end; end;
@ -10379,7 +10382,7 @@ var
ws : string; ws : string;
begin begin
ws:=left+parser.TokenString; ws:=left+parser.TokenString;
while (parser.NextToken = classes.toString) and (Parser.TokenString='+') do while parser.NextToken = toPlus do
begin begin
parser.NextToken; // Get next string fragment parser.NextToken; // Get next string fragment
if not (parser.Token=Classes.toString) then if not (parser.Token=Classes.toString) then