From a80e8f41c43a6e1f3274fc03707291ffe9082cde Mon Sep 17 00:00:00 2001 From: michael Date: Sat, 17 Sep 2016 08:18:10 +0000 Subject: [PATCH] * Report correct position when encountering identifier git-svn-id: trunk@34535 - --- packages/fcl-json/src/jsonscanner.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/fcl-json/src/jsonscanner.pp b/packages/fcl-json/src/jsonscanner.pp index d89518f4ff..024fc7fd7d 100644 --- a/packages/fcl-json/src/jsonscanner.pp +++ b/packages/fcl-json/src/jsonscanner.pp @@ -208,7 +208,7 @@ var TokenStart, CurPos: PChar; it : TJSONToken; I : Integer; - OldLength, SectionLength, Index: Integer; + OldLength, SectionLength, Index, tstart,tcol: Integer; C : char; S : String; IsStar,EOC: Boolean; @@ -433,6 +433,8 @@ begin end; 'a'..'z','A'..'Z','_': begin + tstart:=CurRow; + Tcol:=CurColumn; TokenStart := TokenStr; repeat Inc(TokenStr); @@ -448,7 +450,7 @@ begin exit; end; if (joStrict in Options) then - Error(SErrInvalidCharacter, [CurRow,CurColumn,TokenStr[0]]) + Error(SErrInvalidCharacter, [tStart,tcol,TokenStart[0]]) else Result:=tkIdentifier; end;