[Bast-commits] r9712 - in SQL-Abstract/1.x/trunk: lib/SQL/Abstract t

[frew at dev.catalyst.perl.org]

Author: frew
Date: 2010-09-10 05:14:55 +0100 (Fri, 10 Sep 2010)
New Revision: 9712

Added:
   SQL-Abstract/1.x/trunk/t/15callerlog.t
Modified:
   SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Tree.pm
Log:
initial start of warn-style caller info

Modified: SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Tree.pm
===================================================================
--- SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Tree.pm	2010-09-10 04:13:12 UTC (rev 9711)
+++ SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Tree.pm	2010-09-10 04:14:55 UTC (rev 9712)
@@ -29,6 +29,7 @@
 
 __PACKAGE__->mk_group_accessors( simple => $_ ) for qw(
    newline indent_string indent_amount colormap indentmap fill_in_placeholders
+   include_caller caller_depth
 );
 
 # Parser states for _recurse_parse()
@@ -122,6 +123,7 @@
 
 my %profiles = (
    console => {
+      caller_depth => 0,
       fill_in_placeholders => 1,
       indent_string => ' ',
       indent_amount => 2,
@@ -130,6 +132,7 @@
       indentmap     => { %indents },
    },
    console_monochrome => {
+      caller_depth => 0,
       fill_in_placeholders => 1,
       indent_string => ' ',
       indent_amount => 2,
@@ -138,6 +141,7 @@
       indentmap     => { %indents },
    },
    html => {
+      caller_depth => 0,
       fill_in_placeholders => 1,
       indent_string => ' ',
       indent_amount => 2,
@@ -332,7 +336,7 @@
    my ($self, $bindargs) = @_;
 
    if ($self->fill_in_placeholders) {
-      my $val = pop @{$bindargs};
+      my $val = pop @{$bindargs} || '';
       $val =~ s/\\/\\\\/g;
       $val =~ s/'/\\'/g;
       return qq('$val')
@@ -340,10 +344,21 @@
    return '?'
 }
 
+sub _caller_info {
+   my ($self, $depth) = @_;
+
+   return '' if $depth != 1 or !$self->include_caller;
+
+   my @caller_info = caller($self->caller_depth + 0);
+
+   " at $caller_info[1] line $caller_info[2].";
+}
+
 sub unparse {
-  my ($self, $tree, $bindargs, $depth) = @_;
+  my ($self, $tree, $bindargs, $indent, $depth) = @_;
 
-  $depth ||= 0;
+  $depth  ||= 0;
+  $indent ||= 0;
 
   if (not $tree ) {
     return '';
@@ -353,7 +368,7 @@
   my $cdr = $tree->[1];
 
   if (ref $car) {
-    return join ('', map $self->unparse($_, $bindargs, $depth), @$tree);
+    return join ('', map $self->unparse($_, $bindargs, $indent, $depth + 1), @$tree);
   }
   elsif ($car eq 'LITERAL') {
     if ($cdr->[0] eq '?') {
@@ -364,15 +379,15 @@
   elsif ($car eq 'PAREN') {
     return '(' .
       join(' ',
-        map $self->unparse($_, $bindargs, $depth + 2), @{$cdr}) .
-    ($self->_is_key($cdr)?( $self->newline||'' ).$self->indent($depth + 1):'') . ') ';
+        map $self->unparse($_, $bindargs, $indent + 2, $depth + 1), @{$cdr}) .
+    ($self->_is_key($cdr)?( $self->newline||'' ).$self->indent($indent + 1):'') . ') ';
   }
   elsif ($car eq 'OR' or $car eq 'AND' or (grep { $car =~ /^ $_ $/xi } @binary_op_keywords ) ) {
-    return join (" $car ", map $self->unparse($_, $bindargs, $depth), @{$cdr});
+    return join (" $car ", map $self->unparse($_, $bindargs, $indent, $depth + 1), @{$cdr});
   }
   else {
-    my ($l, $r) = @{$self->whitespace($car, $depth)};
-    return sprintf "$l%s %s$r", $self->format_keyword($car), $self->unparse($cdr, $bindargs, $depth);
+    my ($l, $r) = @{$self->whitespace($car, $indent)};
+    return sprintf "$l%s %s$r%s", $self->format_keyword($car), $self->unparse($cdr, $bindargs, $indent, $depth + 1), $self->_caller_info($depth);
   }
 }
 

Added: SQL-Abstract/1.x/trunk/t/15callerlog.t
===================================================================
--- SQL-Abstract/1.x/trunk/t/15callerlog.t	                        (rev 0)
+++ SQL-Abstract/1.x/trunk/t/15callerlog.t	2010-09-10 04:14:55 UTC (rev 9712)
@@ -0,0 +1,26 @@
+use strict;
+use warnings;
+
+use Test::More;
+use SQL::Abstract::Tree;
+
+my $tree = SQL::Abstract::Tree->new({
+   include_caller => 1,
+   caller_depth   => 0,
+});
+
+my $tree2 = SQL::Abstract::Tree->new({
+   include_caller => 1,
+   caller_depth   => 1,
+});
+my $out = $tree->_caller_info(1);
+ok $out =~ /callerlog/ && $out =~ /line 16/, 'caller info is right for basic test';
+
+my $o2;
+sub lolz { $o2 = $tree2->_caller_info(1) }
+
+lolz;
+ok $o2 =~ /callerlog/ && $o2 =~ /line 22/, 'caller info is right for more nested test';
+
+ok !$tree2->_caller_info(2), 'caller info is blank unless arg == 1';
+done_testing;