* improved last commit, better handling of boolean expressions

git-svn-id: trunk@48885 -
This commit is contained in:
florian 2021-03-06 14:55:50 +00:00
parent 62bd0068b6
commit f448603970

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 (cs_full_boolean_eval in current_settings.localswitches)) 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)