Skip to content

Commit

Permalink
Merge pull request #2790 from vrurg/issue_2786
Browse files Browse the repository at this point in the history 
Make all operators in Real require definite objects
  • Loading branch information
@lizmat
lizmat committed Mar 24, 2019
2 parents c26ca6b + d8ad622 commit 888cf8c
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 32 deletions.
36 changes: 18 additions & 18 deletions src/core/Real.pm6
View file
Expand Up @@ -132,42 +132,42 @@ my role Real does Numeric {
}

proto sub cis($, *%) {*}
multi sub cis(Real $a) { $a.cis }
multi sub cis(Real:D $a) { $a.cis }

multi sub infix:<+>(Real \a, Real \b) { a.Bridge + b.Bridge }
multi sub infix:<+>(Real:D \a, Real:D \b) { a.Bridge + b.Bridge }

multi sub infix:<->(Real \a, Real \b) { a.Bridge - b.Bridge }
multi sub infix:<->(Real:D \a, Real:D \b) { a.Bridge - b.Bridge }

multi sub infix:<*>(Real \a, Real \b) { a.Bridge * b.Bridge }
multi sub infix:<*>(Real:D \a, Real:D \b) { a.Bridge * b.Bridge }

multi sub infix:</>(Real \a, Real \b) { a.Bridge / b.Bridge }
multi sub infix:</>(Real:D \a, Real:D \b) { a.Bridge / b.Bridge }

multi sub infix:<%>(Real \a, Real \b) { a.Bridge % b.Bridge }
multi sub infix:<%>(Real:D \a, Real:D \b) { a.Bridge % b.Bridge }

multi sub infix:<**>(Real \a, Real \b) { a.Bridge ** b.Bridge }
multi sub infix:<**>(Real:D \a, Real:D \b) { a.Bridge ** b.Bridge }

multi sub infix:«<=>»(Real \a, Real \b) { a.Bridge <=> b.Bridge }
multi sub infix:«<=>»(Real:D \a, Real:D \b) { a.Bridge <=> b.Bridge }

multi sub infix:<==>(Real \a, Real \b) { a.Bridge == b.Bridge }
multi sub infix:<==>(Real:D \a, Real:D \b) { a.Bridge == b.Bridge }

multi sub infix:«<»(Real \a, Real \b) { a.Bridge < b.Bridge }
multi sub infix:«<»(Real:D \a, Real:D \b) { a.Bridge < b.Bridge }

multi sub infix:«<=»(Real \a, Real \b) { a.Bridge <= b.Bridge }
multi sub infix:«<=»(Real:D \a, Real:D \b) { a.Bridge <= b.Bridge }

multi sub infix:«>»(Real \a, Real \b) { a.Bridge > b.Bridge }
multi sub infix:«>»(Real:D \a, Real:D \b) { a.Bridge > b.Bridge }

multi sub infix:«>=»(Real \a, Real \b) { a.Bridge >= b.Bridge }
multi sub infix:«>=»(Real:D \a, Real:D \b) { a.Bridge >= b.Bridge }

multi sub prefix:<->(Real:D \a) { -a.Bridge }

# NOTE: According to the spec, infix:<mod> is "Not coercive,
# so fails on differing types." Thus no casts here.
proto sub infix:<mod>($, $, *%) is pure {*}
multi sub infix:<mod>(Real $a, Real $b) {
multi sub infix:<mod>(Real:D $a, Real:D $b) {
$a - ($a div $b) * $b;
}

multi sub abs(Real \a) {
multi sub abs(Real:D \a) {
a < 0 ?? -a !! a;
}

Expand All @@ -177,13 +177,13 @@ multi sub truncate(Cool:D $x) { $x.Numeric.truncate }


proto sub atan2($, $?, *%) {*}
multi sub atan2(Real \a, Real \b = 1e0) { a.Bridge.atan2(b.Bridge) }
multi sub atan2(Real:D \a, Real:D \b = 1e0) { a.Bridge.atan2(b.Bridge) }
# should really be (Cool, Cool), and then (Cool, Real) and (Real, Cool)
# candidates, but since Int both conforms to Cool and Real, we'd get lots
# of ambiguous dispatches. So just go with (Any, Any) for now.
multi sub atan2( \a, \b = 1e0) { a.Numeric.atan2(b.Numeric) }
multi sub atan2(Any:D \a, Any:D \b = 1e0) { a.Numeric.atan2(b.Numeric) }

proto sub unpolar($, $, *%) {*}
multi sub unpolar(Real $mag, Real $angle) { $mag.unpolar($angle) }
multi sub unpolar(Real:D $mag, Real:D $angle) { $mag.unpolar($angle) }

# vim: ft=perl6 expandtab sw=4
33 changes: 19 additions & 14 deletions t/05-messages/02-errors.t
View file
Expand Up @@ -211,47 +211,52 @@ throws-like ｢Set.new(1..300)<42> = 42｣,
subtest 'cannot use Int type object as an operand' => {
plan 14;

CONTROL {
when CX::Warn {
die $_
}
}
throws-like ｢(1/1)+Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'A Rational instance cannot be added by an Int type object';
throws-like ｢Int+(1/1)｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int type object cannot be added by a Rational instance';
throws-like ｢(1/1)-Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'A Rational instance cannot be subtracted by an Int type object';
throws-like ｢Int-(1/1)｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int type object cannot be subtracted by a Rational instance';
throws-like ｢(1/1)*Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'A Rational instance cannot be multiplied by an Int type object';
throws-like ｢Int*(1/1)｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int type object cannot be multiplied by a Rational instance';
throws-like ｢(1/1)/Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'A Rational instance cannot be divided by an Int type object';
throws-like ｢Int/(1/1)｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int type object cannot be divided by a Rational instance';
throws-like ｢Int/Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int type object cannot be divided by an Int type object';
throws-like ｢Int/1｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int type object cannot be divided by an Int instance';
throws-like ｢1/Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int instance cannot be divided by an Int type object';
throws-like ｢(1/1)%Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'A Rational instance modulo an Int type object is incalculable';
throws-like ｢Int%(1/1)｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'An Int type object modulo a Rational instance is incalculable';
throws-like ｢(1/1)**Int｣,
X::Parameter::InvalidConcreteness,
CX::Warn,
'A Rational instance cannot be powered by an Int type object';
}

Expand Down

0 comments on commit 888cf8c

Please sign in to comment.