Преглед на файлове

pastojs: fixed compilation

git-svn-id: trunk@40075 -
Mattias Gaertner преди 6 години
родител
ревизия
60eb591844
променени са 3 файла, в които са добавени 6 реда и са изтрити 5 реда
  1. 1 1
      packages/fcl-json/src/fpjson.pp
  2. 4 4
      packages/pastojs/src/pas2jscompiler.pp
  3. 1 0
      utils/pas2js/nodepas2js.pp

+ 1 - 1
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;

+ 4 - 4
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<x> : Create precompiled units in format x.');
+    w('   -JU<x> : 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<x> option. Do not create precompiled units.');
+        w('     -JU'+Ext+' : '+Description);
+    w('     -JU- : Disable prior -JU<x> option. Do not create precompiled units.');
   end;
   {$ENDIF}
   w('  -l      : Write logo');

+ 1 - 0
utils/pas2js/nodepas2js.pp

@@ -13,4 +13,5 @@ uses
 
 begin
   // Your code here
+
 end.