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

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

commit:     801acacccb7820663f6316d55e751a7912308556
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr 15 15:07:38 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 10:44:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=801acacc

Parser: support ;\n between commands

The parser did not accept the combination of semicolon and new lines
between commands. Now you can have as many new lines after semicolon as
you want.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 9e02ac2..46a90c9 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -93,7 +93,11 @@ list_level_1
 	:	(function|pipeline) (BLANK!*(LOGICAND^|LOGICOR^)BLANK!* (function|pipeline))*;
 // ';' '&' and EOL have lower operator precedence than '&&' and '||' so we need level2 here
 list_level_2
-	:	list_level_1 ((BLANK!?SEMIC!|BLANK!?AMP^|(BLANK!? EOL!)+)BLANK!? list_level_1)*;
+	:	list_level_1 (BLANK!? command_separator (BLANK!? EOL!)* BLANK!? list_level_1)*;
+command_separator
+	:	SEMIC!
+	|	AMP^
+	|	EOL!;
 pipeline
 	:	BLANK!* time? (BANG BLANK!+)? command^ (BLANK!* PIPE^ BLANK!* command)*;
 time	:	TIME^ BLANK!+ time_posix?;

diff --git a/bashast/gunit/list.gunit b/bashast/gunit/list.gunit
index 3d2076a..c434032 100644
--- a/bashast/gunit/list.gunit
+++ b/bashast/gunit/list.gunit
@@ -39,3 +39,5 @@ b=three
 echo \"a b\"" -> (LIST (= a (STRING asdf)) (= b (STRING three)) (COMMAND (STRING echo) (STRING (DOUBLE_QUOTED_STRING a   b))))
 "echo one && (echo two || echo three)" -> (LIST (&& (COMMAND (STRING echo) (STRING one)) (SUBSHELL (LIST (|| (COMMAND (STRING echo) (STRING two)) (COMMAND (STRING echo) (STRING three)))))))
 "FOO='bar' ;" ->  (LIST (= FOO (STRING (SINGLE_QUOTED_STRING bar))))
+"true;
+true" -> (LIST (COMMAND (STRING true)) (COMMAND (STRING true)))