|
@@ -2176,7 +2176,7 @@ implementation
|
|
|
hpp := cordconstnode.create(1,tcallparanode(left).left.resulttype,false);
|
|
hpp := cordconstnode.create(1,tcallparanode(left).left.resulttype,false);
|
|
|
end;
|
|
end;
|
|
|
if (tcallparanode(left).left.resulttype.def.deftype=pointerdef) then
|
|
if (tcallparanode(left).left.resulttype.def.deftype=pointerdef) then
|
|
|
- inserttypeconv_internal(hpp,ptrinttype);
|
|
|
|
|
|
|
+ inserttypeconv_internal(hpp,sinttype);
|
|
|
{ make sure we don't call functions part of the left node twice (and generally }
|
|
{ make sure we don't call functions part of the left node twice (and generally }
|
|
|
{ optimize the code generation) }
|
|
{ optimize the code generation) }
|
|
|
if node_complexity(tcallparanode(left).left) > 1 then
|
|
if node_complexity(tcallparanode(left).left) > 1 then
|
|
@@ -2199,6 +2199,7 @@ implementation
|
|
|
else
|
|
else
|
|
|
hpp := caddnode.create(subn,hp,hpp);
|
|
hpp := caddnode.create(subn,hp,hpp);
|
|
|
{ assign result of addition }
|
|
{ assign result of addition }
|
|
|
|
|
+ inserttypeconv_internal(hpp,hp.resulttype);
|
|
|
addstatement(newstatement,cassignmentnode.create(hp.getcopy,hpp));
|
|
addstatement(newstatement,cassignmentnode.create(hp.getcopy,hpp));
|
|
|
{ deallocate the temp }
|
|
{ deallocate the temp }
|
|
|
if assigned(tempnode) then
|
|
if assigned(tempnode) then
|
peter