Fixed rt56956 with test case

DIV operator broken (Agent Zhang)

Changes

@@ -1,3 +1,9 @@
+---
+version: 0.261
+date: Tuesday April 27 09:35:06 PDT 2010
+changes:
+- Fixed rt56956 with test case - DIV operator broken (Agent Zhang)
+
 ---
 version: 0.260
 date: Monday April 26 12:03:40 PDT 2010

MANIFEST

@@ -97,6 +97,7 @@ t/9bug/53453-make-Jemplate-slice-like-TT-slice.t
 t/9bug/53454-array-range-operator.t
 t/9bug/37570-list-for-lists.t
 t/9bug/43809-capture-implementation.t
+t/9bug/56965-DIV-operator-broken.t
 tests/Makefile
 tests/README
 tests/bin/daemon

README

@@ -1,5 +1,5 @@
 VERSION
-    Version 0.260
+    Version 0.261
 
 NAME
     Jemplate - JavaScript Templating with Template Toolkit

bin/jemplate

@@ -10300,6 +10300,16 @@ $block
 ...
 }
 
+sub _attempt_range_expand_val ($) {
+    my $val = shift;
+    return $val unless
+        my ( $from, $to ) = $val =~ m/\s*\[\s*(\S+)\s*\.\.\s*(\S+)\s*\]/;
+
+    die "Range expansion is current supported for positive/negative integer values only (e.g. [ 1 .. 10 ])\nCannot expand: $val" unless $from =~ m/^-?\d+$/ && $to =~ m/^-?\d+$/;
+
+    return join '', '[', join( ',', $from .. $to ), ']';
+}
+
 
 sub textblock {
     my ($class, $text) = @_;
@@ -10356,6 +10366,7 @@ sub assign {
             $var = '[' . join(', ', @$var) . ']';
         }
     }
+    $val =  _attempt_range_expand_val $val;
     $val .= ', 1' if $default;
     return "stash.set($var, $val)";
 }
@@ -10494,6 +10505,8 @@ sub foreach {
         $loop_restore = 'stash = context.delocalise()';
     }
 
+    $list = _attempt_range_expand_val $list;
+
     return <<EOF;
 
 // FOREACH 
@@ -10806,7 +10819,27 @@ EOF
 }
 
 sub capture {
-    return "throw('CAPTURE not yet supported in Jemplate');";
+    my ($class, $name, $block) = @_;
+
+    if (ref $name) {
+        if (scalar @$name == 2 && ! $name->[1]) {
+            $name = $name->[0];
+        }
+        else {
+            $name = '[' . join(', ', @$name) . ']';
+        }
+    }
+
+    return <<EOF;
+
+// CAPTURE
+(function() {
+	var output = '';
+	$block
+	stash.set($name, output);
+})();
+EOF
+
 }   
 
 BEGIN {
@@ -16692,7 +16725,7 @@ sub
 	[#Rule 137
 		 'expr', 3,
 sub
-{ "int($_[1] / $_[3])"                }
+{ "Math.floor($_[1] / $_[3])"                }
 	],
 	[#Rule 138
 		 'expr', 3,
@@ -19843,7 +19876,7 @@ use Template 2.14;
 use Getopt::Long;
 
 
-our $VERSION = '0.25';
+our $VERSION = '0.260';
 
 use Jemplate::Parser;
 

lib/Jemplate.pm

@@ -7,11 +7,11 @@ use Getopt::Long;
 
 =head1 VERSION
 
-Version 0.260
+Version 0.261
 
 =cut
 
-our $VERSION = '0.260';
+our $VERSION = '0.261';
 
 use Jemplate::Parser;
 

lib/Jemplate/Grammar.pm

@@ -6010,7 +6010,7 @@ sub
 		 'expr', 3,
 sub
 #line 358 "Parser.yp"
-{ "int($_[1] / $_[3])"                }
+{ "Math.floor($_[1] / $_[3])"                }
 	],
 	[#Rule 138
 		 'expr', 3,

src/parser/Parser.yp

@@ -355,7 +355,7 @@ item:	    IDENT		    { "'$_[1]'"                           }
 expr:	    expr BINOP expr	    { "$_[1] $_[2] $_[3]"                 }
 	|   expr '/' expr	    { "$_[1] $_[2] $_[3]"                 }
 	|   expr '+' expr	    { "$_[1] $_[2] $_[3]"                 }
-	|   expr DIV expr	    { "int($_[1] / $_[3])"                }
+	|   expr DIV expr	    { "Math.floor($_[1] / $_[3])"                }
 	|   expr MOD expr	    { "$_[1] % $_[3]"                     }
 	|   expr CMPOP expr	    { "$_[1] $CMPOP{ $_[2] } $_[3]"       }
 	|   expr CAT expr	    { "$_[1]  + $_[3]"                    }

t/9bug/56965-DIV-operator-broken.t

@@ -0,0 +1,36 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Test::More;
+
+BEGIN {
+    plan skip_all => "JavaScript::V8x::TestMoreish not available" unless eval { require JavaScript::V8x::TestMoreish };
+}
+
+plan qw/no_plan/;
+
+use Jemplate;
+use Jemplate::Runtime;
+
+use JavaScript::V8x::TestMoreish;
+
+my $jemplate = Jemplate->new;
+my @js;
+
+push @js, $jemplate->compile_template_content( <<_END_, 't0' );
+[% BLOCK t1 %][% 3 DIV 2 %][% END %]
+[% BLOCK t2 %][% 4 DIV 2 %][% END %]
+[% BLOCK t3 %][% 5 DIV 2 %][% END %]
+_END_
+
+test_js_eval( Jemplate::Runtime->kernel );
+test_js_eval( join "\n", @js, "1;" );
+test_js <<'_END_';
+
+areEqual( Jemplate.process( 't1' ), 1 );
+areEqual( Jemplate.process( 't2' ), 2 );
+areEqual( Jemplate.process( 't3' ), 2 );
+
+_END_