# regexes are applied in order, thus push after user-defines
push @{$opt{special_ops}}, @BUILTIN_SPECIAL_OPS;
+ if ($class->isa('DBIx::Class::SQLMaker')) {
+ push @{$opt{special_ops}}, our $DBIC_Compat_Op ||= {
+ regex => qr/^(?:ident|value)$/i, handler => sub { die "NOPE" }
+ };
+ $opt{is_dbic_sqlmaker} = 1;
+ }
+
# unary operators
$opt{unary_ops} ||= [];
^ \s* go \s
/xmi;
- $opt{node_types} = +{
- map +("-$_" => '_render_'.$_),
- qw(op func value bind ident literal)
+ $opt{render} = {
+ (map +("-$_", "_render_$_"), qw(op func bind ident literal list)),
+ %{$opt{render}||{}}
};
$opt{expand_unary} = {};
+ $opt{expand} = {
+ -ident => '_expand_ident',
+ -value => '_expand_value',
+ -not => '_expand_not',
+ -bool => sub {
+ my ($self, undef, $v) = @_;
+ if (ref($v)) {
+ return $self->_expand_expr($v);
+ }
+ puke "-bool => undef not supported" unless defined($v);
+ return $self->_expand_ident(-ident => $v);
+ },
+ };
+
return bless \%opt, $class;
}
my $f = $options->{returning};
- my ($sql, @bind) = $self->_render_expr(
+ my ($sql, @bind) = $self->render_aqt(
$self->_expand_maybe_list_expr($f, undef, -ident)
);
return wantarray
sub _insert_value {
my ($self, $column, $v) = @_;
- return $self->_render_expr(
+ return $self->render_aqt(
$self->_expand_insert_value($column, $v)
);
}
return +{ -bind => [ $column, undef ] };
}
local our $Cur_Col_Meta = $column;
- return $self->_expand_expr($v);
+ return $self->expand_expr($v);
}
sub _update_set_values {
my ($self, $data) = @_;
- return $self->_render_expr(
+ return $self->render_aqt(
$self->_expand_update_set_values($data),
);
}
map {
my ($k, $set) = @$_;
$set = { -bind => $_ } unless defined $set;
- +{ -op => [ '=', { -ident => $k }, $set ] };
+ +{ -op => [ '=', $self->_expand_ident(-ident => $k), $set ] };
}
map {
my $k = $_;
sub _select_fields {
my ($self, $fields) = @_;
return $fields unless ref($fields);
- return $self->_render_expr(
+ return $self->render_aqt(
$self->_expand_maybe_list_expr($fields, undef, '-ident')
);
}
return wantarray ? ($sql, @bind) : $sql;
}
-sub _expand_expr {
- my ($self, $expr, $logic, $default_scalar_to) = @_;
+sub expand_expr {
+ my ($self, $expr, $default_scalar_to) = @_;
local our $Default_Scalar_To = $default_scalar_to if $default_scalar_to;
+ $self->_expand_expr($expr);
+}
+
+sub render_aqt {
+ my ($self, $aqt) = @_;
+ my ($k, $v, @rest) = %$aqt;
+ die "No" if @rest;
+ if (my $meth = $self->{render}{$k}) {
+ return $self->$meth($v);
+ }
+ die "notreached: $k";
+}
+
+sub render_expr {
+ my ($self, $expr) = @_;
+ $self->render_aqt($self->expand_expr($expr));
+}
+
+sub _expand_expr {
+ my ($self, $expr, $logic) = @_;
our $Expand_Depth ||= 0; local $Expand_Depth = $Expand_Depth + 1;
return undef unless defined($expr);
if (ref($expr) eq 'HASH') {
- if (keys %$expr > 1) {
+ return undef unless my $kc = keys %$expr;
+ if ($kc > 1) {
$logic ||= 'and';
return +{ -op => [
$logic,
- map $self->_expand_expr_hashpair($_ => $expr->{$_}, $logic),
+ map $self->_expand_expr({ $_ => $expr->{$_} }, $logic),
sort keys %$expr
] };
}
- return unless %$expr;
- return $self->_expand_expr_hashpair(%$expr, $logic);
+ my ($key, $value) = %$expr;
+ if (my $exp = $self->{expand}{$key}) {
+ return $self->$exp($key, $value);
+ }
+ return $self->_expand_expr_hashpair($key, $value, $logic);
}
if (ref($expr) eq 'ARRAY') {
my $logic = lc($logic || $self->{logic});
$logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic";
- my @expr = @$expr;
+ my @expr = grep {
+ (ref($_) eq 'ARRAY' and @$_)
+ or (ref($_) eq 'HASH' and %$_)
+ or 1
+ } @$expr;
my @res;
unless defined($el) and length($el);
my $elref = ref($el);
if (!$elref) {
- push(@res, $self->_expand_expr({ $el, shift(@expr) }));
+ local $Expand_Depth = 0;
+ push(@res, grep defined, $self->_expand_expr({ $el, shift(@expr) }));
} elsif ($elref eq 'ARRAY') {
- push(@res, $self->_expand_expr($el)) if @$el;
+ push(@res, grep defined, $self->_expand_expr($el)) if @$el;
} elsif (my $l = is_literal_value($el)) {
push @res, { -literal => $l };
} elsif ($elref eq 'HASH') {
- push @res, $self->_expand_expr($el);
+ local $Expand_Depth = 0;
+ push @res, grep defined, $self->_expand_expr($el) if %$el;
} else {
die "notreached";
}
}
+ # ???
+ # return $res[0] if @res == 1;
return { -op => [ $logic, @res ] };
}
if (my $literal = is_literal_value($expr)) {
return +{ -literal => $literal };
}
if (!ref($expr) or Scalar::Util::blessed($expr)) {
- if (my $d = $Default_Scalar_To) {
- return +{ $d => $expr };
+ if (my $d = our $Default_Scalar_To) {
+ return $self->_expand_expr({ $d => $expr });
}
if (my $m = our $Cur_Col_Meta) {
return +{ -bind => [ $m, $expr ] };
}
- return +{ -value => $expr };
+ return +{ -bind => [ undef, $expr ] };
}
die "notreached";
}
-my $Nest_Warned = 0;
-
sub _expand_expr_hashpair {
my ($self, $k, $v, $logic) = @_;
unless (defined($k) and length($k)) {
if ($k eq '-nest') {
# DBIx::Class requires a nest warning to be emitted once but the private
# method it overrode to do so no longer exists
- if (ref($self) =~ /^DBIx::Class::SQLMaker/) {
- unless ($Nest_Warned) {
+ if ($self->{is_dbic_sqlmaker}) {
+ unless (our $Nest_Warned) {
belch(
"-nest in search conditions is deprecated, you most probably wanted:\n"
.q|{..., -and => [ \%cond0, \@cond1, \'cond2', \[ 'cond3', [ col => bind ] ], etc. ], ... }|
}
return $self->_expand_expr($v);
}
- if ($k eq '-bool') {
- if (ref($v)) {
- return $self->_expand_expr($v);
- }
- puke "-bool => undef not supported" unless defined($v);
- return { -ident => $v };
- }
- if ($k eq '-not') {
- return { -op => [ 'not', $self->_expand_expr($v) ] };
- }
if (my ($rest) = $k =~/^-not[_ ](.*)$/) {
return +{ -op => [
'not',
- $self->_expand_expr_hashpair("-${rest}", $v, $logic)
+ $self->_expand_expr({ "-${rest}", $v }, $logic)
] };
}
if (my ($logic) = $k =~ /^-(and|or)$/i) {
{
my $op = $k;
$op =~ s/^-// if length($op) > 1;
-
+
# top level special ops are illegal in general
# note that, arguably, if it makes no sense at top level, it also
# makes no sense on the other side of an = sign or similar but DBIC
return { -op => [ $op, $v ] };
}
}
- if ($k eq '-value' and my $m = our $Cur_Col_Meta) {
- return +{ -bind => [ $m, $v ] };
- }
if (my $custom = $self->{expand_unary}{$k}) {
return $self->$custom($v);
}
- if ($self->{node_types}{$k}) {
+ if ($self->{render}{$k}) {
return { $k => $v };
}
if (
and not defined $v->{-value}
)
) {
- return $self->_expand_expr_hashpair($k => { $self->{cmp} => undef });
+ return $self->_expand_expr({ $k => { $self->{cmp} => undef } });
}
if (!ref($v) or Scalar::Util::blessed($v)) {
my $d = our $Default_Scalar_To;
return +{
-op => [
$self->{cmp},
- { -ident => $k },
- ($d ? { $d => $v } : { -bind => [ $k, $v ] })
+ $self->_expand_ident(-ident => $k),
+ ($d
+ ? $self->_expand_expr($d => $v)
+ : { -bind => [ $k, $v ] }
+ )
]
};
}
if (keys %$v > 1) {
return { -op => [
'and',
- map $self->_expand_expr_hashpair($k => { $_ => $v->{$_} }),
+ map $self->_expand_expr({ $k => { $_ => $v->{$_} } }),
sort keys %$v
] };
}
+ return undef unless keys %$v;
my ($vk, $vv) = %$v;
- $vk =~ s/^-//;
- $vk = lc($vk);
- $self->_assert_pass_injection_guard($vk);
- if ($vk =~ s/ [_\s]? \d+ $//x ) {
+ my $op = join ' ', split '_', (map lc, $vk =~ /^-?(.*)$/)[0];
+ $self->_assert_pass_injection_guard($op);
+ if ($op =~ s/ [_\s]? \d+ $//x ) {
belch 'Use of [and|or|nest]_N modifiers is deprecated and will be removed in SQLA v2.0. '
- . "You probably wanted ...-and => [ -$vk => COND1, -$vk => COND2 ... ]";
+ . "You probably wanted ...-and => [ -$op => COND1, -$op => COND2 ... ]";
}
- if ($vk =~ /^(?:not[ _])?between$/) {
+ if ($op =~ /^(?:not )?between$/) {
local our $Cur_Col_Meta = $k;
my @rhs = map $self->_expand_expr($_),
ref($vv) eq 'ARRAY' ? @$vv : $vv;
or
(@rhs == 2 and defined($rhs[0]) and defined($rhs[1]))
) {
- puke "Operator '${\uc($vk)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref";
+ puke "Operator '${\uc($op)}' requires either an arrayref with two defined values or expressions, or a single literal scalarref/arrayref-ref";
}
return +{ -op => [
- join(' ', split '_', $vk),
- { -ident => $k },
+ $op,
+ $self->_expand_ident(-ident => $k),
@rhs
] }
}
- if ($vk =~ /^(?:not[ _])?in$/) {
+ if ($op =~ /^(?:not )?in$/) {
if (my $literal = is_literal_value($vv)) {
my ($sql, @bind) = @$literal;
my $opened_sql = $self->_open_outer_paren($sql);
return +{ -op => [
- $vk, { -ident => $k },
+ $op, $self->_expand_ident(-ident => $k),
[ { -literal => [ $opened_sql, @bind ] } ]
] };
}
my $undef_err =
'SQL::Abstract before v1.75 used to generate incorrect SQL when the '
- . "-${\uc($vk)} operator was given an undef-containing list: !!!AUDIT YOUR CODE "
+ . "-${\uc($op)} operator was given an undef-containing list: !!!AUDIT YOUR CODE "
. 'AND DATA!!! (the upcoming Data::Query-based version of SQL::Abstract '
. 'will emit the logically correct SQL instead of raising this exception)'
;
- puke("Argument passed to the '${\uc($vk)}' operator can not be undefined")
+ puke("Argument passed to the '${\uc($op)}' operator can not be undefined")
if !defined($vv);
my @rhs = map $self->_expand_expr($_),
map { ref($_) ? $_ : { -bind => [ $k, $_ ] } }
map { defined($_) ? $_: puke($undef_err) }
(ref($vv) eq 'ARRAY' ? @$vv : $vv);
- return $self->${\($vk =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs;
+ return $self->${\($op =~ /^not/ ? 'sqltrue' : 'sqlfalse')} unless @rhs;
return +{ -op => [
- join(' ', split '_', $vk),
- { -ident => $k },
+ $op,
+ $self->_expand_ident(-ident => $k),
\@rhs
] };
}
- if ($vk eq 'ident') {
+ if ($op eq 'ident') {
if (! defined $vv or (ref($vv) and ref($vv) eq 'ARRAY')) {
- puke "-$vk requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts";
+ puke "-$op requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts";
}
return +{ -op => [
$self->{cmp},
- { -ident => $k },
- { -ident => $vv }
+ $self->_expand_ident(-ident => $k),
+ $self->_expand_ident(-ident => $vv),
] };
}
- if ($vk eq 'value') {
- return $self->_expand_expr_hashpair($k, undef) unless defined($vv);
+ if ($op eq 'value') {
+ return $self->_expand_expr({ $k, undef }) unless defined($vv);
return +{ -op => [
$self->{cmp},
- { -ident => $k },
+ $self->_expand_ident(-ident => $k),
{ -bind => [ $k, $vv ] }
] };
}
- if ($vk =~ /^is(?:[ _]not)?$/) {
- puke "$vk can only take undef as argument"
+ if ($op =~ /^is(?: not)?$/) {
+ puke "$op can only take undef as argument"
if defined($vv)
and not (
ref($vv) eq 'HASH'
and exists($vv->{-value})
and !defined($vv->{-value})
);
- $vk =~ s/_/ /g;
- return +{ -op => [ $vk.' null', { -ident => $k } ] };
+ return +{ -op => [ $op.' null', $self->_expand_ident(-ident => $k) ] };
}
- if ($vk =~ /^(and|or)$/) {
+ if ($op =~ /^(and|or)$/) {
if (ref($vv) eq 'HASH') {
return +{ -op => [
- $vk,
- map $self->_expand_expr_hashpair($k, { $_ => $vv->{$_} }),
+ $op,
+ map $self->_expand_expr({ $k, { $_ => $vv->{$_} } }),
sort keys %$vv
] };
}
}
- if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{special_ops}}) {
- return { -op => [ $vk, { -ident => $k }, $vv ] };
+ if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) {
+ return { -op => [ $op, $self->_expand_ident(-ident => $k), $vv ] };
}
- if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{unary_ops}}) {
+ if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
return { -op => [
$self->{cmp},
- { -ident => $k },
- { -op => [ $vk, $vv ] }
+ $self->_expand_ident(-ident => $k),
+ { -op => [ $op, $vv ] }
] };
}
if (ref($vv) eq 'ARRAY') {
: (-or => @$vv)
);
if (
- $vk =~ $self->{inequality_op}
- or join(' ', split '_', $vk) =~ $self->{not_like_op}
+ $op =~ $self->{inequality_op}
+ or $op =~ $self->{not_like_op}
) {
if (lc($logic) eq '-or' and @values > 1) {
- my $op = uc join ' ', split '_', $vk;
- belch "A multi-element arrayref as an argument to the inequality op '$op' "
+ belch "A multi-element arrayref as an argument to the inequality op '${\uc($op)}' "
. 'is technically equivalent to an always-true 1=1 (you probably wanted '
. "to say ...{ \$inequality_op => [ -and => \@values ] }... instead)"
;
}
unless (@values) {
# try to DWIM on equality operators
- my $op = join ' ', split '_', $vk;
return
$op =~ $self->{equality_op} ? $self->sqlfalse
: $op =~ $self->{like_op} ? belch("Supplying an empty arrayref to '@{[ uc $op]}' is deprecated") && $self->sqlfalse
}
return +{ -op => [
$logic =~ /^-(.*)$/,
- map $self->_expand_expr_hashpair($k => { $vk => $_ }),
+ map $self->_expand_expr({ $k => { $vk => $_ } }),
@values
] };
}
and not defined $vv->{-value}
)
) {
- my $op = join ' ', split '_', $vk;
my $is =
$op =~ /^not$/i ? 'is not' # legacy
: $op =~ $self->{equality_op} ? 'is'
: $op =~ $self->{inequality_op} ? 'is not'
: $op =~ $self->{not_like_op} ? belch("Supplying an undefined argument to '@{[ uc $op]}' is deprecated") && 'is not'
: puke "unexpected operator '$op' with undef operand";
- return +{ -op => [ $is.' null', { -ident => $k } ] };
+ return +{ -op => [ $is.' null', $self->_expand_ident(-ident => $k) ] };
}
local our $Cur_Col_Meta = $k;
return +{ -op => [
- $vk,
- { -ident => $k },
- $self->_expand_expr($vv)
+ $op,
+ $self->_expand_ident(-ident => $k),
+ $self->_expand_expr($vv)
] };
}
if (ref($v) eq 'ARRAY') {
die "notreached";
}
-sub _render_expr {
- my ($self, $expr) = @_;
- my ($k, $v, @rest) = %$expr;
- die "No" if @rest;
- if (my $meth = $self->{node_types}{$k}) {
- return $self->$meth($v);
+sub _expand_ident {
+ my ($self, undef, $body) = @_;
+ my @parts = map split(/\Q${\($self->{name_sep}||'.')}\E/, $_),
+ ref($body) ? @$body : $body;
+ return { -ident => $parts[-1] } if $self->{_dequalify_idents};
+ unless ($self->{quote_char}) {
+ $self->_assert_pass_injection_guard($_) for @parts;
}
- die "notreached: $k";
+ return +{ -ident => \@parts };
+}
+
+sub _expand_value {
+ +{ -bind => [ our $Cur_Col_Meta, $_[2] ] };
+}
+
+sub _expand_not {
+ +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] };
}
sub _recurse_where {
my ($self, $where, $logic) = @_;
-#print STDERR Data::Dumper::Concise::Dumper([ $where, $logic ]);
-
# Special case: top level simple string treated as literal
my $where_exp = (ref($where)
? $self->_expand_expr($where, $logic)
: { -literal => [ $where ] });
-#print STDERR Data::Dumper::Concise::Dumper([ EXP => $where_exp ]);
-
- # dispatch on appropriate method according to refkind of $where
-# my $method = $self->_METHOD_FOR_refkind("_where", $where_exp);
-
-# my ($sql, @bind) = $self->$method($where_exp, $logic);
-
- my ($sql, @bind) = defined($where_exp) ? $self->_render_expr($where_exp) : (undef);
+ # dispatch expanded expression
+ my ($sql, @bind) = defined($where_exp) ? $self->render_aqt($where_exp) : (undef);
# DBIx::Class used to call _recurse_where in scalar context
# something else might too...
if (wantarray) {
return $self->_convert($self->_quote($ident));
}
-sub _render_value {
- my ($self, $value) = @_;
-
- return ($self->_convert('?'), $self->_bindtype(undef, $value));
-}
-
my %unop_postfix = map +($_ => 1),
'is null', 'is not null',
'asc', 'desc',
unless $low->{-literal};
@{$low->{-literal}}
} else {
- my ($l, $h) = map [ $self->_render_expr($_) ], $low, $high;
+ my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
(join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
@{$l}[1..$#$l], @{$h}[1..$#$h])
}
};
- my ($lhsql, @lhbind) = $self->_render_expr($left);
+ my ($lhsql, @lhbind) = $self->render_aqt($left);
return (
join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'),
@lhbind, @rhbind
my ($lhs, $rhs) = @$args;
my @in_bind;
my @in_sql = map {
- my ($sql, @bind) = $self->_render_expr($_);
+ my ($sql, @bind) = $self->render_aqt($_);
push @in_bind, @bind;
$sql;
} @$rhs;
- my ($lhsql, @lbind) = $self->_render_expr($lhs);
+ my ($lhsql, @lbind) = $self->render_aqt($lhs);
return (
$lhsql.' '.$self->_sqlcase($op).' ( '
.join(', ', @in_sql)
my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}};
if ($us and @args > 1) {
puke "Special op '${op}' requires first value to be identifier"
- unless my ($k) = map $_->{-ident}, grep ref($_) eq 'HASH', $args[0];
+ unless my ($ident) = map $_->{-ident}, grep ref($_) eq 'HASH', $args[0];
+ my $k = join(($self->{name_sep}||'.'), @$ident);
+ local our $Expand_Depth = 1;
return $self->${\($us->{handler})}($k, $op, $args[1]);
}
if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
}
my $final_op = $op =~ /^(?:is|not)_/ ? join(' ', split '_', $op) : $op;
if (@args == 1 and $op !~ /^(and|or)$/) {
- my ($expr_sql, @bind) = $self->_render_expr($args[0]);
+ my ($expr_sql, @bind) = $self->render_aqt($args[0]);
my $op_sql = $self->_sqlcase($final_op);
my $final_sql = (
$unop_postfix{lc($final_op)}
);
return (($op eq 'not' || $us ? '('.$final_sql.')' : $final_sql), @bind);
} else {
- my @parts = map [ $self->_render_expr($_) ], @args;
+ my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @args;
+ return '' unless @parts;
my $is_andor = !!($op =~ /^(and|or)$/);
return @{$parts[0]} if $is_andor and @parts == 1;
my ($final_sql) = map +($is_andor ? "( ${_} )" : $_), join(
- ($final_op eq ',' ? '' : ' ').$self->_sqlcase($final_op).' ',
+ ' '.$self->_sqlcase($final_op).' ',
map $_->[0], @parts
);
return (
die "unhandled";
}
+sub _render_list {
+ my ($self, $list) = @_;
+ my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$list;
+ return join(', ', map $_->[0], @parts), map @{$_}[1..$#$_], @parts;
+}
+
sub _render_func {
my ($self, $rest) = @_;
my ($func, @args) = @$rest;
my @x = @$_;
push @arg_sql, shift @x;
@x
- } map [ $self->_render_expr($_) ], @args;
+ } map [ $self->render_aqt($_) ], @args;
return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind);
}
}
}
my @exp = map +(defined($dir) ? { -op => [ $dir => $_ ] } : $_),
- map $self->_expand_expr($_, undef, -ident),
+ map $self->expand_expr($_, -ident),
map ref($_) eq 'ARRAY' ? @$_ : $_, @to_expand;
- return (@exp > 1 ? { -op => [ ',', @exp ] } : $exp[0]);
+ return (@exp > 1 ? { -list => \@exp } : $exp[0]);
};
local @{$self->{expand_unary}}{qw(-asc -desc)} = (
return '' unless defined(my $expanded = $self->_expand_order_by($arg));
- my ($sql, @bind) = $self->_render_expr($expanded);
+ my ($sql, @bind) = $self->render_aqt($expanded);
+
+ return '' unless length($sql);
my $final_sql = $self->_sqlcase(' order by ').$sql;
sub _chunkify_order_by {
my ($self, $expanded) = @_;
+
+ return grep length, $self->render_aqt($expanded)
+ if $expanded->{-ident} or @{$expanded->{-literal}||[]} == 1;
+
for ($expanded) {
- if (ref() eq 'HASH' and my $op = $_->{-op}) {
- if ($op->[0] eq ',') {
- return map $self->_chunkify_order_by($_), @{$op}[1..$#$op];
- }
+ if (ref() eq 'HASH' and my $l = $_->{-list}) {
+ return map $self->_chunkify_order_by($_), @$l;
}
- return [ $self->_render_expr($_) ];
+ return [ $self->render_aqt($_) ];
}
}
sub _table {
my $self = shift;
my $from = shift;
- ($self->_render_expr(
+ ($self->render_aqt(
$self->_expand_maybe_list_expr($from, undef, -ident)
))[0];
}
my ($self, $expr, $logic, $default) = @_;
my $e = do {
if (ref($expr) eq 'ARRAY') {
- return { -op => [
- ',', map $self->_expand_expr($_, $logic, $default), @$expr
+ return { -list => [
+ map $self->expand_expr($_, $default), @$expr
] } if @$expr > 1;
$expr->[0]
} else {
$expr
}
};
- return $self->_expand_expr($e, $logic, $default);
+ return $self->expand_expr($e, $default);
}
# highly optimized, as it's called way too often
projects / scpubgit/Q-Branch.git / blobdiff