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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Petteri Räty" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/libbash:master commit in: bashast/, bashast/gunit/
Date: Tue, 12 Apr 2011 07:19:15 +0000 (UTC)	[thread overview]
Message-ID: <fa5f111a94abdbee5602537971491920dbb453b4.betelgeuse@gentoo> (raw)

commit:     fa5f111a94abdbee5602537971491920dbb453b4
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Mon Apr 11 16:15:39 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 06:23:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=fa5f111a

Fix parameter expansion parsing for arrays

In man bash when it's talked about parameter you can put a reference to
an array member there so it's for example allowed to do
${asdf[0]:-default}. Now we support the different parameter expansions
for arrays.

---
 bashast/bashast.g         |   21 ++++++++++++---------
 bashast/gunit/array.gunit |    9 +++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/bashast/bashast.g b/bashast/bashast.g
index 8ba0400..6148318 100644
--- a/bashast/bashast.g
+++ b/bashast/bashast.g
@@ -239,13 +239,12 @@ var_ref
 //Variable expansions
 var_exp	:	var_name (USE_DEFAULT|USE_ALTERNATE|DISPLAY_ERROR|ASSIGN_DEFAULT)^ word
 	|	var_name COLON wspace* os=explicit_arithmetic (COLON len=explicit_arithmetic)? -> ^(OFFSET var_name $os ^($len)?)
-	|	BANG^ var_name (TIMES|AT)
-	|	BANG var_name LSQUARE (op=TIMES|op=AT) RSQUARE -> ^(LIST_EXPAND var_name $op)
-	|	BANG var_name -> ^(VAR_REF var_name)
+	|	BANG^ var_name_for_bang (TIMES|AT)
+	|	BANG var_name_for_bang LSQUARE (op=TIMES|op=AT) RSQUARE -> ^(LIST_EXPAND var_name_for_bang $op)
+	|	BANG var_name_for_bang -> ^(VAR_REF var_name_for_bang)
 	|	var_name (POUND^|POUNDPOUND^) fname
 	|	var_name (PCT^|PCTPCT^) fname
 	|	var_name parameter_replace_operator^ ns_str parameter_replace_string
-	|	arr_var_ref
 	|	var_size_ref
 	|	var_name
 	|	TIMES
@@ -257,11 +256,15 @@ parameter_replace_operator
 	|	SLASH PCT -> REPLACE_AT_END
 	|	SLASH POUND -> REPLACE_AT_START
 	|	SLASH -> REPLACE_FIRST;
-//Allowable variable names in the variable expansion
-var_name:	num|name|POUND;
-//Referencing an array variable
-arr_var_ref
-	:	name^ LSQUARE! (DIGIT+|AT|TIMES) RSQUARE!;
+//Allowable refences to values
+//either directly or through array
+var_name:	num
+	|	name^ LSQUARE! (DIGIT+|AT|TIMES) RSQUARE!
+	|	name
+	|	POUND;
+//with bang the array syntax is used for array indexes
+var_name_for_bang
+	:	num|name|POUND;
 var_size_ref
 	:	POUND^ name (LSQUARE! array_size_index RSQUARE!)?;
 array_size_index

diff --git a/bashast/gunit/array.gunit b/bashast/gunit/array.gunit
index fd7b5d4..d21ed6a 100644
--- a/bashast/gunit/array.gunit
+++ b/bashast/gunit/array.gunit
@@ -25,11 +25,20 @@ var_def:
 
 var_ref:
 "$asdf" -> (VAR_REF asdf)
+"${asdf[0]:-default}" -> (VAR_REF (:- (asdf 0) (STRING default)))
 "${asdf[3]}" -> (VAR_REF (asdf 3))
 "${asdf[4] }" -> (VAR_REF (asdf 4))
+"${asdf[1]:2:2}" -> (VAR_REF (OFFSET (asdf 1) 2 2))
+"${asdf[2]##word}" -> (VAR_REF (## (asdf 2) (STRING word)))
+"${asdf[3]%%word}" -> (VAR_REF (%% (asdf 3) (STRING word)))
+"${asdf[4]//pattern}" -> (VAR_REF (REPLACE_ALL (asdf 4) (STRING pattern)))
 "${asdf}" -> (VAR_REF asdf)
 "${#asdf[0]}" -> (VAR_REF (# asdf 0))
 "${asdf[@]}" -> (VAR_REF (asdf @))
 "${asdf[*]}" -> (VAR_REF (asdf *))
 "${#asdf[@]}" -> (VAR_REF (# asdf ARRAY_SIZE))
 "${#asdf[*]}" -> (VAR_REF (# asdf ARRAY_SIZE))
+"${asdf[@]:0:1}" -> (VAR_REF (OFFSET (asdf @) 0 1))
+"${asdf[*]#path}" -> (VAR_REF (# (asdf *) (STRING path)))
+"${asdf[@]%word}" ->  (VAR_REF (% (asdf @) (STRING word)))
+"${asdf[*]/pattern/string}" -> (VAR_REF (REPLACE_FIRST (asdf *) (STRING pattern) (STRING string)))

next             reply	other threads:[~2011-04-12  7:19 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-12  7:19 Petteri Räty [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-19 14:35 [gentoo-commits] proj/libbash:master commit in: bashast/, bashast/gunit/ Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2012-06-03  9:08 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-07-20 13:08 Petteri Räty
2011-07-08 14:12 Petteri Räty
2011-06-21 13:26 Petteri Räty
2011-06-21 13:20 Petteri Räty
2011-06-21 13:20 Petteri Räty
2011-06-19 19:15 Petteri Räty
2011-06-15 21:18 Petteri Räty
2011-06-14  8:28 Petteri Räty
2011-06-14  8:28 Petteri Räty
2011-06-11  8:24 Petteri Räty
2011-06-11  8:24 Petteri Räty
2011-06-09 13:41 Petteri Räty
2011-06-09 13:41 Petteri Räty
2011-06-09  8:15 Petteri Räty
2011-06-01 12:03 Petteri Räty
2011-06-01 12:03 Petteri Räty
2011-06-01 12:03 Petteri Räty
2011-06-01 12:03 Petteri Räty
2011-06-01 12:03 Petteri Räty
2011-05-23 14:34 Petteri Räty
2011-05-22 21:00 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-07 12:25 Petteri Räty
2011-04-27 15:11 Petteri Räty
2011-04-20 11:26 Petteri Räty
2011-04-20 11:26 Petteri Räty
2011-04-20 11:26 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-12  7:19 Petteri Räty
2011-04-12  7:19 Petteri Räty
2011-04-12  7:19 Petteri Räty
2011-04-11  6:50 Petteri Räty
2011-04-11  6:50 Petteri Räty
2011-04-11  6:50 Petteri Räty
2011-04-11  6:50 Petteri Räty
2011-04-11  5:21 Petteri Räty
2011-04-11  5:21 Petteri Räty
2011-04-11  5:21 Petteri Räty
2011-04-11  5:21 Petteri Räty
2011-04-09  6:27 Petteri Räty
2011-04-09  6:27 Petteri Räty
2011-04-09  6:27 Petteri Räty
2011-04-09  6:27 Petteri Räty
2011-04-08 14:26 Petteri Räty
2011-04-07 16:45 Petteri Räty
2011-04-07  7:48 Petteri Räty
2011-04-06  7:43 Petteri Räty
2011-03-30 12:48 Petteri Räty

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8ba0400 dfblob:6148318 dfblob:fd7b5d4 dfblob:d21ed6a )
 OR (
bs:"[gentoo-commits] proj/libbash:master commit in: bashast/, bashast/gunit/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fa5f111a94abdbee5602537971491920dbb453b4.betelgeuse@gentoo \
    --to=betelgeuse@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox