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

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

commit:     5cc91900c887df1209b59f0357718c78d2d5ca4e
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 10:21:58 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Jun 11 08:49:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=5cc91900

Walker: simplify variable reference

$* and $@ are treated equally now. This will simplify the grammar and
we won't differentiate them until this causes any problem. $@ is
supported in walker grammar with this change.

---
 bashast/libbashWalker.g           |   24 ++++--------------------
 scripts/var_def.bash              |    2 --
 scripts/var_def.bash.result       |    1 -
 scripts/var_expansion.bash        |   20 ++++++++++++++------
 scripts/var_expansion.bash.result |   17 ++++++++++++-----
 5 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index 9cb578f..44df1a9 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -348,7 +348,7 @@ array_name returns[std::string libbash_value]
 	:^(ARRAY name (AT|TIMES)) { $libbash_value = $name.libbash_value; }
 	// We do not care the difference between TIMES and AT for now
 	|TIMES { $libbash_value = "*"; }
-	|AT { $libbash_value = "@"; };
+	|AT { $libbash_value = "*"; };
 
 var_expansion returns[std::string libbash_value]
 @declarations {
@@ -437,26 +437,10 @@ word returns[std::string libbash_value]
 
 //variable reference
 var_ref [bool double_quoted] returns[std::string libbash_value]
-	:^(VAR_REF name) {
-		$libbash_value = walker->resolve<std::string>($name.libbash_value, $name.index);
+	:^(VAR_REF var_name) {
+		$libbash_value = walker->resolve<std::string>($var_name.libbash_value, $var_name.index);
 	}
-	|^(VAR_REF libbash_string=num) {
-		$libbash_value = walker->resolve<std::string>(libbash_string);
-	}
-	|^(VAR_REF ^(ARRAY libbash_string=name_base AT)) { walker->get_all_elements(libbash_string, $libbash_value); }
-	|^(VAR_REF ^(ARRAY libbash_string=name_base TIMES)) {
-		if(double_quoted)
-			walker->get_all_elements_IFS_joined(libbash_string, $libbash_value);
-		else
-			walker->get_all_elements(libbash_string, $libbash_value);
-	}
-	|^(VAR_REF TIMES) {
-		if(double_quoted)
-			walker->get_all_elements_IFS_joined("*", $libbash_value);
-		else
-			walker->get_all_elements("*", $libbash_value);
-	}
-	|^(VAR_REF AT) { std::cerr << "$@ has not been implemented yet" << std::endl; }
+	|^(VAR_REF libbash_string=array_name) { walker->get_all_elements_IFS_joined(libbash_string, $libbash_value); }
 	|^(VAR_REF POUND) { std::cerr << "$# has not been implemented yet" << std::endl; }
 	|^(VAR_REF QMARK) { $libbash_value = walker->get_status<std::string>(); }
 	|^(VAR_REF MINUS) { std::cerr << "$- has not been implemented yet" << std::endl; }

diff --git a/scripts/var_def.bash b/scripts/var_def.bash
index f832a96..1980681 100644
--- a/scripts/var_def.bash
+++ b/scripts/var_def.bash
@@ -35,8 +35,6 @@ ARRAY10="${ARRAY05[*]}"
 FOO001="networkmanager"
 FOO002="0.8.2"
 FOO003=${FOO001}-${FOO002}
-FOO004=$*
-FOO004=$@
 FOO004=$#
 FOO004=$?
 FOO004=$-

diff --git a/scripts/var_def.bash.result b/scripts/var_def.bash.result
index 121c267..5ab9882 100644
--- a/scripts/var_def.bash.result
+++ b/scripts/var_def.bash.result
@@ -1,4 +1,3 @@
-$@ has not been implemented yet
 $# has not been implemented yet
 $- has not been implemented yet
 $! has not been implemented yet

diff --git a/scripts/var_expansion.bash b/scripts/var_expansion.bash
index c3f41d3..1ac22b4 100644
--- a/scripts/var_expansion.bash
+++ b/scripts/var_expansion.bash
@@ -84,12 +84,20 @@ FOO081=${FOO039//@([a-c]|[k-m])}
 target="abc123abc"
 FOO082="${target##+(ab[c])*([[:digit:]])}"
 function positional_parameter_test(){
-    FOO083=${*}
-    FOO084=${*:1}
-    FOO085=${*:1:2}
-    FOO086=${*: -1}
-    FOO087=${*: -2:5}
-    FOO088=${*:0}
+    FOO083=$*
+    FOO084=${*}
+    FOO085=${*:1}
+    FOO086=${*:1:2}
+    FOO087=${*: -1}
+    FOO088=${*: -2:5}
+    FOO089=${*:0}
+    FOO090=$@
+    FOO091=${@}
+    FOO092=${@:1}
+    FOO093=${@:1:2}
+    FOO094=${@: -1}
+    FOO095=${@: -2:5}
+    FOO096=${@:0}
 }
 positional_parameter_test 1 2 3 4 5
 target="abc*abc"

diff --git a/scripts/var_expansion.bash.result b/scripts/var_expansion.bash.result
index 299d975..31cca8d 100644
--- a/scripts/var_expansion.bash.result
+++ b/scripts/var_expansion.bash.result
@@ -90,9 +90,16 @@ FOO081=Heo Word
 FOO082=abc
 FOO083=1 2 3 4 5
 FOO084=1 2 3 4 5
-FOO085=1 2
-FOO086=5
-FOO087=4 5
-FOO088=@srcdir@/scripts/var_expansion.bash 1 2 3 4 5
-FOO089=
+FOO085=1 2 3 4 5
+FOO086=1 2
+FOO087=5
+FOO088=4 5
+FOO089=@srcdir@/scripts/var_expansion.bash 1 2 3 4 5
+FOO090=1 2 3 4 5
+FOO091=1 2 3 4 5
+FOO092=1 2 3 4 5
+FOO093=1 2
+FOO094=5
+FOO095=4 5
+FOO096=@srcdir@/scripts/var_expansion.bash 1 2 3 4 5
 target=abc*abc