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

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

commit:     9b72788bf2f6cd763a4f99f39827b1a8c19e8cb2
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Thu Apr 14 04:48:54 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 04:48:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=9b72788b

Merge remote-tracking branch 'mu/master'

Conflicts:
	src/core/interpreter.h


 bashast/bashast.g                           |   19 +++-
 bashast/features_script/features.sh.ast     |    2 +-
 bashast/gunit/arith_main.gunit              |   14 ++-
 bashast/gunit/array.gunit                   |    6 +-
 bashast/gunit/assoc_array.gunit             |    2 +-
 bashast/gunit/expansions.gunit              |    2 +-
 bashast/libbashWalker.g                     |  138 ++++++++++++++++++---------
 scripts/arithmetic_assignment.ebuild        |    2 +
 scripts/arithmetic_assignment.ebuild.result |    3 +
 scripts/binary_arithmetic.ebuild            |   30 ++++++-
 scripts/binary_arithmetic.ebuild.result     |   26 +++++-
 scripts/var_def.ebuild                      |   22 ++++-
 scripts/var_def.ebuild.result               |   14 +++-
 scripts/var_expansion.ebuild                |   15 +++-
 scripts/var_expansion.ebuild.result         |   14 +++
 src/core/interpreter.cpp                    |   36 +++++++
 src/core/interpreter.h                      |   89 ++++++++++++------
 src/core/symbols.hpp                        |   26 +++---
 src/core/tests/interpreter_test.cpp         |   17 +++-
 test/variable_printer.cpp                   |    4 +-
 test/walker_test.cpp                        |   13 +++
 21 files changed, 382 insertions(+), 112 deletions(-)

diff --cc src/core/interpreter.cpp
index 0086216,9f10949..c723173
--- a/src/core/interpreter.cpp
+++ b/src/core/interpreter.cpp
@@@ -21,3 -21,38 +21,39 @@@
  /// \author Mu Qiao
  /// \brief implementations for bash interpreter (visitor pattern).
  ///
+ 
+ #include "core/interpreter.h"
+ 
+ #include <boost/algorithm/string/join.hpp>
+ 
+ void interpreter::get_all_elements_joined(const std::string& name,
+                                           const std::string& delim,
+                                           std::string& result)
+ {
+   std::vector<std::string> source;
 -  std::shared_ptr<variable> value = members.resolve(name);
 -  if(value)
++
++  auto i = members.find(name);
++  if(i != members.end())
+   {
 -    value->get_all_values(source);
++    i->second->get_all_values(source);
+     result = boost::algorithm::join(source, delim);
+   }
+   else
+   {
+     result = "";
+   }
+ }
+ 
+ void interpreter::get_all_elements(const std::string& name,
+                                    std::string& result)
+ {
+   get_all_elements_joined(name, " ", result);
+ }
+ 
+ void interpreter::get_all_elements_IFS_joined(const std::string& name,
+                                               std::string& result)
+ {
+   get_all_elements_joined(name,
+                           resolve<std::string>("IFS").substr(0, 1),
+                           result);
+ }
diff --cc src/core/interpreter.h
index 3baf029,5ac5027..e61748a
--- a/src/core/interpreter.h
+++ b/src/core/interpreter.h
@@@ -394,13 -401,13 +403,13 @@@ public
    ///        if the variable is undefined
    /// \param variable name
    /// \return whether the value of the variable is null
-   bool is_unset_or_null(const std::string& name)
+   bool is_unset_or_null(const std::string& name, const unsigned index)
    {
 -    std::shared_ptr<variable> value = members.resolve(name);
 -    if(value)
 -      return value->is_null(index);
 -    else
 +    auto i = members.find(name);
 +    if(i == members.end())
        return true;
 +    else
-       return i->second->is_null();
++      return i->second->is_null(index);
    }
  
    /// \brief check whether the value of the variable is unset
@@@ -420,13 -427,14 +429,14 @@@
    template <typename T>
    const T& set_value(const std::string& name,
                       const T& new_value,
-                      const unsigned index=0)
+                      const unsigned index=0,
+                      bool is_null=false)
    {
 -    std::shared_ptr<variable> value = members.resolve(name);
 -    if(!value)
 +    auto i = members.find(name);
 +    if(i == members.end())
-       define(name, new_value, false);
+       define(name, new_value, false, is_null, index);
      else
-       i->second->set_value(new_value, index);
 -      value->set_value(new_value, index, is_null);
++      i->second->set_value(new_value, index, is_null);
      return new_value;
    }
  
@@@ -439,11 -447,12 +449,12 @@@
    void define(const std::string& name,
                const T& value,
                bool readonly=false,
-               bool is_null=false)
+               bool is_null=false,
+               const unsigned index=0)
    {
      std::shared_ptr<variable> target(
-         new variable(name, value, readonly, is_null));
+         new variable(name, value, readonly, is_null, index));
 -    members.define(target);
 +    members[name] = target;
    }
  
    /// \brief perform ${parameter:−word} expansion
@@@ -509,11 -525,25 +527,26 @@@
    /// \return the length
    unsigned get_length(const std::string& name, const unsigned index=0)
    {
 -    std::shared_ptr<variable> value = members.resolve(name);
 -    if(!value)
 +    auto i = members.find(name);
 +    if(i == members.end())
        return 0;
 -    return value->get_length(index);
 +    return i->second->get_length(index);
    }
  
+   /// \brief get the length of an array
+   /// \param the name of the array
+   /// \return the length of the array
+   unsigned get_array_length(const std::string& name)
+   {
 -    std::shared_ptr<variable> value = members.resolve(name);
 -    if(!value)
++    auto i = members.find(name);
++    if(i == members.end())
+       return 0;
 -    return value->get_array_length();
++    else
++      return i->second->get_array_length();
+   }
+ 
+   void get_all_elements(const std::string&, std::string&);
+ 
+   void get_all_elements_IFS_joined(const std::string&, std::string&);
  };
  #endif