From c43ea6e0eb4e6f7cd303f6efef477f433b50a3f1 Mon Sep 17 00:00:00 2001
From: pmichaud <pmichaud@pobox.com>
Date: Wed, 9 Dec 2009 09:38:55 -0600
Subject: [PATCH] Add enumerated character lists to ARE.

---
 src/ARE/Actions.pm | 15 +++++++++++++++
 src/ARE/Grammar.pm |  6 ++++++
 2 files changed, 21 insertions(+)

diff --git a/src/ARE/Actions.pm b/src/ARE/Actions.pm
index 7ebfe67..de982c8 100644
--- a/src/ARE/Actions.pm
+++ b/src/ARE/Actions.pm
@@ -72,6 +72,21 @@ method metachar:sym<.>($/) {
 
 method metachar:sym<back>($/) { make $<backslash>.ast; }
 
+method metachar:sym<[>($/) {
+    my $str := '';
+    for $<charspec> {
+        if $_[1] {
+            my $a := pir::ord($_[0]);
+            my $b := pir::ord(~$_[1][0]);
+            while $a < $b { $str := $str ~ pir::chr($a); $a++; }
+        }
+        else { $str := $str ~ $_[0]; }
+    }
+    my $past := PAST::Regex.new( $str, :pasttype<enumcharlist>, :node($/) );
+    $past.negate( $<invert> gt '' );
+    make $past;
+}
+
 method backslash:sym<w>($/) {
     make PAST::Regex.new( :pasttype<charclass>, :subtype(~$<sym>), :node($/));
 }
diff --git a/src/ARE/Grammar.pm b/src/ARE/Grammar.pm
index d0497d8..fd616a9 100644
--- a/src/ARE/Grammar.pm
+++ b/src/ARE/Grammar.pm
@@ -32,6 +32,12 @@ token quantifier:sym<?> { <sym> }
 proto token metachar { <...> }
 token metachar:sym<.> { <sym> }
 token metachar:sym<back> { \\ <backslash> }
+token metachar:sym<[> {
+    '[' 
+    $<invert>=['^'?]
+    $<charspec>=( [ \\ (.) | (<-[\]\\]>) ] [ '-' (.) ]? )* 
+    ']'
+}
 
 proto token backslash { <...> }
 token backslash:sym<w> { $<sym>=[<[dswDSW]>] }