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

[Petteri Räty]

commit:     b28640eea98b8d3e691c83fece6ef66dcfa49976
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Apr  8 13:41:29 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 13:41:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=b28640ee

Simplify $_ handling

The special variable doesn't need its own branch as the name rule
already covers it.

---
 bashast/bashast.g              |    3 +--
 bashast/gunit/param_main.gunit |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 7f4bed5..e167f9f 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -246,8 +246,7 @@ var_ref
 	|	DOLLAR POUND -> ^(VAR_REF POUND)
 	|	DOLLAR QMARK -> ^(VAR_REF QMARK)
 	|	DOLLAR MINUS -> ^(VAR_REF MINUS)
-	|	DOLLAR BANG -> ^(VAR_REF BANG)
-	|	DOLLAR '_' -> ^(VAR_REF '_');
+	|	DOLLAR BANG -> ^(VAR_REF BANG);
 //Variable expansions
 var_exp	:	var_name (USE_DEFAULT|USE_ALTERNATE|DISPLAY_ERROR|ASSIGN_DEFAULT)^ word
 	|	var_name COLON wspace* LPAREN? os=arithmetic RPAREN? (COLON len=arithmetic)? -> ^(OFFSET var_name $os ^($len)?)

diff --git a/bashast/gunit/param_main.gunit b/bashast/gunit/param_main.gunit
index eb49309..6668dd9 100644
--- a/bashast/gunit/param_main.gunit
+++ b/bashast/gunit/param_main.gunit
@@ -45,6 +45,8 @@ var_ref:
 "${@}" -> (VAR_REF @)
 "${3}" -> (VAR_REF 3)
 "$?" -> (VAR_REF ?)
+"$_" -> (VAR_REF _)
+"${_}" -> (VAR_REF _)
 "${PV//./_}" -> (VAR_REF (REPLACE_ALL PV (STRING .) (STRING _)))
 "${PV/#foo/bar}" -> (VAR_REF (REPLACE_FIRST PV (STRING foo) (STRING bar)))
 "${PV/%foo/bar}" -> (VAR_REF (REPLACE_LAST PV (STRING foo) (STRING bar)))