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

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

commit:     2bb591fd2cc27fca8ce2c65eb3a3afbb58810e97
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Tue Apr 19 20:30:21 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 11:22:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=2bb591fd

Parser: remove list rule

Having clist and list doing pretty much the same thing is confusing.
Removed the list rule and moved handling things in the end to the start
rule.

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

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 61c5914..0dc931f 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -92,13 +92,11 @@ tokens{
 	MINUS_SIGN;
 }
 
-start	:	(flcomment!)? EOL!* list^ ;
+start	:	(flcomment)? EOL* clist BLANK* (SEMIC|AMP|EOL)? -> clist;
 //Because the comment token doesn't handle the first comment in a file if it's on the first line, have a parser rule for it
 flcomment
 	:	POUND ~(EOL)* EOL;
-list	:	list_level_2 BLANK* (SEMIC|AMP|EOL)? -> ^(LIST list_level_2);
 clist
-options{greedy=false;}
 	:	list_level_2 -> ^(LIST list_level_2);
 list_level_1
 	:	(function|pipeline) (BLANK!*(LOGICAND^|LOGICOR^)BLANK!* (function|pipeline))*;

diff --git a/bashast/gunit/expansions.gunit b/bashast/gunit/expansions.gunit
index 4ea5924..bbfa37a 100644
--- a/bashast/gunit/expansions.gunit
+++ b/bashast/gunit/expansions.gunit
@@ -18,7 +18,7 @@
 */
 gunit bashast;
 
-list:
+clist:
 "echo a{b,c,d}" -> (LIST (COMMAND (STRING echo) (STRING a (BRACE_EXP (STRING b) (STRING c) (STRING d)))))
 "((5+5))" -> (LIST (COMPOUND_ARITH (+ 5 5)))
 "(( 4 + asdf ))" -> (LIST (COMPOUND_ARITH (+ 4 (VAR_REF asdf))))

diff --git a/bashast/gunit/list.gunit b/bashast/gunit/list.gunit
index 42836ca..76c46b2 100644
--- a/bashast/gunit/list.gunit
+++ b/bashast/gunit/list.gunit
@@ -18,7 +18,7 @@
 */
 gunit bashast;
 
-list:
+start:
 "make" -> (LIST (COMMAND (STRING make)))
 "make && make modules_install;" -> (LIST (&& (COMMAND (STRING make)) (COMMAND (STRING make) (STRING modules_install))))
 "make && make modules_install &" -> (LIST (&& (COMMAND (STRING make)) (COMMAND (STRING make) (STRING modules_install))))