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

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

commit:     3c91e9d0018e0763dff71c856bd9c0c3fd4b83aa
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 10:25:29 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 10:25:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=3c91e9d0

Implement ${#parameter} expansion

---
 bashast/libbashWalker.g             |    3 +++
 scripts/var_expansion.ebuild        |    2 ++
 scripts/var_expansion.ebuild.result |    2 ++
 src/core/interpreter.h              |    8 ++++++++
 4 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/bashast/libbashWalker.g b/bashast/libbashWalker.g
index e6f4393..71aba2e 100644
--- a/bashast/libbashWalker.g
+++ b/bashast/libbashWalker.g
@@ -104,6 +104,9 @@ var_expansion returns[std::string libbash_value]
 			libbash_value = walker->do_substring_expansion($var_name.libbash_value, offset, length);
 		else
 			libbash_value = walker->do_substring_expansion($var_name.libbash_value, offset);
+	}
+	|^(POUND var_name) {
+		libbash_value = boost::lexical_cast<std::string>(walker->get_length($var_name.libbash_value));
 	};
 
 word returns[std::string libbash_value]:

diff --git a/scripts/var_expansion.ebuild b/scripts/var_expansion.ebuild
index b0402a8..0045b5e 100644
--- a/scripts/var_expansion.ebuild
+++ b/scripts/var_expansion.ebuild
@@ -22,3 +22,5 @@ FOO020=${FOO009: -2:2}
 FOO021=${FOO009:2:100}
 FOO022=${FOO009: -2:100}
 FOO023=${NOT_EXIST:0:2}
+FOO024=${#FOO009}
+FOO025=${#NOT_EXIST}

diff --git a/scripts/var_expansion.ebuild.result b/scripts/var_expansion.ebuild.result
index 5695d1a..e7b767a 100644
--- a/scripts/var_expansion.ebuild.result
+++ b/scripts/var_expansion.ebuild.result
@@ -23,3 +23,5 @@ FOO020=lo
 FOO021=llo
 FOO022=lo
 FOO023=
+FOO024=5
+FOO025=0

diff --git a/src/core/interpreter.h b/src/core/interpreter.h
index cde08ac..1e5f1dc 100644
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@ -485,5 +485,13 @@ public:
     return value.substr(offset, length);
   }
 
+  /// \brief get the length of a string variable
+  /// \param the name of the variable
+  /// \return the length
+  int get_length(const std::string& name)
+  {
+    return resolve<std::string>(name).size();
+  }
+
 };
 #endif