* last commit fixed, hopefully final fix

git-svn-id: trunk@48886 -
This commit is contained in:
florian 2021-03-06 15:03:33 +00:00
parent f448603970
commit 83ce289ea4

View File

@ -1715,7 +1715,7 @@ implementation
(left.resultdef.typ=orddef) and
(left.nodetype=andn) and
(right.nodetype=andn) and
not(is_boolean(resultdef) or not(might_have_sideeffects(self,[mhs_exceptions])) or not(doshortbooleval(self))) and
(not(is_boolean(resultdef)) or not(might_have_sideeffects(self,[mhs_exceptions])) or not(doshortbooleval(self))) and
{ this test is not needed but it speeds up the test and allows to bail out early }
((taddnode(left).left.nodetype=notn) or (taddnode(left).right.nodetype=notn) or
(taddnode(right).left.nodetype=notn) or (taddnode(right).right.nodetype=notn)