1.1 --- a/lib/operator/binary.py Fri Mar 24 19:07:01 2017 +0100
1.2 +++ b/lib/operator/binary.py Fri Mar 24 22:08:50 2017 +0100
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 Operator support.
1.6
1.7 -Copyright (C) 2010, 2013, 2015, 2016 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2010, 2013, 2015, 2016, 2017 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -20,6 +20,9 @@
1.13 """
1.14
1.15 from operator.core import binary_op, is_, is_not
1.16 +from native import int_add, int_div, int_mod, int_mul, int_pow, int_sub, \
1.17 + int_and, int_not, int_or, int_xor, \
1.18 + is_int
1.19
1.20 # These functions defer method lookup by wrapping the attribute access in
1.21 # lambda functions. Thus, the appropriate methods are defined locally, but no
1.22 @@ -28,15 +31,21 @@
1.23 # Binary operator functions.
1.24
1.25 def add(a, b):
1.26 + if is_int(a) and is_int(b):
1.27 + return int_add(a, b)
1.28 return binary_op(a, b, lambda a: a.__add__, lambda b: b.__radd__)
1.29
1.30 def and_(a, b):
1.31 + if is_int(a) and is_int(b):
1.32 + return int_and(a, b)
1.33 return binary_op(a, b, lambda a: a.__and__, lambda b: b.__rand__)
1.34
1.35 def contains(a, b):
1.36 return in_(b, a)
1.37
1.38 def div(a, b):
1.39 + if is_int(a) and is_int(b):
1.40 + return int_div(a, b)
1.41 return binary_op(a, b, lambda a: a.__div__, lambda b: b.__rdiv__)
1.42
1.43 def floordiv(a, b):
1.44 @@ -52,24 +61,36 @@
1.45 return binary_op(a, b, lambda a: a.__lshift__, lambda b: b.__rlshift__)
1.46
1.47 def mod(a, b):
1.48 + if is_int(a) and is_int(b):
1.49 + return int_mod(a, b)
1.50 return binary_op(a, b, lambda a: a.__mod__, lambda b: b.__rmod__)
1.51
1.52 def mul(a, b):
1.53 + if is_int(a) and is_int(b):
1.54 + return int_mul(a, b)
1.55 return binary_op(a, b, lambda a: a.__mul__, lambda b: b.__rmul__)
1.56
1.57 def or_(a, b):
1.58 + if is_int(a) and is_int(b):
1.59 + return int_or(a, b)
1.60 return binary_op(a, b, lambda a: a.__or__, lambda b: b.__ror__)
1.61
1.62 def pow(a, b):
1.63 + if is_int(a) and is_int(b):
1.64 + return int_pow(a, b)
1.65 return binary_op(a, b, lambda a: a.__pow__, lambda b: b.__rpow__)
1.66
1.67 def rshift(a, b):
1.68 return binary_op(a, b, lambda a: a.__rshift__, lambda b: b.__rrshift__)
1.69
1.70 def sub(a, b):
1.71 + if is_int(a) and is_int(b):
1.72 + return int_sub(a, b)
1.73 return binary_op(a, b, lambda a: a.__sub__, lambda b: b.__rsub__)
1.74
1.75 def xor(a, b):
1.76 + if is_int(a) and is_int(b):
1.77 + return int_xor(a, b)
1.78 return binary_op(a, b, lambda a: a.__xor__, lambda b: b.__rxor__)
1.79
1.80 # vim: tabstop=4 expandtab shiftwidth=4