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

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

commit:     e974841ac146b836c24a8ba4e9030296fa13abe9
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Jun  3 14:47:06 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Jun  3 14:47:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=e974841a

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

Conflicts:
	src/core/interpreter.cpp


 bashast/bashast.g                       |    9 ++---
 bashast/features_script/features.sh.ast |    2 +-
 bashast/gunit/compound.gunit            |    4 +-
 bashast/gunit/list.gunit                |    4 +-
 bashast/gunit/redir.gunit               |    5 ++-
 bashast/libbashWalker.g                 |   52 ++++++++++++++++++++++++------
 scripts/command_execution.bash          |    2 +-
 scripts/command_execution.bash.result   |    1 -
 src/core/interpreter.cpp                |    2 +-
 src/core/interpreter.h                  |   24 +++++++++-----
 10 files changed, 71 insertions(+), 34 deletions(-)

diff --cc src/core/interpreter.cpp
index b0d32c0,3a065cb..e08fd57
--- a/src/core/interpreter.cpp
+++ b/src/core/interpreter.cpp
@@@ -40,7 -38,9 +40,7 @@@
  #include "core/unset_exception.h"
  #include "libbashWalker.h"
  
- interpreter::interpreter(): out(&std::cout), err(&std::cerr), in(&std::cin), bash_options(
 -#include "core/interpreter.h"
 -
+ interpreter::interpreter(): _out(&std::cout), _err(&std::cerr), _in(&std::cin), bash_options(
      {
        {"autocd", false},
        {"cdable_vars", false},