Commit 8368e533 authored by Stefan Behnel's avatar Stefan Behnel

fix constant folding for repeated negation

parent 68421a13
......@@ -3025,20 +3025,27 @@ class ConstantFolding(Visitor.VisitorTransform, SkipDeclarations):
return node
def _handle_UnaryMinusNode(self, node):
def _negate(value):
if value.startswith('-'):
value = value[1:]
else:
value = '-' + value
return value
if isinstance(node.operand, ExprNodes.LongNode):
return ExprNodes.LongNode(node.pos, value = '-' + node.operand.value,
constant_result = node.constant_result)
return ExprNodes.LongNode(node.pos, value=_negate(node.operand.value),
constant_result=node.constant_result)
if isinstance(node.operand, ExprNodes.FloatNode):
# this is a safe operation
return ExprNodes.FloatNode(node.pos, value = '-' + node.operand.value,
constant_result = node.constant_result)
return ExprNodes.FloatNode(node.pos, value=_negate(node.operand.value),
constant_result=node.constant_result)
node_type = node.operand.type
if node_type.is_int and node_type.signed or \
isinstance(node.operand, ExprNodes.IntNode) and node_type.is_pyobject:
return ExprNodes.IntNode(node.pos, value = '-' + node.operand.value,
type = node_type,
longness = node.operand.longness,
constant_result = node.constant_result)
return ExprNodes.IntNode(node.pos, value=_negate(node.operand.value),
type=node_type,
longness=node.operand.longness,
constant_result=node.constant_result)
return node
def _handle_UnaryPlusNode(self, node):
......
# mode: run
# tag: constant_folding
import cython
@cython.test_fail_if_path_exists(
"//UnaryMinusNode",
"//UnaryPlusNode",
)
def unop_floats():
"""
>>> unop_floats()
(1.0, -1.0, 1.0, -1.0, -1.0)
"""
plus1 = + 1.0
minus1 = - 1.0
plus3 = +++ 1.0
minus3 = --- 1.0
mix = +-++-- 1.0
return plus1, minus1, plus3, minus3, mix
@cython.test_fail_if_path_exists(
"//UnaryMinusNode",
"//UnaryPlusNode",
)
def unop_ints():
"""
>>> unop_ints()
(1, -1, 1, -1, -1)
"""
plus1 = + 1
minus1 = - 1
plus3 = +++ 1
minus3 = --- 1
mix = +-++-- 1
return plus1, minus1, plus3, minus3, mix
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment