fix, double quoted string literal escape

This commit is contained in:
Basile Burg 2014-12-04 00:21:33 +01:00
parent 91e7cfe503
commit 76dd9b8d44
1 changed files with 6 additions and 15 deletions

View File

@ -578,16 +578,12 @@ begin
fTokKind := tkStrng; fTokKind := tkStrng;
while(true) do while(true) do
begin begin
if not readUntilAmong(reader, fTokStop, stringStopChecks) then if not readUntilAmong(reader, fTokStop, stringStopChecks) then break;
break;
if (reader^ = '\') then if (reader^ = '\') then
begin begin
readerNext; readerNext;
if readWhile(reader, fTokStop, '\') then if fCurrRange.rString then continue;
continue;
if reader^ = '"' then if not fCurrRange.rString then
readerNext; readerNext;
continue;
end end
else if reader^ = '"' then else if reader^ = '"' then
begin begin
@ -607,16 +603,12 @@ begin
fTokKind := tkStrng; fTokKind := tkStrng;
while(true) do while(true) do
begin begin
if not readUntilAmong(reader, fTokStop, stringStopChecks) then if not readUntilAmong(reader, fTokStop, stringStopChecks) then break;
break;
if reader^ = '\' then if reader^ = '\' then
begin begin
readerNext; readerNext;
if readWhile(reader, fTokStop, '\') then if fCurrRange.rString then continue;
continue;
if reader^ = '"' then if not fCurrRange.rString then
readerNext; readerNext;
continue;
end end
else if reader^ = '"' then else if reader^ = '"' then
begin begin
@ -724,7 +716,6 @@ begin
exit; exit;
end else readerReset; end else readerReset;
// hex litterals // hex litterals
{if readDelim(reader, fTokStop, '0x') then {if readDelim(reader, fTokStop, '0x') then
begin begin