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

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

commit:     ce9c217021e2154a64f8ed3b3e7c492bc8a4c917
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat May  7 12:23:34 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat May  7 12:23:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=ce9c2170

Merge remote-tracking branch 'mu/local_variables'

Conflicts:
	scripts/function_def.bash


 bashast/bashast.g                |    5 ++-
 bashast/gunit/simp_command.gunit |    1 +
 bashast/libbashWalker.g          |   20 ++++++++++++++----
 scripts/function_def.bash        |   10 +++++++++
 scripts/function_def.bash.result |    1 +
 src/core/interpreter.cpp         |   40 +++++++++++++++++++++++++++++++++----
 src/core/interpreter.h           |   39 +++++++++++++++++++++---------------
 7 files changed, 88 insertions(+), 28 deletions(-)

diff --cc bashast/libbashWalker.g
index beabfdf,1a305ef..f39e603
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@@ -283,21 -292,13 +293,21 @@@ simple_comman
  @declarations {
  	std::vector<std::string> libbash_args;
  }
- 	:^(COMMAND string_expr (argument[libbash_args])* var_def*) {
+ 	:^(COMMAND string_expr (argument[libbash_args])* var_def[true]*) {
  		if(walker->has_function($string_expr.libbash_value))
  		{
 -			walker->set_status(walker->call($string_expr.libbash_value,
 -											libbash_args,
 -											ctx,
 -											compound_command));
 +			ANTLR3_MARKER command_index = INDEX();
 +			try
 +			{
 +				walker->set_status(walker->call($string_expr.libbash_value,
 +												libbash_args,
 +												ctx,
 +												compound_command));
 +			}
 +			catch(return_exception& e)
 +			{
 +				SEEK(command_index);
 +			}
  		}
  		else if(cppbash_builtin::is_builtin($string_expr.libbash_value))
  		{
diff --cc scripts/function_def.bash
index ee57a94,cbce4cd..bcf5a4b
--- a/scripts/function_def.bash
+++ b/scripts/function_def.bash
@@@ -27,18 -27,12 +27,28 @@@ ARRAY=(1 2 3
  func_with_args ${ARRAY[@]} $FOO001
  func_with_args 100 $ARG2 $ARG3 $ARG4
  
 +func_with_return()
 +{
 +    return 1
 +    NOT_EXIST=1
 +}
 +func_with_return
 +RETURN_STATUS=$?
 +func_with_return2()
 +{
 +    true
 +    return
 +    NOT_EXIST=1
 +}
 +func_with_return2
 +RETURN_STATUS2=$?
++
+ func_nested1() {
+     echo $foo_nested ${bar_nested[0]}
+ }
+ func_nested2() {
+     local foo_nested=hi bar_nested=(1 2
+     3)
+     func_nested1
+ }
+ func_nested2