From 0a45bee673aa48c56607eb7f5f06c7a4b6bbca03 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 8 Oct 2012 15:05:02 -0500
Subject: move more code into the compiler

---
 lib/Text/Handlebars/Compiler.pm      | 188 +++++++++++++++++++++++++----------
 lib/Text/Xslate/Syntax/Handlebars.pm |  98 +-----------------
 2 files changed, 143 insertions(+), 143 deletions(-)

diff --git a/lib/Text/Handlebars/Compiler.pm b/lib/Text/Handlebars/Compiler.pm
index 48aa6cc..d4dd232 100644
--- a/lib/Text/Handlebars/Compiler.pm
+++ b/lib/Text/Handlebars/Compiler.pm
@@ -29,7 +29,7 @@ sub _generate_key {
 
     my $var = $node->clone(arity => 'variable');
 
-    return $self->compile_ast($self->_check_lambda($var));
+    return $self->compile_ast($self->check_lambda($var));
 }
 
 sub _generate_key_field {
@@ -38,35 +38,7 @@ sub _generate_key_field {
 
     my $field = $node->clone(arity => 'field');
 
-    return $self->compile_ast($self->_check_lambda($field));
-}
-
-sub _check_lambda {
-    my $self = shift;
-    my ($var) = @_;
-
-    my $parser = $self->parser;
-
-    my $is_code = $parser->symbol('(name)')->clone(
-        arity => 'name',
-        id    => '(is_code)',
-        line  => $var->line,
-    );
-    my $run_code = $parser->symbol('(name)')->clone(
-        arity => 'name',
-        id    => '(run_code)',
-        line  => $var->line,
-    );
-
-    return $parser->make_ternary(
-        $parser->call($is_code, $var->clone),
-        $parser->call(
-            $run_code,
-            $var->clone,
-            $parser->vars,
-        ),
-        $var,
-    );
+    return $self->compile_ast($self->check_lambda($field));
 }
 
 sub _generate_include {
@@ -95,17 +67,9 @@ sub _generate_call {
             }
         }
 
-        my $parser = $self->parser;
+        my $hash = $self->call($node, '(make_hash)', @hash);
 
-        my $make_hash = $parser->symbol('(name)')->clone(
-            arity => 'name',
-            id    => '(make_hash)',
-            line  => $node->line,
-        );
-
-        my $hash = $parser->call($make_hash, @hash);
-
-        unshift @args, $parser->vars;
+        unshift @args, $self->vars;
 
         if ($node->first->arity eq 'call' && $node->first->first->id eq '(make_block_helper)') {
             push @{ $node->first->second }, $hash;
@@ -123,17 +87,9 @@ sub _generate_partial {
     my $self = shift;
     my ($node) = @_;
 
-    my $parser = $self->parser;
-
-    my $find_file = $parser->symbol('(name)')->clone(
-        arity => 'name',
-        id    => '(find_file)',
-        line  => $node->line,
-    );
-
     return $self->compile_ast(
-        $parser->make_ternary(
-            $parser->call($find_file, $node->first->clone),
+        $self->make_ternary(
+            $self->call($node, '(find_file)', $node->first->clone),
             $node->clone(
                 arity => 'include',
                 id    => 'include',
@@ -158,6 +114,138 @@ sub _generate_for {
     );
 }
 
+sub _generate_block {
+    my $self = shift;
+    my ($node) = @_;
+
+    my $name = $node->first;
+    my %block = %{ $node->second };
+
+    if ($name->arity eq 'call') {
+        return $self->compile_ast(
+            $name->clone(
+                first => $self->call(
+                    $node,
+                    '(make_block_helper)',
+                    $name->first,
+                    $block{if}{raw_text}->clone,
+                    ($block{else}
+                        ? $block{else}{raw_text}->clone
+                        : $self->parser->literal('')),
+                ),
+            ),
+        );
+    }
+
+    my $iterations = $self->make_ternary(
+        $self->call($node, '(is_falsy)', $name->clone),
+        $self->call($node, '(make_array)', $self->parser->literal(1)),
+        $self->make_ternary(
+            $self->call($node, '(is_array)', $name->clone),
+            $name->clone,
+            $self->call($node, '(make_array)', $self->parser->literal(1)),
+        ),
+    );
+
+    my $loop_var = $self->parser->symbol('(loop_var)')->clone(arity => 'variable');
+
+    my $body_block = [
+        $self->make_ternary(
+            $self->call($node, '(is_falsy)', $name->clone),
+            $name->clone(
+                arity  => 'block_body',
+                first  => undef,
+                second => [ $block{else}{body} ],
+            ),
+            $name->clone(
+                arity  => 'block_body',
+                first  => [
+                    $self->call(
+                        $node,
+                        '(new_vars_for)',
+                        $self->vars,
+                        $name->clone,
+                        $self->iterator_index,
+                    ),
+                ],
+                second => [ $block{if}{body} ],
+            ),
+        ),
+    ];
+
+    my $var = $name->clone(arity => 'variable');
+    return $self->compile_ast(
+        $self->make_ternary(
+            $self->call($node, '(is_code)', $var->clone),
+            $self->call(
+                $node,
+                '(run_code)',
+                $var->clone,
+                $self->vars,
+                $block{if}{open_tag}->clone,
+                $block{if}{close_tag}->clone,
+                $block{if}{raw_text}->clone,
+            ),
+            $self->parser->symbol('(for)')->clone(
+                arity  => 'for',
+                first  => $iterations,
+                second => [$loop_var],
+                third  => $body_block,
+            ),
+        ),
+    );
+}
+
+sub call {
+    my $self = shift;
+    my ($node, $name, @args) = @_;
+
+    my $code = $self->parser->symbol('(name)')->clone(
+        arity => 'name',
+        id    => $name,
+        line  => $node->line,
+    );
+
+    return $self->parser->call($code, @args);
+}
+
+sub make_ternary {
+    my $self = shift;
+    my ($if, $then, $else) = @_;
+    return $self->parser->symbol('?:')->clone(
+        arity  => 'if',
+        first  => $if,
+        second => $then,
+        third  => $else,
+    );
+}
+
+sub vars {
+    my $self = shift;
+    return $self->parser->symbol('(vars)')->clone(arity => 'vars');
+}
+
+sub iterator_index {
+    my $self = shift;
+
+    return $self->parser->symbol('(iterator)')->clone(
+        arity => 'iterator',
+        id    => '$~(loop_var)',
+        first => $self->parser->symbol('(loop_var)')->clone,
+    ),
+}
+
+sub check_lambda {
+    my $self = shift;
+    my ($var) = @_;
+
+    return $self->make_ternary(
+        $self->call($var, '(is_code)', $var->clone),
+        $self->call($var, '(run_code)', $var->clone, $self->vars),
+        $var,
+    );
+}
+
 __PACKAGE__->meta->make_immutable;
 no Any::Moose;
 
diff --git a/lib/Text/Xslate/Syntax/Handlebars.pm b/lib/Text/Xslate/Syntax/Handlebars.pm
index d90f7c2..54e7447 100644
--- a/lib/Text/Xslate/Syntax/Handlebars.pm
+++ b/lib/Text/Xslate/Syntax/Handlebars.pm
@@ -405,74 +405,12 @@ sub std_block {
 
     $self->advance(';');
 
-    if ($name->arity eq 'call') {
-        $name = $name->clone(
-            first => $self->call(
-                '(make_block_helper)',
-                $name->first,
-                $block{if}{raw_text}->clone,
-                ($block{else}
-                    ? $block{else}{raw_text}->clone
-                    : $self->literal('')),
-            ),
-        );
-        return $self->print_raw($name);
-    }
-
-    my $iterations = $self->make_ternary(
-        $self->call('(is_falsy)', $name->clone),
-        $self->call('(make_array)', $self->literal(1)),
-        $self->make_ternary(
-            $self->call('(is_array)', $name->clone),
-            $name->clone,
-            $self->call('(make_array)', $self->literal(1)),
-        ),
-    );
-
-    my $loop_var = $self->symbol('(loop_var)')->clone(arity => 'variable');
-
-    my $body_block = [
-        $self->make_ternary(
-            $self->call('(is_falsy)', $name->clone),
-            $symbol->clone(
-                arity  => 'block_body',
-                first  => undef,
-                second => [ $block{else}{body} ],
-            ),
-            $symbol->clone(
-                arity  => 'block_body',
-                first  => [
-                    $self->call(
-                        '(new_vars_for)',
-                        $self->vars,
-                        $name->clone,
-                        $self->iterator_index,
-                    ),
-                ],
-                second => [ $block{if}{body} ],
-            ),
-        ),
-    ];
-
-    my $var = $name->clone(arity => 'variable');
     return $self->print_raw(
-        $self->make_ternary(
-            $self->call('(is_code)', $var->clone),
-            $self->call(
-                '(run_code)',
-                $var->clone,
-                $self->vars,
-                $block{if}{open_tag}->clone,
-                $block{if}{close_tag}->clone,
-                $block{if}{raw_text}->clone,
-            ),
-            $self->symbol('(for)')->clone(
-                arity  => 'for',
-                first  => $iterations,
-                second => [$loop_var],
-                third  => $body_block,
-            ),
-        )
+        $name->clone(
+            arity  => 'block',
+            first  => $name,
+            second => \%block,
+        ),
     );
 }
 
@@ -629,43 +567,17 @@ sub make_field_lookup {
     );
 }
 
-sub make_ternary {
-    my $self = shift;
-    my ($if, $then, $else) = @_;
-    return $self->symbol('?:')->clone(
-        arity  => 'if',
-        first  => $if,
-        second => $then,
-        third  => $else,
-    );
-}
-
 sub print_raw {
     my $self = shift;
     return $self->print(@_)->clone(id => 'print_raw');
 }
 
-sub vars {
-    my $self = shift;
-    return $self->symbol('(vars)')->clone(arity => 'vars');
-}
-
 sub literal {
     my $self = shift;
     my ($value) = @_;
     return $self->symbol('(literal)')->clone(id => $value);
 }
 
-sub iterator_index {
-    my $self = shift;
-
-    return $self->symbol('(iterator)')->clone(
-        arity => 'iterator',
-        id    => '$~(loop_var)',
-        first => $self->symbol('(loop_var)')->clone,
-    ),
-}
-
 sub _field_to_string {
     my $self = shift;
     my ($symbol) = @_;
-- 
cgit v1.2.3