|
@@ -3691,7 +3691,7 @@ implementation
|
|
end;
|
|
end;
|
|
{ Setup the first procdef as best, only count it as a result
|
|
{ Setup the first procdef as best, only count it as a result
|
|
when it is valid }
|
|
when it is valid }
|
|
- if FCandidateProcs^.invalid then
|
|
|
|
|
|
+ if besthpstart^.invalid then
|
|
cntpd:=0
|
|
cntpd:=0
|
|
else
|
|
else
|
|
cntpd:=1;
|
|
cntpd:=1;
|
|
@@ -3701,7 +3701,9 @@ implementation
|
|
restart := decide_restart(hp,besthpstart);
|
|
restart := decide_restart(hp,besthpstart);
|
|
if not restart then
|
|
if not restart then
|
|
begin
|
|
begin
|
|
- if not singlevariant then
|
|
|
|
|
|
+ if besthpstart^.invalid then res := 1
|
|
|
|
+ else if hp^.invalid then res := -1
|
|
|
|
+ else if not singlevariant then
|
|
res:=is_better_candidate(hp,besthpstart)
|
|
res:=is_better_candidate(hp,besthpstart)
|
|
else
|
|
else
|
|
res:=is_better_candidate_single_variant(hp,besthpstart);
|
|
res:=is_better_candidate_single_variant(hp,besthpstart);
|
|
@@ -3721,7 +3723,10 @@ implementation
|
|
end;
|
|
end;
|
|
{ besthpstart is already set to hp }
|
|
{ besthpstart is already set to hp }
|
|
bestpd:=besthpstart^.data;
|
|
bestpd:=besthpstart^.data;
|
|
- cntpd:=1;
|
|
|
|
|
|
+ if besthpstart^.invalid then
|
|
|
|
+ cntpd:=0
|
|
|
|
+ else
|
|
|
|
+ cntpd:=1;
|
|
end
|
|
end
|
|
else if (res<0) then
|
|
else if (res<0) then
|
|
begin
|
|
begin
|