paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-02 15:49:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Introduced strict property

Browse Source 
git-svn-id: trunk@15977 -
This commit is contained in:
michael 2010-09-13 21:09:22 +00:00
parent 7f489635da
commit 246e7275a4
2 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/fcl-json/src/jsonparser.pp
View File

@ -28,7 +28,9 @@ Type
TJSONParser = Class(TObject)
Private
FScanner : TJSONScanner;
FStrict: Boolean;
function ParseNumber: TJSONNumber;
procedure SetStrict(const AValue: Boolean);
Protected
procedure DoError(const Msg: String);
function DoParse(AtCurrent,AllowEOF: Boolean): TJSONData;
@ -42,6 +44,8 @@ Type
Constructor Create(Source : TStream); overload;
Constructor Create(Source : TJSONStringType); overload;
destructor Destroy();override;
// Use strict JSON: " for strings, object members are strings, not identifiers
Property Strict : Boolean Read FStrict Write SetStrict;
end;
EJSONScanner = Class(Exception);
@ -82,7 +86,7 @@ end;
Function TJSONParser.CurrentTokenString : String;
begin
If CurrentToken in [tkString,tkNumber] then
If CurrentToken in [tkString,tkIdentifier,tkNumber] then
Result:=FScanner.CurTokenString
else
Result:=TokenInfos[CurrentToken];
@ -147,6 +151,15 @@ begin
end;
end;
procedure TJSONParser.SetStrict(const AValue: Boolean);
begin
if (FStrict=AValue) then
exit;
FStrict:=AValue;
If Assigned(FScanner) then
FScanner.Strict:=Fstrict;
end;
// Current token is {, on exit current token is }
Function TJSONParser.ParseObject : TJSONObject;
@ -161,7 +174,7 @@ begin
T:=GetNextToken;
While T<>tkCurlyBraceClose do
begin
If T<>tkString then
If (T<>tkString) and (T<>tkIdentifier) then
DoError(SErrExpectedElementName);
N:=CurrentTokenString;
T:=GetNextToken;

36
packages/fcl-json/src/jsonscanner.pp
View File

@ -22,7 +22,7 @@ interface
uses SysUtils, Classes;
resourcestring
SErrInvalidCharacter = 'Invalid character ''%s''';
SErrInvalidCharacter = 'Invalid character at line %d, pos %d: ''%s''';
SErrOpenString = 'string exceeds end of line';
type
@ -42,12 +42,15 @@ type
tkCurlyBraceClose, // '}'
tkSquaredBraceOpen, // '['
tkSquaredBraceClose, // ']'
tkIdentifier, // Any Javascript identifier
tkUnknown
);
EScannerError = class(Exception);
{ TJSONScanner }
TJSONScanner = class
private
FSource : TStringList;
@ -55,6 +58,7 @@ type
FCurToken: TJSONToken;
FCurTokenString: string;
FCurLine: string;
FStrict: Boolean;
TokenStr: PChar;
function GetCurColumn: Integer;
protected
@ -74,6 +78,8 @@ type
property CurToken: TJSONToken read FCurToken;
property CurTokenString: string read FCurTokenString;
// Use strict JSON: " for strings, object members are strings, not identifiers
Property Strict : Boolean Read FStrict Write FStrict;
end;
const
@ -91,6 +97,7 @@ const
'}',
'[',
']',
'identifier',
''
);
@ -156,6 +163,7 @@ var
it : TJSONToken;
I : Integer;
OldLength, SectionLength, Index: Integer;
C : char;
S : String;
begin
@ -188,14 +196,16 @@ begin
end;
until not (TokenStr[0] in [#9, ' ']);
end;
'"':
'"','''':
begin
C:=TokenStr[0];
If (C='''') and Strict then
Error(SErrInvalidCharacter, [CurRow,CurColumn,TokenStr[0]]);
Inc(TokenStr);
TokenStart := TokenStr;
OldLength := 0;
FCurTokenString := '';
while not (TokenStr[0] in [#0,'"']) do
while not (TokenStr[0] in [#0,C]) do
begin
if (TokenStr[0]='\') then
begin
@ -205,6 +215,7 @@ begin
// Read escaped token
Case TokenStr[0] of
'"' : S:='"';
'''' : S:='''';
't' : S:=#9;
'b' : S:=#8;
'n' : S:=#10;
@ -221,7 +232,7 @@ begin
'0'..'9','A'..'F','a'..'f' :
S[i]:=Upcase(TokenStr[0]);
else
Error(SErrInvalidCharacter, [TokenStr[0]]);
Error(SErrInvalidCharacter, [CurRow,CurColumn,TokenStr[0]]);
end;
end;
// Takes care of conversion...
@ -229,7 +240,7 @@ begin
end;
#0 : Error(SErrOpenString);
else
Error(SErrInvalidCharacter, [TokenStr[0]]);
Error(SErrInvalidCharacter, [CurRow,CurColumn,TokenStr[0]]);
end;
SetLength(FCurTokenString, OldLength + SectionLength+1+Length(S));
if SectionLength > 0 then
@ -258,7 +269,7 @@ begin
Inc(TokenStr);
Result := tkComma;
end;
'0'..'9','-':
'0'..'9','.','-':
begin
TokenStart := TokenStr;
while true do
@ -294,6 +305,8 @@ begin
SetLength(FCurTokenString, SectionLength);
if SectionLength > 0 then
Move(TokenStart^, FCurTokenString[1], SectionLength);
If (FCurTokenString[1]='.') then
FCurTokenString:='0'+FCurTokenString;
Result := tkNumber;
end;
':':
@ -321,7 +334,7 @@ begin
Inc(TokenStr);
Result := tkSquaredBraceClose;
end;
'T','t','F','f','N','n' :
'a'..'z','_':
begin
TokenStart := TokenStr;
repeat
@ -338,10 +351,13 @@ begin
FCurToken := Result;
exit;
end;
Error(SErrInvalidCharacter, [TokenStart[0]]);
if Strict then
Error(SErrInvalidCharacter, [CurRow,CurColumn,TokenStr[0]])
else
Result:=tkIdentifier;
end;
else
Error(SErrInvalidCharacter, [TokenStr[0]]);
Error(SErrInvalidCharacter, [CurRow,CurCOlumn,TokenStr[0]]);
end;
FCurToken := Result;