pastojs: fixed a.call(typeinfo())

git-svn-id: trunk@38720 -

packages/pastojs/src/fppas2js.pp

@@ -3204,6 +3204,7 @@ var
   jbt: TPas2jsBaseType;
   TypeEl: TPasType;
   FoundClass: TPasClassType;
+  ScopeDepth: Integer;
 begin
   Param:=Params.Params[0];
   ComputeElement(Param,ParamResolved,[rcNoImplicitProc]);
@@ -3302,6 +3303,7 @@ begin
         TIName:=Pas2JSBuiltInNames[pbitnTIEnum];
       end;
     end;
+  //writeln('TPas2JSResolver.BI_TypeInfo_OnGetCallResult TIName=',TIName);
   if TIName='' then
     begin
     {$IFDEF VerbosePas2JS}
@@ -3311,10 +3313,12 @@ begin
     end;
 
   // search for TIName
+  ResetSubScopes(ScopeDepth);
   FindData:=Default(TPRFindData);
   FindData.ErrorPosEl:=Params;
   Abort:=false;
   IterateElements(TIName,@OnFindFirstElement,@FindData,Abort);
+  RestoreSubScopes(ScopeDepth);
   {$IFDEF VerbosePas2JS}
   writeln('TPas2JSResolver.BI_TypeInfo_OnGetCallResult TIName="',TIName,'" FindData.Found="',GetObjName(FindData.Found),'"');
   {$ENDIF}

packages/pastojs/tests/tcmodules.pas

@@ -18392,6 +18392,7 @@ begin
   'begin',
   '  t:=TypeInfo(Self);',
   '  t:=TypeInfo(Result);',
+  '  t:=TypeInfo(TObject);',
   'end;',
   'class function TObject.ClassType: TClass;',
   'var t: TTypeInfoClass;',
@@ -18424,6 +18425,7 @@ begin
     '    var t = null;',
     '    t = this.$rtti;',
     '    t = Result.$rtti;',
+    '    t = $mod.$rtti["TObject"];',
     '    return Result;',
     '  };',
     '  this.ClassType = function () {',
@@ -18461,12 +18463,15 @@ begin
   '  end;',
   '  TTypeInfo = class external name ''rtl.tTypeInfo'' end;',
   '  TTypeInfoInterface = class external name ''rtl.tTypeInfoInterface''(TTypeInfo) end;',
+  'procedure DoIt(t: TTypeInfoInterface); begin end;',
   'var',
   '  i: IBird;',
   '  t: TTypeInfoInterface;',
   'begin',
   '  t:=TypeInfo(IBird);',
   '  t:=TypeInfo(i);',
+  '  DoIt(t);',
+  '  DoIt(TypeInfo(IBird));',
   '']);
   ConvertProgram;
   CheckSource('TestRTTI_Interface_Corba',
@@ -18493,12 +18498,16 @@ begin
     '    $r.addProperty("Item", 3, rtl.longint, "GetItem", "SetItem");',
     '  }',
     ');',
+    'this.DoIt = function (t) {',
+    '};    ',
     'this.i = null;',
     'this.t = null;',
     '']),
     LinesToStr([ // $mod.$main
     '$mod.t = $mod.$rtti["IBird"];',
     '$mod.t = $mod.i.$rtti;',
+    '$mod.DoIt($mod.t);',
+    '$mod.DoIt($mod.$rtti["IBird"]);',
     '']));
 end;
 

packages/pastojs/tests/tcprecompile.pas

@@ -385,6 +385,8 @@ begin
 end;
 
 Initialization
+  {$IFDEF EnablePas2jsPrecompiled}
   RegisterTests([TTestCLI_Precompile]);
+  {$ENDIF}
 end.