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

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

commit:     fa4053e5a365b1ced100736989070b8bd01f33eb
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr  8 19:22:57 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=fa4053e5

Remove need to backtrack from the word rule

All the other alternatives can also be matched from fname so we need
syntactic predicates. We should give thought to if we need both the word
and fname rules.

---
 bashast/bashast.g |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 64568c9..20068b5 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -330,13 +330,13 @@ wspace	:	BLANK+|EOL;
 semiel	:	(';'|EOL) BLANK*;
 
 //definition of word.  this is just going to grow...
-word	:	brace_expansion
-	|	command_sub
-	|	var_ref
-	|	num
-	|	fname
-	|	arithmetic_expansion
-	|	res_word_str -> ^(STRING res_word_str);
+word	:	(brace_expansion) => brace_expansion
+	|	(command_sub) => command_sub
+	|	(var_ref) => var_ref
+	|	(num) => num
+	|	(arithmetic_expansion) => arithmetic_expansion
+	|	fname;
+
 pattern	:	command_sub
 	|	fname
 	|	TIMES;