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

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

commit:     99716ee225f60d40dfb1a49be840c0abe3557c00
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 08:10:54 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed May 11 06:45:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=99716ee2

Walker: support MATCH_ANY_EXCEPT and MATCH_PATTERN

Patterns like [abc] and [!abc] are supported now.

---
 bashast/libbashWalker.g              |   51 ++++++++++++++++++++++++++++------
 scripts/compound_command.bash        |   25 ++++++++++++++++
 scripts/compound_command.bash.result |    5 ++-
 3 files changed, 71 insertions(+), 10 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 16e4624..38cd459 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -175,21 +175,40 @@ string_expr returns[std::string libbash_value, bool quoted]
 	$quoted = true;
 }
 	:^(STRING (
-		(DOUBLE_QUOTED_STRING) =>
-			^(DOUBLE_QUOTED_STRING (libbash_string=double_quoted_string { $libbash_value += libbash_string; })*)
-		|(ARITHMETIC_EXPRESSION) =>
-			^(ARITHMETIC_EXPRESSION value=arithmetics {
-				$libbash_value += boost::lexical_cast<std::string>(value); $quoted = false;
-			})
-		|(var_ref[false]) => libbash_string=var_ref[false] { $libbash_value += libbash_string; $quoted = false; }
-		|libbash_string=command_substitution { $libbash_value += libbash_string; $quoted = false; }
-		|(libbash_string=any_string { $libbash_value += libbash_string; $quoted = false; })
+		string_part {
+			$libbash_value += $string_part.libbash_value;
+			$quoted = $string_part.quoted;
+		}
 	)+);
 
+string_part returns[std::string libbash_value, bool quoted]
+@init {
+	$quoted = false;
+}
+	:(DOUBLE_QUOTED_STRING) =>
+		^(DOUBLE_QUOTED_STRING (libbash_string=double_quoted_string {
+									$libbash_value += libbash_string;
+									$quoted = true;
+								})*)
+	|(ARITHMETIC_EXPRESSION) =>
+		^(ARITHMETIC_EXPRESSION value=arithmetics {
+			$libbash_value = boost::lexical_cast<std::string>(value);
+		})
+	|(var_ref[false]) => libbash_string=var_ref[false] {
+		$libbash_value = libbash_string;
+	}
+	|libbash_string=command_substitution {
+		$libbash_value = libbash_string;
+	}
+	|(libbash_string=any_string {
+		$libbash_value = libbash_string;
+	});
+
 bash_pattern[boost::xpressive::sregex& pattern]
 @declarations {
 	using namespace boost::xpressive;
 	bool do_append = false;
+	bool negation;
 }
 	:^(STRING (
 		(DOUBLE_QUOTED_STRING) =>
@@ -202,6 +221,20 @@ bash_pattern[boost::xpressive::sregex& pattern]
 		|(MATCH_ONE) => MATCH_ONE {
 			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())
+				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);
+
+			if(negation)
+				append($pattern, ~char_set, do_append);
+			else
+				append($pattern, char_set, do_append);
+		}
 		|(libbash_string=any_string {
 			append($pattern, as_xpr(libbash_string), do_append);
 		})

diff --git a/scripts/compound_command.bash b/scripts/compound_command.bash
index 1bd7943..3a3c5d8 100644
--- a/scripts/compound_command.bash
+++ b/scripts/compound_command.bash
@@ -110,4 +110,29 @@ case $target in
         echo "default"
         ;;
 esac
+target=a
+case $target in
+    [def])
+        echo "Shouldn't print this"
+        ;;
+    [abc])
+        echo yep
+        ;;
+esac
+case $target in
+    [def])
+        echo "Shouldn't print this"
+        ;;
+    [a])
+        echo yep
+        ;;
+esac
+case $target in
+    [!abc])
+        echo "Shouldn't print this"
+        ;;
+    [!def])
+        echo yep
+        ;;
+esac
 echo "case end"

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