[gentoo-commits] proj/libbash:master commit in: scripts/, src/core/, bashast/

[Petteri Räty]

commit:     cc66a932c3756730ddf11198999c39a4f6f9a9e1
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  5 12:02:24 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Apr  5 13:49:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=cc66a932

Implement ${param:=w} and ${param:+w} expansion

---
 bashast/libbashWalker.g             |    6 ++++++
 scripts/var_expansion.ebuild        |    4 ++++
 scripts/var_expansion.ebuild.result |    5 +++++
 src/core/interpreter.h              |   20 ++++++++++++++++++++
 4 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index a25c58c..ad8e444 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -89,6 +89,12 @@ var_name returns[std::string libbash_value]
 var_expansion returns[std::string libbash_value]:
 	^(USE_DEFAULT var_name libbash_word=word) {
 		libbash_value = walker->do_default_expansion($var_name.libbash_value, libbash_word);
+	}
+	|^(ASSIGN_DEFAULT var_name libbash_word=word) {
+		libbash_value = walker->do_assign_expansion($var_name.libbash_value, libbash_word);
+	}
+	|^(USE_ALTERNATE var_name libbash_word=word) {
+		libbash_value = walker->do_alternate_expansion($var_name.libbash_value, libbash_word);
 	};
 
 word returns[std::string libbash_value]:

diff --git a/scripts/var_expansion.ebuild b/scripts/var_expansion.ebuild
index 533e7a7..f0ad504 100644
--- a/scripts/var_expansion.ebuild
+++ b/scripts/var_expansion.ebuild
@@ -5,3 +5,7 @@ FOO2="${EAPI3:-hello}"
 FOO3=123
 FOO4=$EAPI
 FOO5=$(( 1+1 ))
+FOO6=${EAPI:=hello}
+FOO7=${FOO8:=hello}
+FOO9=${EAPI:+hello}
+FOO10=${NOT_EXIST:+hello}

diff --git a/scripts/var_expansion.ebuild.result b/scripts/var_expansion.ebuild.result
index bad2cf3..7d2e5ca 100644
--- a/scripts/var_expansion.ebuild.result
+++ b/scripts/var_expansion.ebuild.result
@@ -1,7 +1,12 @@
 EAPI=3
 EAPI4=4
 FOO=3
+FOO10=
 FOO2=hello
 FOO3=123
 FOO4=3
 FOO5=2
+FOO6=3
+FOO7=hello
+FOO8=hello
+FOO9=hello

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index ab6b9e8..aad8f48 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -424,5 +424,25 @@ public:
   {
     return (is_unset_or_null(name)? value : resolve<std::string>(name));
   }
+
+  /// \brief perform ${parameter:=word} expansion
+  /// \param the name of the parameter
+  /// \param the value of the word
+  /// \return the expansion result
+  const std::string do_assign_expansion(const std::string& name,
+                                        const std::string& value)
+  {
+    return (is_unset_or_null(name)? set_value(name, value) : resolve<std::string>(name));
+  }
+
+  /// \brief perform ${parameter:+word} expansion
+  /// \param the name of the parameter
+  /// \param the value of the word
+  /// \return the expansion result
+  const std::string do_alternate_expansion(const std::string& name,
+                                           const std::string& value)
+  {
+    return (is_unset_or_null(name)? "" : value);
+  }
 };
 #endif