[gentoo-commits] proj/libbash:master commit in: scripts/, bashast/

["Petteri Räty" <betelgeuse@gentoo.org>]

commit:     82268e958be9caee5d9e71d14d27d0d25fd36ee6
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 13:46:14 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed May 11 13:48:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=82268e95

Walker: support character class in patterns

---
 bashast/libbashWalker.g              |   11 ++++++++++-
 scripts/compound_command.bash        |   18 ++++++++++++++++++
 scripts/compound_command.bash.result |    5 ++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 6c9e0c1..407c8b6 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -227,7 +227,16 @@ bash_pattern[boost::xpressive::sregex& pattern, bool greedy]
 		}
 		|(MATCH_ANY_EXCEPT|MATCH_ANY) =>
 		^((MATCH_ANY_EXCEPT { negation = true; } | MATCH_ANY { negation = false; })
-		  (s=string_part { pattern_str += s.libbash_value; })+) {
+		  ((CHARACTER_CLASS) => ^(CHARACTER_CLASS n=NAME) {
+				std::string class_name = walker->get_string(n);
+				if(class_name == "word")
+					pattern_str += "A-Za-z0-9_";
+				else if(class_name == "ascii")
+					pattern_str += "\\x00-\\x7F";
+				else
+					pattern_str += "[:" + class_name + ":]";
+			}
+			|s=string_part { pattern_str += s.libbash_value; })+) {
 
 			if(negation)
 				pattern_str = "[^" + pattern_str + "]";

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index a75898f..daeef24 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -160,4 +160,22 @@ case $target in
         echo yep
         ;;
 esac
+target="a"
+case $target in
+    [[:alnum:][:alpha:][:ascii:][:blank:][:cntrl:][:digit:][:graph:][:lower:][:print:][:punct:][:space:][:upper:][:word:][:xdigit:]])
+        echo yep
+        ;;
+esac
+target="a"
+case $target in
+    [[:ascii:]])
+        echo yep
+        ;;
+esac
+target="_"
+case $target in
+    [[:word:]])
+        echo yep
+        ;;
+esac
 echo "case end"

diff --git a/scripts/compound_command.bash.result b/scripts/compound_command.bash.result
index 255c8eb..2a23d0c 100644
--- a/scripts/compound_command.bash.result
+++ b/scripts/compound_command.bash.result
@@ -31,10 +31,13 @@ yep
 yep
 yep
 yep
+yep
+yep
+yep
 case end
 a=1
 b=2
 file= foo bar 
 foo=ghi
 i=4
-target=bar
+target=_