From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QSVfu-0005Ng-8Y for garchives@archives.gentoo.org; Fri, 03 Jun 2011 14:48:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6626C1C10C; Fri, 3 Jun 2011 14:48:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 32A8C1C10C for ; Fri, 3 Jun 2011 14:48:22 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BDBC61BC002 for ; Fri, 3 Jun 2011 14:48:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1CC3480510 for ; Fri, 3 Jun 2011 14:48:21 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: Subject: [gentoo-commits] proj/libbash:master commit in: / X-VCS-Repository: proj/libbash X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: e974841ac146b836c24a8ba4e9030296fa13abe9 Date: Fri, 3 Jun 2011 14:48:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c1954ef78dad40cfc416cdf41a7a41e0 commit: e974841ac146b836c24a8ba4e9030296fa13abe9 Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Fri Jun 3 14:47:06 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Fri Jun 3 14:47:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3De974841a 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" =20 - 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(&st= d::cin), bash_options( { {"autocd", false}, {"cdable_vars", false},