diff --git a/packages/fcl-json/src/fpjson.pp b/packages/fcl-json/src/fpjson.pp index 71e94abf76..aba5347b7e 100644 --- a/packages/fcl-json/src/fpjson.pp +++ b/packages/fcl-json/src/fpjson.pp @@ -51,7 +51,7 @@ type TJSONCharType = AnsiChar; PJSONCharType = ^TJSONCharType; TJSONVariant = variant; - TFPJSStream = TStream; + TFPJSStream = TMemoryStream; {$else} TJSONCharType = char; TJSONVariant = jsvalue; diff --git a/packages/pastojs/src/pas2jscompiler.pp b/packages/pastojs/src/pas2jscompiler.pp index 0275611e06..654ff7bfe6 100644 --- a/packages/pastojs/src/pas2jscompiler.pp +++ b/packages/pastojs/src/pas2jscompiler.pp @@ -4231,7 +4231,7 @@ const begin LastCharStart:=p; {$IFDEF FPC_HAS_CPSTRING} - Len:=UTF8CharacterStrictLength(p); + Len:=UTF8CharacterStrictLength(@s[p]); if Len=0 then Len:=1; inc(p,Len); {$ELSE} @@ -4333,11 +4333,11 @@ begin {$IFDEF HasPas2jsFiler} if PrecompileFormats.Count>0 then begin - l(' -JU : Create precompiled units in format x.'); + w(' -JU : Create precompiled units in format x.'); for i:=0 to PrecompileFormats.Count-1 do with PrecompileFormats[i] do - l(' -JU'+Ext+' : '+Description); - l(' -JU- : Disable prior -JU option. Do not create precompiled units.'); + w(' -JU'+Ext+' : '+Description); + w(' -JU- : Disable prior -JU option. Do not create precompiled units.'); end; {$ENDIF} w(' -l : Write logo'); diff --git a/utils/pas2js/nodepas2js.pp b/utils/pas2js/nodepas2js.pp index 2607628d68..579eb604a4 100644 --- a/utils/pas2js/nodepas2js.pp +++ b/utils/pas2js/nodepas2js.pp @@ -13,4 +13,5 @@ uses begin // Your code here + end.