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

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

commit:     dd5cbd758e004e0ae07914a6e03484b3414322b4
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Tue May 24 14:47:04 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue May 24 14:47:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=dd5cbd75

Merge remote-tracking branch 'mu/declare_builtin' into review

Conflicts:
	scripts/command_execution.bash
	scripts/command_execution.bash.result
	scripts/function_def.bash
	scripts/function_def.bash.result


 Makefile.am                                        |    3 +
 bashast/libbashWalker.g                            |   24 ++++++-
 scripts/command_execution.bash                     |    2 +
 scripts/command_execution.bash.result              |    1 +
 scripts/function_def.bash                          |   13 ++++
 scripts/function_def.bash.result                   |    1 +
 src/builtins/declare_builtin.cpp                   |   66 ++++++++++++++++++++
 .../{source_builtin.h => declare_builtin.h}        |   32 +++++-----
 src/builtins/tests/declare_tests.cpp               |   66 ++++++++++++++++++++
 src/cppbash_builtin.cpp                            |    2 +
 10 files changed, 191 insertions(+), 19 deletions(-)

diff --cc Makefile.am
index bd0bf7b,c8c702b..c4605cd
--- a/Makefile.am
+++ b/Makefile.am
@@@ -97,8 -97,8 +97,9 @@@ cppunittests_SOURCES =  test/run_tests.
  						src/core/tests/symbols_test.cpp \
  						src/core/tests/interpreter_test.cpp \
  						src/core/tests/bash_ast_test.cpp \
 +						src/core/tests/bash_condition_test.cpp \
  						src/builtins/tests/echo_tests.cpp \
+ 						src/builtins/tests/declare_tests.cpp \
  						src/builtins/tests/boolean_tests.cpp \
  						src/builtins/tests/source_tests.cpp \
  						src/builtins/tests/return_tests.cpp \
diff --cc scripts/command_execution.bash
index 6e655e4,344618e..95e1594
--- a/scripts/command_execution.bash
+++ b/scripts/command_execution.bash
@@@ -15,5 -16,4 +16,6 @@@ true || echo "wrong
  echo "end"
  : ${DEFAULTED:="yes"}
  FOO="abc" echo "command environment"
 +export FOO003=1 FOO004=abc FOO005=(1 2 3) FOO002
 +abc=1 export foo
+ true > /dev/null
diff --cc scripts/command_execution.bash.result
index 9f2ba11,bd09a8b..ae71fa5
--- a/scripts/command_execution.bash.result
+++ b/scripts/command_execution.bash.result
@@@ -4,7 -4,7 +4,8 @@@ righ
  right
  end
  command environment
 +We do not support command env before the export builtin.
+ Redirection is not supported yet
  DEFAULTED=yes
  FOO001=hello
  FOO002=Hello World
diff --cc scripts/function_def.bash
index ac99f83,101e732..5be1e36
--- a/scripts/function_def.bash
+++ b/scripts/function_def.bash
@@@ -52,15 -52,15 +52,28 @@@ func_nested2() 
      func_nested1
  }
  func_nested2
+ 
 +let() {
 +    echo "overloaded let"
 +}
 +let "1 + 2"
 +func_positional_args() {
 +    IFS="abc" echo "$*"
 +    IFS="abc" echo $*
 +    IFS=abc
 +    echo "$*"
 +    echo $*
 +}
 +func_positional_args 1 2 3
++
+ if true; then
+     function_in_compound_statement() {
+         echo "function_in_compound_statement"
+     }
+ fi
+ if false; then
+     function_in_compound_statement() {
+         echo "I should not get called"
+     }
+ fi
+ function_in_compound_statement
diff --cc scripts/function_def.bash.result
index e4cdd82,a1c9b91..d3abad0
--- a/scripts/function_def.bash.result
+++ b/scripts/function_def.bash.result
@@@ -1,9 -1,5 +1,10 @@@
  hi 1
 +overloaded let
 +1 2 3
 +1 2 3
 +1a2a3
 +1 2 3
+ function_in_compound_statement
  ARG1=100
  ARG2=2
  ARG3=3
diff --cc src/cppbash_builtin.cpp
index 7334a8e,edbfa8c..88fdf99
--- a/src/cppbash_builtin.cpp
+++ b/src/cppbash_builtin.cpp
@@@ -25,9 -25,9 +25,10 @@@
  #include "cppbash_builtin.h"
  
  #include "builtins/boolean_builtins.h"
+ #include "builtins/declare_builtin.h"
  #include "builtins/echo_builtin.h"
  #include "builtins/inherit_builtin.h"
 +#include "builtins/let_builtin.h"
  #include "builtins/return_builtin.h"
  #include "builtins/source_builtin.h"