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

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

commit:     63ee3c1c1242562685bf78b58a662204bf5e6c42
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 10:38:10 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed May 11 06:46:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=63ee3c1c

Walker: support ranged pattern

Patterns like [a-z] and [!0-9] are supported.

---
 bashast/libbashWalker.g              |   36 +++++++++++++++++++++++++++++----
 scripts/compound_command.bash        |   25 +++++++++++++++++++++++
 scripts/compound_command.bash.result |    5 +++-
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 38cd459..c3ef8ac 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -209,6 +209,7 @@ bash_pattern[boost::xpressive::sregex& pattern]
 	using namespace boost::xpressive;
 	bool do_append = false;
 	bool negation;
+	std::string pattern_str;
 }
 	:^(STRING (
 		(DOUBLE_QUOTED_STRING) =>
@@ -222,13 +223,38 @@ bash_pattern[boost::xpressive::sregex& pattern]
 			append($pattern, _, do_append);
 		}
 		|(MATCH_ANY_EXCEPT|MATCH_PATTERN) =>
-		^((MATCH_ANY_EXCEPT { negation = true; } | MATCH_PATTERN { negation = false;}) s=string_part) {
-			if(s.libbash_value.empty())
+		^((MATCH_ANY_EXCEPT { negation = true; } | MATCH_PATTERN { negation = false; })
+		  (s=string_part { pattern_str += s.libbash_value; })+) {
+			if(pattern_str.empty())
 				return;
 
-			auto char_set = set = as_xpr(s.libbash_value[0]);
-			for(auto iter = s.libbash_value.begin() + 1; iter != s.libbash_value.end(); ++iter)
-				char_set = (char_set | *iter);
+			// deal with the first character specially
+			int index = 0;
+			auto char_set = set = as_xpr(pattern_str[0]);
+			if( index + 1 < pattern_str.size() && pattern_str[index + 1] == '-')
+			{
+				char_set = set[range(pattern_str[index], pattern_str[index + 2])];
+				index += 3;
+			}
+			else
+			{
+				++index;
+			}
+
+			// handle all characters in the pattern
+			while(index < pattern_str.size())
+			{
+				if( index + 1 < pattern_str.size() && pattern_str[index + 1] == '-')
+				{
+					char_set |= range(pattern_str[index], pattern_str[index + 2]);
+					index += 3;
+				}
+				else
+				{
+					char_set |= pattern_str[index];
+					++index;
+				}
+			}
 
 			if(negation)
 				append($pattern, ~char_set, do_append);

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index 3a3c5d8..a75898f 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -135,4 +135,29 @@ case $target in
         echo yep
         ;;
 esac
+case $target in
+    [d-z])
+        echo "Shouldn't print this"
+        ;;
+    [a-c])
+        echo yep
+        ;;
+esac
+case $target in
+    [!a-c])
+        echo "Shouldn't print this"
+        ;;
+    [!d-z])
+        echo yep
+        ;;
+esac
+target=bar
+case $target in
+    a[a-cx-z]r)
+        echo "Shouldn't print this"
+        ;;
+    b[!d-fx-z]r)
+        echo yep
+        ;;
+esac
 echo "case end"

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