use Carp 'croak';
use Scalar::Util qw(weaken blessed reftype);
use List::Util qw(first);
-use overload ();
use base 'Exporter';
our @EXPORT_OK = qw(
sigwarn_silencer modver_gt_or_eq fail_on_internal_wantarray
refdesc refcount hrefaddr is_exception
- is_plain_value is_literal_value
UNRESOLVABLE_CONDITION
);
if (defined $suberror) {
if (length (my $class = blessed($e) )) {
carp_unique( sprintf(
- 'External exception object %s implements partial (broken) '
- . 'overloading preventing it from being used in simple ($x eq $y) '
+ 'External exception class %s implements partial (broken) overloading '
+ . 'preventing its instances from being used in simple ($x eq $y) '
. 'comparisons. Given Perl\'s "globally cooperative" exception '
. 'handling this type of brokenness is extremely dangerous on '
. 'exception objects, as it may (and often does) result in silent '
. 'to the one shown at %s, in order to ensure your exception handling '
. 'is saner application-wide. What follows is the actual error text '
. "as generated by Perl itself:\n\n%s\n ",
- refdesc $e,
+ $class,
$class,
'http://v.gd/DBIC_overload_tempfix/',
$suberror,
eval { $mod->VERSION($ver) } ? 1 : 0;
}
-sub is_literal_value ($) {
- (
- ref $_[0] eq 'SCALAR'
- or
- ( ref $_[0] eq 'REF' and ref ${$_[0]} eq 'ARRAY' )
- ) ? 1 : 0;
-}
-
-# FIXME XSify - this can be done so much more efficiently
-sub is_plain_value ($) {
- no strict 'refs';
- (
- # plain scalar
- (! length ref $_[0])
- or
- (
- blessed $_[0]
- and
- # deliberately not using Devel::OverloadInfo - the checks we are
- # intersted in are much more limited than the fullblown thing, and
- # this is a relatively hot piece of code
- (
- # FIXME - DBI needs fixing to stringify regardless of DBD
- #
- # either has stringification which DBI SHOULD prefer out of the box
- #first { *{$_ . '::(""'}{CODE} } @{ mro::get_linear_isa( ref $_[0] ) }
- overload::Method($_[0], '""')
- or
- # has nummification and fallback is *not* disabled
- (
- $_[1] = first { *{"${_}::(0+"}{CODE} } @{ mro::get_linear_isa( ref $_[0] ) }
- and
- ( ! defined ${"$_[1]::()"} or ${"$_[1]::()"} )
- )
- )
- )
- ) ? 1 : 0;
-}
-
{
my $list_ctx_ok_stack_marker;
- sub fail_on_internal_wantarray {
+ sub fail_on_internal_wantarray () {
return if $list_ctx_ok_stack_marker;
if (! defined wantarray) {
$cf++;
}
+ my ($fr, $want, $argdesc);
+ {
+ package DB;
+ $fr = [ caller($cf) ];
+ $want = ( caller($cf-1) )[5];
+ $argdesc = ref $DB::args[0]
+ ? DBIx::Class::_Util::refdesc($DB::args[0])
+ : 'non '
+ ;
+ };
+
if (
- (caller($cf))[0] =~ /^(?:DBIx::Class|DBICx::)/
+ $want and $fr->[0] =~ /^(?:DBIx::Class|DBICx::)/
) {
DBIx::Class::Exception->throw( sprintf (
- "Improper use of %s instance in list context at %s line %d\n\n\tStacktrace starts",
- refdesc($_[0]), (caller($cf))[1,2]
+ "Improper use of %s instance in list context at %s line %d\n\n Stacktrace starts",
+ $argdesc, @{$fr}[1,2]
), 'with_stacktrace');
}