Merge branch 'cclass'

Author: jnthn

src/QRegex/P6Regex/Actions.nqp

@@ -412,19 +412,42 @@ class QRegex::P6Regex::Actions is HLL::Actions {
         else {
             my @alts;
             for $<charspec> {
-                if $_<backslash> {
-                    my $bs := $_<backslash>.ast;
-                    $bs.negate(!$bs.negate) if $<sign> eq '-';
-                    @alts.push($bs);
-                }
-                elsif $_[1] {
-                    my $ord0 := nqp::ord($_[0]);
-                    my $ord1 := nqp::ord($_[1][0]);
+                if $_[1] {
+                    my $node;
+                    my $lhs;
+                    my $rhs;
+                    if $_[0]<backslash> {
+                        $node := $_[0]<backslash>.ast;
+                        $/.CURSOR.panic("Illegal range endpoint in regex: " ~ ~$_)
+                            if $node.rxtype ne 'literal' && $node.rxtype ne 'enumcharlist'
+                                || $node.negate || nqp::chars($node[0]) != 1;
+                        $lhs := $node[0];
+                    }
+                    else {
+                        $lhs := ~$_[0][0];
+                    }
+                    if $_[1][0]<backslash> {
+                        $node := $_[1][0]<backslash>.ast;
+                        $/.CURSOR.panic("Illegal range endpoint in regex: " ~ ~$_)
+                            if $node.rxtype ne 'literal' && $node.rxtype ne 'enumcharlist'
+                                || $node.negate || nqp::chars($node[0]) != 1;
+                        $rhs := $node[0];
+                    }
+                    else {
+                        $rhs := ~$_[1][0][0];
+                    }
+                    my $ord0 := nqp::ord($lhs);
+                    my $ord1 := nqp::ord($rhs);
                     $/.CURSOR.panic("Illegal reversed character range in regex: " ~ ~$_)
                         if $ord0 > $ord1;
                     $str := nqp::concat($str, nqp::chr($ord0++)) while $ord0 <= $ord1;
                 }
-                else { $str := $str ~ $_[0]; }
+                elsif $_[0]<backslash> {
+                    my $bs := $_[0]<backslash>.ast;
+                    $bs.negate(!$bs.negate) if $<sign> eq '-';
+                    @alts.push($bs);
+                }
+                else { $str := $str ~ ~$_[0]; }
             }
             @alts.push(QAST::Regex.new( $str, :rxtype<enumcharlist>, :node($/), :negate( $<sign> eq '-' ) ))
                 if nqp::chars($str);

src/QRegex/P6Regex/Grammar.nqp

@@ -201,8 +201,11 @@ grammar QRegex::P6Regex::Grammar is HLL::Grammar {
         [
         | '[' $<charspec>=(
                   || \s* '-' <!before \s* ']'> <.obs: '- as character range','.. for range, for explicit - in character class, escape it or place as last thing'>
-                  || \s* '\\' <backslash>
-                  || \s* (<-[\]\\]>) [ \s* '..' \s* (.) ]?
+                  || \s* ( '\\' <backslash> || (<-[\]\\]>) )
+                     [
+                         \s* '..' \s*
+                         ( '\\' <backslash> || (<-[\]\\]>) )
+                     ]?
               )*
           \s* ']'
         | $<name>=[\w+]