Synchronize with C++ snapshot - 2 small fixes in Decompiler.

tmcdos · Jul 22, 2016 · 4204b5a · 4204b5a
1 parent 3d6b9e2
commit 4204b5a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Decompiler.pas b/Decompiler.pas
@@ -7289,15 +7289,15 @@ function TDecompiler.DecompileTry(fromAdr:Integer; flags:TDecomCset; loopInfo:TL
     begin
       Env.Stack[item1.IntValue]._Type := 'Variant';
       item1 := Env.Stack[item1.IntValue];
-      CompInfo.L := item1.Name;
     end;
+    CompInfo.L := item1.Name;
     GetRegItem(18, item2); //edx - Right argument
     if IF_STACK_PTR in item2.Flags then
     begin
       Env.Stack[item2.IntValue]._Type := 'Variant';
       item2 := Env.Stack[item2.IntValue];
-      CompInfo.R := item2.Name;
     end;
+    CompInfo.R := item2.Name;
     Result:=true;
     Exit;
   end
@@ -7329,9 +7329,8 @@ function TDecompiler.DecompileTry(fromAdr:Integer; flags:TDecomCset; loopInfo:TL
       Env.Stack[item1.IntValue]._Type := 'Variant';
       item1 := Env.Stack[item1.IntValue];
     end;
-    line:=item1.Name + ' := Variant(' + FPop.Value + ')'; //FGet(0)
+    line:=item1.Name + ' := Variant(' + FPop.Value + ')';
     Env.AddToBody(line);
-    FPop;
     Exit;
   end
   else if SameText(name, '@VarFromReal') then

diff --git a/Idr.dof b/Idr.dof
@@ -115,7 +115,7 @@ AutoIncBuild=0
 MajorVer=1
 MinorVer=1
 Release=0
-Build=1338
+Build=1339
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=1251
 [Version Info Keys]
 CompanyName=
 FileDescription=
-FileVersion=1.1.0.1338
+FileVersion=1.1.0.1339
 InternalName=
 LegalCopyright=
 LegalTrademarks=

diff --git a/Idr.res b/Idr.res