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

* Namespaced fcl-json

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-11-26 21:10:52 +01:00
parent eab8c5f3af
commit 8b9c9cd5d6
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/fcl-json/namespaced/FpJson.Data.pp Normal file
View File

@ -0,0 +1,3 @@
{$DEFINE FPC_DOTTEDUNITS}
unit FpJson.Data;
{$include ../src/fpjson.pp}

3
packages/fcl-json/namespaced/FpJson.JS.pp Normal file
View File

@ -0,0 +1,3 @@
{$DEFINE FPC_DOTTEDUNITS}
unit FpJson.JS;
{$include ../src/fpjsonjs.pas}

28
packages/fcl-json/fpjson.pp → packages/fcl-json/src/fpjson.pp
View File

@ -12,22 +12,21 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************} **********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
unit fpjson;
{$ENDIF}
{$mode objfpc} {$mode objfpc}
{$h+} {$h+}
unit fpjson;
interface interface
uses uses
{$IFNDEF PAS2JS} {$IFDEF FPC_DOTTEDUNITS}
variants, JSApi.JS, System.RTLConsts, System.Types, System.SysUtils, System.Classes, System.Contnrs;
{$ENDIF} {$ELSE}
{$IFDEF PAS2JS} JS, RTLConsts, Types, SysUtils, classes, contnrs;
JS, RTLConsts, Types, {$EnDIF}
{$ENDIF}
SysUtils,
classes,
contnrs;
type type
TJSONtype = (jtUnknown, jtNumber, jtString, jtBoolean, jtNull, jtArray, jtObject); TJSONtype = (jtUnknown, jtNumber, jtString, jtBoolean, jtNull, jtArray, jtObject);
@ -798,7 +797,12 @@ Function GetJSONStringParserHandler: TJSONStringParserHandler;
implementation implementation
Uses typinfo; Uses
{$IFDEF FPC_DOTTEDUNITS}
System.Typinfo;
{$ELSE}
typinfo;
{$ENDIF}
Resourcestring Resourcestring
SErrCannotConvertFromNull = 'Cannot convert data from Null value'; SErrCannotConvertFromNull = 'Cannot convert data from Null value';
@ -1906,7 +1910,7 @@ end;
function TJSONNull.GetValue: TJSONVariant; function TJSONNull.GetValue: TJSONVariant;
begin begin
Result:={$IFDEF PAS2JS}js.Null{$else}variants.Null{$ENDIF}; Result:={$IFDEF PAS2JS}{$IFDEF FPC_DOTTEDUNITS}JSApi.{$ENDIF}JS.Null{$else}variants.Null{$ENDIF};
end; end;
procedure TJSONNull.SetValue(const AValue: TJSONVariant); procedure TJSONNull.SetValue(const AValue: TJSONVariant);

13
packages/fcl-json/fpjsonjs.pas → packages/fcl-json/src/fpjsonjs.pas
View File

@ -12,14 +12,20 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
**********************************************************************} **********************************************************************}
{$IFNDEF FPC_DOTTEDUNITS}
unit fpjsonjs; unit fpjsonjs;
{$ENDIF}
{$mode objfpc} {$mode objfpc}
interface interface
uses uses
{$IFDEF FPC_DOTTEDUNITS}
System.Classes, System.Types, FpJson.Data;
{$ELSE}
Classes, Types, fpjson; Classes, Types, fpjson;
{$ENDIF}
Function JSValueToJSONData(aValue : JSValue) : TJSONData; Function JSValueToJSONData(aValue : JSValue) : TJSONData;
Procedure HookGetJSONCallBack; Procedure HookGetJSONCallBack;
@ -27,7 +33,12 @@ Procedure UnHookGetJSONCallBack;
implementation implementation
Uses JS; Uses
{$IFDEF FPC_DOTTEDUNITS}
JSApi.JS;
{$ELSE}
JS;
{$ENDIF}
function JSValueToJSONData(aValue: JSValue): TJSONData; function JSValueToJSONData(aValue: JSValue): TJSONData;