X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2F_Util.pm;fp=lib%2FDBIx%2FClass%2F_Util.pm;h=02de9a6ddad6381627994f681c69c8bdfbc68abf;hb=b5ce6748f58040ca877fd05e8f004b14d46b2ba9;hp=a77f8a31fa6b8ea1005e4199f7dfa192f5a93243;hpb=5f35ba0fbddfcfe22694f8deff22da4db4f01846;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/_Util.pm b/lib/DBIx/Class/_Util.pm index a77f8a3..02de9a6 100644 --- a/lib/DBIx/Class/_Util.pm +++ b/lib/DBIx/Class/_Util.pm @@ -52,13 +52,11 @@ use DBIx::Class::Carp '^DBIx::Class|^DBICTest'; 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 ); @@ -168,47 +166,6 @@ sub modver_gt_or_eq ($$) { eval { $mod->VERSION($ver) } ? 1 : 0; } -sub is_literal_value ($) { - ( - ref $_[0] eq 'SCALAR' - or - ( ref $_[0] eq 'HASH' and keys %{$_[0]} == 1 and defined $_[0]->{-ident} and ! length ref $_[0]->{-ident} ) - 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;