Recent changes to patches

#10 Fixes for Delphi Rio support for osx64

Danie van Eeden — Wed, 02 Dec 2020 09:02:13 -0000

Tried this. Solves a similar issue on win64-target configuration.
Original Error was in mem_ch method.

Fixes for Delphi Rio support for osx64

Albert — Thu, 17 Oct 2019 09:36:02 -0000

I had to convert using PChar to using array of char in order to have the GenerateText function in osx64 compiler.
Also, I had to use FormatSettings.DecimalSeparator to initialize the DecimalSeparator variable in order to get a correct result in MacOS Catalina
Hope this helps anyone

fix for valid json parsing

Sergey Galezdinov — Mon, 03 Sep 2012 10:47:06 -0000

need to add (idx > 1) condition to js_base function:
function js_base(idx: Integer; var ridx: Integer; var o:
TlkJSONbase): Boolean;
begin
skip_spc(idx);
result := (idx > 1) and js_boolean(idx, idx, o);
if not result then result := (idx > 1) and js_null(idx, idx, o);
if not result then result := (idx > 1) and js_number(idx, idx, o);
if not result then result := (idx > 1) and js_string(idx, idx, o);
if not result then result := (idx > 1) and js_list(idx, idx, o);
if not result then result := js_object(idx, idx, o);
if result then ridx := idx;
end;

this will fix the wrong paring of json like this:
841{test:true}

instead of returning nil, it returns TlkJsonNumber

add overload for widestring

Sergey Galezdinov — Wed, 18 Jan 2012 10:10:26 -0000

please add this method to code

function TlkJSONobject.Add(const aname: WideString; aobj: TlkJSONbase): Integer;
var
mth: TlkJSONobjectmethod;
begin
if not assigned(aobj) then
begin
result := -1;
exit;
end;
mth := TlkJSONobjectmethod.Create;
mth.FName := aname;
mth.FValue := aobj;
result := self._Add(mth);
if FUseHash then
{$IFDEF USE_HASH}
ht.AddPair(aname, result);
{$ELSE}
ht.Insert(aname, result);
{$ENDIF USE_HASH}
end;

Speed improvement in parsing

Sergey Galezdinov — Wed, 18 Jan 2012 10:04:02 -0000

This code loads huge json at least 10 times faster due to less string memory reallocation.
To compare the speed, use json with a lot of "/", "\" symbols and a lot of unicode characters like "\u0442"
Sample file: http://pastebin.com/m2ECz9Gp

On my machine parsing with old function lasts about 2 minutes. New version parses file in 3-5 seconds. Feel the difference.
Hope this will help your projects

int64 support

SergeyNikitin — Tue, 17 Nov 2009 22:37:13 -0000

1. add to

TlkJSONcustomlist = class(TlkJSONbase)
protected

function getInt64(idx: Integer): Int64; virtual; //added by Lucefer

2. add to

TlkJSONobject = class(TlkJSONcustomlist)
protected

//[START] Added by Lucefer 20090602
function getInt64(idx: Integer): Int64; overload; override;
function {$ifdef TCB_EXT}getInt64FromName{$else}getInt64{$endif}
(nm: string): Int64; overload;
//[END] Added by Lucefer 20090602

3. add somewhere below

//[START] Added by Lucefer 20090602
function TlkJSONcustomlist.getInt64(idx: Integer): Int64;
var
jn: TlkJSONnumber;
begin
jn := Child[idx] as TlkJSONnumber;
if not assigned(jn) then result := 0
else result := round(int(jn.Value));
end;
//[END] Added by Lucefer 20090602

4. and one more:

//[START] Added by Lucefer 20090602
function TlkJSONobject.getInt64(idx: Integer): Int64;
var
jn: TlkJSONnumber;
begin
jn := FieldByIndex[idx] as TlkJSONnumber;
if not assigned(jn) then result := 0
else result := round(int(jn.Value));
end;

{$ifdef TCB_EXT}
function TlkJSONobject.getInt64FromName(nm: string): Int64;
{$else}
function TlkJSONobject.getInt64(nm: string): Int64;
{$endif}
begin
result := getInt64(IndexOfName(nm));
end;
//[END] Added by Lucefer 20090602

Remove exclusive file open

SergeyNikitin — Tue, 17 Nov 2009 19:55:54 -0000

into class function TlkJSONstreamed.LoadFromFile(srcname: string):
fs := TFileStream.Create(srcname, fmOpenRead);
changed to
fs := TFileStream.Create(srcname, fmOpenRead or fmShareDenyNone);

class function TlkJSONstreamed.LoadFromFile(srcname: string):
TlkJSONbase;
var
fs: TFileStream;
begin
result := nil;
if not FileExists(srcname) then exit;
try
fs := TFileStream.Create(srcname, fmOpenRead or fmShareDenyNone);
result := LoadFromStream(fs);
finally
if Assigned(fs) then FreeAndNil(fs);
end;
end;

changed js_string

Anonymous — Wed, 10 Jun 2009 12:36:39 -0000

solved problem with escaped characters (\\ \" etc) and solved prooblem with {"a", "b:\\"}

function js_string(idx: Integer; var ridx: Integer; var o:TlkJSONbase): Boolean;

function strSpecialChars(const s: string): string;
var
i, j : integer;
begin
i := Pos('\', s);
if (i = 0) then
Result := s
else
begin
Result := Copy(s, 1, i-1);
j := i;
repeat
if (s[j] = '\') then
begin
inc(j);
case s[j] of
'\': Result := Result + '\';
'"': Result := Result + '"';
'''': Result := Result + '''';
'/': Result := Result + '/';
'b': Result := Result + #8;
'f': Result := Result + #12;
'n': Result := Result + #10;
'r': Result := Result + #13;
't': Result := Result + #9;
'u':
begin
Result := Result + code2utf(strtoint('$' + copy(s, j + 1, 4)));
inc(j, 4);
end;
end;
end
else
Result := Result + s[j];
inc(j);
//[Start] Changed by Lucefer 20090602 from: until j >= length(s);
until j > length(s);
//[End] Changed by Lucefer 20090602
end;
end;

//[START] changed by Lucefer 20090610
var
js: TlkJSONstring;
ws: String;
posc, posq :Integer;
begin
skip_spc(idx);

result := xe(idx) and (txt[idx] = '"');
if not result then exit;

//Находим завершающий строку (но не escейпленный) символ '"',
inc(idx); //Пропускаем первую (стартовую) кавычку
posq := -1; //Позиция финальной кавычки
posc := idx; //Начало поиска
while (posc<length(txt)) do begin
//Ищем до конца строки (худший случай)
if txt[posc]='\' then begin
inc(posc, 2); //Пропускаем esc символ.
continue;
end;
if txt[posc]='"' then begin
posq:=posc;
break;
end;
inc(posc);
end;

if posq<0 then begin
//Не нали :(
result := false;
//idx := length(txt); нужно или нет???
exit;
end else begin
//Нашли
Result := true;
ws := copy(txt, idx, posq-idx);
inc(idx, length(ws)+1);
end;

//Старый код ошибался на квотированныйх строках или строках с эскэйп последовательностью, типа {"b":"m:\\"}
ws := strSpecialChars(ws);

js := TlkJSONstring.Create;
{$ifdef USE_D2009}
js.FValue := UTF8ToString(ws);
{$else}
js.FValue := UTF8Decode(ws);
{$endif}
add_child(o, TlkJSONbase(js));
ridx := idx;
//[END] changed by Lucefer 20090610
end;

lost last char in the string

Anonymous — Thu, 04 Jun 2009 22:02:06 -0000

function strSpecialChars(const s: string): string;
must have
until j > length(s);
but not a
until j >= length(s)

Lucefer

(much) faster js_string Parse

Joao Inacio — Mon, 17 Mar 2008 17:38:12 -0000

I have replaced the js_string function in TlkJSON.ParseText with a modified version, speed increase in the 1.02 'test' app is about 100%.

sorry for the non-patch format.