Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add 'word'..'word' support to ranges #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add 'word'..'word' support to ranges #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d6e732
Add support for 'wordchar'..'wordchar' ranges
tehmoth Jun 6, 2014
dcba006
jemplate with update to Jemplate/Directive
tehmoth Jun 13, 2014
0e2ba08
Merge remote-tracking branch 'upstream/master'
tehmoth Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions jemplate
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ package Number::Compare;
use strict;
use Carp qw(croak);
use vars qw/$VERSION/;
$VERSION = '0.03';
$VERSION = '0.01';

sub new {
my $referent = shift;
Expand All @@ -59,7 +59,7 @@ sub parse_to_perl {

my $comparison = $1 || '==';
my $target = $2;
my $magnitude = $3 || '';
my $magnitude = $3;
$target *= 1000 if lc $magnitude eq 'k';
$target *= 1024 if lc $magnitude eq 'ki';
$target *= 1000000 if lc $magnitude eq 'm';
Expand Down Expand Up @@ -10370,9 +10370,16 @@ sub _attempt_range_expand_val ($) {
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+$/;
if ($from =~ m{^(["'])\w+\1$} && $to =~ m{(["'])\w+\1$}) {
(undef, $from) = $from =~ m{^(["'])(\w+)\1$};
(undef, $to ) = $to =~ m{^(["'])(\w+)\1$};
return join '', '[', join( ',', map("'$_'", ($from .. $to) ) ), ']';
} elsif ($from =~ m/^-?\d+$/ && $to =~ m/^-?\d+$/) {
return join '', '[', join( ',', $from .. $to ), ']';
} else {
die "Range expansion is current only supported for positive/negative integer values ([ 1 .. 10 ]) and word characters ('a'..'z')(\nCannot expand: $val";
}

return join '', '[', join( ',', $from .. $to ), ']';
}


Expand Down
12 changes: 10 additions & 2 deletions lib/Jemplate/Directive.pm
View file
Open in desktop
Expand Up @@ -40,14 +40,22 @@ $block
}

# Try to do 1 .. 10 expansions
# and 'word'..'otherword' expansions
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+$/;
if ($from =~ m{^(["'])\w+\1$} && $to =~ m{(["'])\w+\1$}) {
(undef, $from) = $from =~ m{^(["'])(\w+)\1$};
(undef, $to ) = $to =~ m{^(["'])(\w+)\1$};
return join '', '[', join( ',', map("'$_'", ($from .. $to) ) ), ']';
} elsif ($from =~ m/^-?\d+$/ && $to =~ m/^-?\d+$/) {
return join '', '[', join( ',', $from .. $to ), ']';
} else {
die "Range expansion is current only supported for positive/negative integer values ([ 1 .. 10 ]) and word characters ('a'..'z')(\nCannot expand: $val";
}

return join '', '[', join( ',', $from .. $to ), ']';
}

#------------------------------------------------------------------------
Expand Down