From: Matt S Trout <mst@shadowcat.co.uk>
Date: Mon, 1 Apr 2019 04:16:09 +0000 (+0000)
Subject: clean up row and op expansion to methods
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ec595dd86b56a94b396ae852cd7f540eb0cd5846;p=scpubgit%2FQ-Branch.git

clean up row and op expansion to methods
---

diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm
index cf70129..2004c71 100644
--- a/lib/SQL/Abstract.pm
+++ b/lib/SQL/Abstract.pm
@@ -201,17 +201,10 @@ sub new {
     -bind => sub { shift; +{ @_ } },
     -in => '_expand_in',
     -not_in => '_expand_in',
-    -row => sub {
-      my ($self, $node, $args) = @_;
-      +{ $node => [ map $self->expand_expr($_), @$args ] };
-    },
+    -row => '_expand_row',
     -between => '_expand_between',
     -not_between => '_expand_between',
-    -op => sub {
-      my ($self, $node, $args) = @_;
-      my ($op, @opargs) = @$args;
-      +{ $node => [ $op, map $self->expand_expr($_), @opargs ] };
-    },
+    -op => '_expand_op',
     (map +($_ => '_expand_op_is'), ('-is', '-is_not')),
     -ident => '_expand_ident',
     -value => '_expand_value',
@@ -910,6 +903,17 @@ sub _expand_not {
   +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] };
 }
 
+sub _expand_row {
+  my ($self, $node, $args) = @_;
+  +{ $node => [ map $self->expand_expr($_), @$args ] };
+}
+
+sub _expand_op {
+  my ($self, $node, $args) = @_;
+  my ($op, @opargs) = @$args;
+  +{ $node => [ $op, map $self->expand_expr($_), @opargs ] };
+}
+
 sub _expand_bool {
   my ($self, undef, $v) = @_;
   if (ref($v)) {