mattias 5 дней назад
Родитель
Сommit
66123763f7

+ 1 - 12
packages/pastojs/src/fppas2js.pp

@@ -14894,7 +14894,7 @@ function TPasToJSConverter.ConvertBuiltIn_InsertArray(El: TParamsExpr;
 // ->  AnArray=rtl.arrayInsert(item,AnArray,position);
 // ->  AnArray=rtl.arrayInsert(item,AnArray,position);
 //   for array of COM interface: rtl.arrayInsert(item,AnArray,position,"R");
 //   for array of COM interface: rtl.arrayInsert(item,AnArray,position,"R");
 var
 var
-  Call, SubCall: TJSCallExpression;
+  Call: TJSCallExpression;
   AssignSt: TJSSimpleAssignStatement;
   AssignSt: TJSSimpleAssignStatement;
   aResolver: TPas2JSResolver;
   aResolver: TPas2JSResolver;
   Param: TPasExpr;
   Param: TPasExpr;
@@ -19823,7 +19823,6 @@ var
   VarType: TPasType;
   VarType: TPasType;
   AssignSt: TJSSimpleAssignStatement;
   AssignSt: TJSSimpleAssignStatement;
   C: TClass;
   C: TClass;
-  ElClass: TPasClassType;
   Call: TJSCallExpression;
   Call: TJSCallExpression;
 begin
 begin
   // add instance members
   // add instance members
@@ -22115,22 +22114,12 @@ end;
 procedure TPasToJSConverter.AddInterfaceReleases(FuncContext: TFunctionContext;
 procedure TPasToJSConverter.AddInterfaceReleases(FuncContext: TFunctionContext;
   PosEl: TPasElement);
   PosEl: TPasElement);
 // add the interface release object $ir
 // add the interface release object $ir
-var
-  aResolver: TPas2JSResolver;
-
-  function IsArray(aType: TPasType): boolean;
-  begin
-    aType:=aResolver.ResolveAliasType(aType);
-    Result:=aType is TPasArrayType;
-  end;
-
 var
 var
   i: Integer;
   i: Integer;
   P: TPasElement;
   P: TPasElement;
   Call: TJSCallExpression;
   Call: TJSCallExpression;
   VarSt: TJSVariableStatement;
   VarSt: TJSVariableStatement;
 begin
 begin
-  aResolver:=FuncContext.Resolver;
   if FuncContext.IntfExprReleaseCount>0 then
   if FuncContext.IntfExprReleaseCount>0 then
     begin
     begin
     // add in front of try..finally "var $ir = rtl.createIntfRefs();"
     // add in front of try..finally "var $ir = rtl.createIntfRefs();"

+ 3 - 2
packages/pastojs/src/pas2jscompiler.pp

@@ -2443,6 +2443,7 @@ Var
   LibModuleName : String;
   LibModuleName : String;
 begin
 begin
   Handled:=true;
   Handled:=true;
+  if Sender=nil then ;
   if aLibOptions<>'' then
   if aLibOptions<>'' then
     ParamFatal('[20210919141030] linklib options not supported');
     ParamFatal('[20210919141030] linklib options not supported');
 
 
@@ -3046,8 +3047,8 @@ begin
         Exc:=Exception(TObject(obj));
         Exc:=Exception(TObject(obj));
         {$ifdef NodeJS}
         {$ifdef NodeJS}
         {AllowWriteln}
         {AllowWriteln}
-        if Exc.NodeJSError<>nil then
-          writeln(Exc.NodeJSError.stack);
+        if Exc.JSError<>nil then
+          writeln(Exc.JSError.stack);
         {AllowWriteln-}
         {AllowWriteln-}
         {$endif}
         {$endif}
         Log.Log(mtFatal,Msg+': ('+Exc.ClassName+') '+Exc.Message);
         Log.Log(mtFatal,Msg+': ('+Exc.ClassName+') '+Exc.Message);

+ 0 - 1
packages/pastojs/src/pas2jsfileutils.pp

@@ -816,7 +816,6 @@ begin
   if Position<=length(List) then inc(Position); // skip Delimiter
   if Position<=length(List) then inc(Position); // skip Delimiter
 end;
 end;
 
 
-
 procedure IncreaseChangeStamp(var Stamp: TChangeStamp);
 procedure IncreaseChangeStamp(var Stamp: TChangeStamp);
 begin
 begin
   if Stamp<High(TChangeStamp) then
   if Stamp<High(TChangeStamp) then

+ 1 - 0
packages/pastojs/src/pas2jsfscompiler.pp

@@ -158,6 +158,7 @@ var
 begin
 begin
   CurFile:=FileCache.FindFile(aFilename);
   CurFile:=FileCache.FindFile(aFilename);
   Result:=(CurFile=nil) or (not CurFile.AllowSrcMap);
   Result:=(CurFile=nil) or (not CurFile.AllowSrcMap);
+  if Sender=nil then ;
 end;
 end;
 
 
 procedure TPas2jsFSCompiler.SetWorkingDir(const aDir: String);
 procedure TPas2jsFSCompiler.SetWorkingDir(const aDir: String);

+ 2 - 5
packages/pastojs/src/pas2jslogger.pp

@@ -50,9 +50,6 @@ uses
   {$IFDEF NodeJS}
   {$IFDEF NodeJS}
   Node.FS,
   Node.FS,
   {$ENDIF}
   {$ENDIF}
-  {$IFDEF HASFILESYSTEM}
-  Pas2jsFileUtils,
-  {$ENDIF}
   {$ENDIF}
   {$ENDIF}
   pas2jsutils,
   pas2jsutils,
   Types, Classes, SysUtils,
   Types, Classes, SysUtils,
@@ -1006,9 +1003,9 @@ procedure TPas2jsLogger.LogExceptionBackTrace(E: Exception);
 {$IFDEF Pas2js}
 {$IFDEF Pas2js}
 begin
 begin
   {$IFDEF NodeJS}
   {$IFDEF NodeJS}
-  if (E<>nil) and (E.NodeJSError<>nil) then
+  if (E<>nil) and (E.JSError<>nil) then
     {AllowWriteln}
     {AllowWriteln}
-    writeln(E.NodeJSError.Stack);
+    writeln(E.JSError.Stack);
     {AllowWriteln-}
     {AllowWriteln-}
   {$ENDIF}
   {$ENDIF}
 end;
 end;