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

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

commit:     48ca9661e8e8f6bab6e37cf912bf1b16e5d742e0
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 21 13:15:31 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 07:46:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=48ca9661

Parser: make the blanks before semicolon optional

This fixes case statement. The indentation for the rule is also fixed.
Unnecessary syntactic predicate is removed.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 6204ed0..b4804fa 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -498,10 +498,10 @@ scope {
 		);
 case_statement
 	:	wspace? (LPAREN BLANK?)? extended_pattern (BLANK? PIPE BLANK? extended_pattern)* BLANK? RPAREN
-		wspace
+		(wspace command_list)?
 		(
-			command_list wspace)? ( (DOUBLE_SEMIC ((wspace ESAC) => wspace ESAC {$case_body::case_end = true;})?)
-			|(ESAC) => ESAC {$case_body::case_end = true;}
+			wspace? DOUBLE_SEMIC ((wspace ESAC) => wspace ESAC {$case_body::case_end = true;})?
+			|wspace ESAC {$case_body::case_end = true;}
 		)
 			-> ^(CASE_PATTERN extended_pattern+ (CASE_COMMAND command_list)?);
 

diff --git a/bashast/gunit/compound.gunit b/bashast/gunit/compound.gunit
index 7270246..c5d6845 100644
--- a/bashast/gunit/compound.gunit
+++ b/bashast/gunit/compound.gunit
@@ -166,8 +166,7 @@ esac" ->  (case (STRING (DOUBLE_QUOTED_STRING (VAR_REF 1))) (CASE_PATTERN (BRANC
 
 "case $asdf in
 a)
-echo \"yay\"
-;;
+echo \"yay\";;
 esac" -> (case (STRING (VAR_REF asdf)) (CASE_PATTERN (BRANCH a) CASE_COMMAND (LIST (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING yay))))))
 "case asdf in
 asdf)