Browse Source

fcl-passrc: fixed tests

git-svn-id: trunk@42518 -
Mattias Gaertner 6 years ago
parent
commit
e141899299
2 changed files with 4 additions and 4 deletions
  1. 2 2
      packages/fcl-passrc/src/pasresolver.pp
  2. 2 2
      packages/pastojs/src/fppas2js.pp

+ 2 - 2
packages/fcl-passrc/src/pasresolver.pp

@@ -5833,7 +5833,7 @@ begin
     exit;
     end;
   if El.DestType.Parent=El then
-    RaiseNotYetImplemented(20180429094237,El.DestType,'pointer of anonymous type');
+    RaiseMsg(20180429094237,nNotYetImplemented,sNotYetImplemented,['pointer of anonymous type'], El.DestType);
   CheckUseAsType(El.DestType,20190123095118,El);
   CheckPointerCycle(El);
 end;
@@ -18229,7 +18229,7 @@ var
   NewScopeCnt: Integer;
 begin
   NewScopeCnt:=FScopeCount;
-  while (NewScopeCnt>0) and (FScopes[NewScopeCnt] is TPasSubExprScope) do
+  while (NewScopeCnt>0) and (FScopes[NewScopeCnt-1] is TPasSubExprScope) do
     dec(NewScopeCnt);
   Result:=StashScopes(NewScopeCnt);
 end;

+ 2 - 2
packages/pastojs/src/fppas2js.pp

@@ -4906,12 +4906,12 @@ begin
     end;
 
   // search for TIName
-  ResetSubExprScopes(ScopeDepth);
+  ScopeDepth:=StashSubExprScopes;
   FindData:=Default(TPRFindData);
   FindData.ErrorPosEl:=Params;
   Abort:=false;
   IterateElements(TIName,@OnFindFirst,@FindData,Abort);
-  RestoreSubExprScopes(ScopeDepth);
+  RestoreStashedScopes(ScopeDepth);
   {$IFDEF VerbosePas2JS}
   writeln('TPas2JSResolver.BI_TypeInfo_OnGetCallResult TIName="',TIName,'" FindData.Found="',GetObjName(FindData.Found),'"');
   {$ENDIF}