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

[Petteri Räty]

commit:     149d235bfa4aff7fdbdca9b8a5f1b3fc5b493f34
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr  8 19:07:54 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 06:13:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=149d235b

Remove backtracking for arg rule

Add syntactic predicates to remove the need to backtrack when evaluation
the arg rule.

---
 bashast/bashast.g |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 5214b65..ec04917 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -109,11 +109,12 @@ simple_command
 bash_command
 	:	fname_no_res_word (BLANK+ arg)* -> ^(COMMAND fname_no_res_word arg*);
 //An argument to a command
+//fname can also match var_ref and command_sub but that gives a noisier AST
 arg
-	:	var_ref
-	|	fname
-	|	command_sub
-	|	var_ref;
+options{backtrack=false;}
+	:	(var_ref) => var_ref
+	|	(command_sub) => command_sub
+	|	fname;
 redirect:	BLANK!* here_string_op^ BLANK!* fname
 	|	BLANK!* here_doc_op^ BLANK!* fname EOL! heredoc
 	|	BLANK* redir_op BLANK* redir_dest -> ^(REDIR redir_op redir_dest)