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

[Petteri Räty]

commit:     2d7c18099e5b1f4fd3188e0c102da1c4615198a5
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 14:08:23 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu May 26 08:20:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=2d7c1809

Builtin: fix a bug in local built-in

Now we allow declaring a local variable without assigning any value.

---
 bashast/bashast.g                |    6 +++++-
 bashast/gunit/simp_command.gunit |    2 +-
 scripts/function_def.bash        |    6 ++++--
 scripts/function_def.bash.result |    2 +-
 src/core/interpreter.h           |    8 ++++----
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index b5b133e..bb12b91 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -134,8 +134,12 @@ simple_command
 	|	variable_definitions -> ^(VARIABLE_DEFINITIONS variable_definitions)
 	|	bash_command^ redirect*;
 variable_definitions
-	:	(LOCAL BLANK!+)? var_def (BLANK!+ var_def)*
+	:	var_def (BLANK!+ var_def)*
+	|	LOCAL BLANK!+ local_item (BLANK!+ local_item)*
 	|	EXPORT! (BLANK!+ export_item)+;
+local_item
+	:var_def
+	|name -> ^(EQUALS name);
 export_item
 	:var_def
 	|name ->;

diff --git a/bashast/gunit/simp_command.gunit b/bashast/gunit/simp_command.gunit
index 0ec100f..235819c 100644
--- a/bashast/gunit/simp_command.gunit
+++ b/bashast/gunit/simp_command.gunit
@@ -29,4 +29,4 @@ simple_command:
 "./foobär" -> (COMMAND (STRING . / foob ä r))
 "cat ~/Documents/todo.txt" -> (COMMAND (STRING cat) (STRING ~ / Documents / todo . txt))
 "dodir ${foo}/${bar}" -> (COMMAND (STRING dodir) (STRING (VAR_REF foo) / (VAR_REF bar)))
-"local a=123 b=(1 2 3)" -> (VARIABLE_DEFINITIONS local (= a (STRING 123)) (= b (ARRAY (STRING 1) (STRING 2) (STRING 3))))
+"local a=123 b=(1 2 3) c" -> (VARIABLE_DEFINITIONS local (= a (STRING 123)) (= b (ARRAY (STRING 1) (STRING 2) (STRING 3))) (EQUALS c))

diff --git a/scripts/function_def.bash b/scripts/function_def.bash
index 5be1e36..54030e7 100644
--- a/scripts/function_def.bash
+++ b/scripts/function_def.bash
@@ -44,14 +44,16 @@ func_with_return2
 RETURN_STATUS2=$?
 
 func_nested1() {
-    echo $foo_nested ${bar_nested[0]}
+    echo $foo_nested ${bar_nested[0]} $localbar
 }
 func_nested2() {
     local foo_nested=hi bar_nested=(1 2
-    3)
+    3) localbar
+    localbar=1
     func_nested1
 }
 func_nested2
+echo $localbar
 
 let() {
     echo "overloaded let"

diff --git a/scripts/function_def.bash.result b/scripts/function_def.bash.result
index d3abad0..41e19ca 100644
--- a/scripts/function_def.bash.result
+++ b/scripts/function_def.bash.result
@@ -1,4 +1,4 @@
-hi 1
+hi 1 1
 overloaded let
 1 2 3
 1 2 3

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index 3c85450..f35b8ff 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -475,11 +475,11 @@ public:
                      const T& new_value,
                      const unsigned index=0)
   {
-    auto i = members.find(name);
-    if(i == members.end())
-      define(name, new_value, false, index);
+    auto var = resolve_variable(name);
+    if(var)
+      var->set_value(new_value, index);
     else
-      i->second->set_value(new_value, index);
+      define(name, new_value, false, index);
     return new_value;
   }