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

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

commit:     919e76b05e08ffeb8cdb34cbd453c0a5fa833276
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Apr 16 14:02:48 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:57:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=919e76b0

Parser: handle extra ws at the enf of currshell

The parser couldn't handle extra lines with only white space at the end
of lists for current shell.

---
 bashast/bashast.g            |    2 +-
 bashast/gunit/compound.gunit |    5 +++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index b318f3c..30af37d 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -215,7 +215,7 @@ case_pattern
 subshell:	LPAREN wspace? clist (BLANK* SEMIC)? (BLANK* EOL)* BLANK* RPAREN -> ^(SUBSHELL clist);
 //A grouping of commands executed in the current shell
 currshell
-	:	LBRACE wspace clist semiel RBRACE -> ^(CURRSHELL clist);
+	:	LBRACE wspace clist semiel wspace* RBRACE -> ^(CURRSHELL clist);
 //comparison using arithmetic
 arith_comparison
 	:	LLPAREN wspace? arithmetic wspace? RRPAREN -> ^(COMPOUND_ARITH arithmetic);

diff --git a/bashast/gunit/compound.gunit b/bashast/gunit/compound.gunit
index 587d869..dfdacc5 100644
--- a/bashast/gunit/compound.gunit
+++ b/bashast/gunit/compound.gunit
@@ -36,6 +36,11 @@ currshell:
 "{ time cat; }" -> (CURRSHELL (LIST (COMMAND (STRING cat) time)))
 "{ time cat
 }" -> (CURRSHELL (LIST (COMMAND (STRING cat) time)))
+// there's a tab on the empty line
+"{
+	echo
+	
+}" -> (CURRSHELL (LIST (COMMAND (STRING echo))))
 "{time cat}" FAIL
 "{ time cat }" FAIL