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

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

commit:     c6f7de39b7e8ea59a02c768af17f9a5c8dc217cd
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 15:15:34 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 15:15:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=c6f7de39

Merge branch 'multithreading'


 Makefile.am                     |    4 +-
 bashast/libbashWalker.g         |    2 +-
 src/builtins/source_builtin.cpp |   51 +++++++++++--------
 src/core/bash_ast.cpp           |   39 +++++++++++++-
 src/core/bash_ast.h             |    8 ++-
 utils/instruo.cpp               |  108 ++++++++++++++++++---------------------
 6 files changed, 125 insertions(+), 87 deletions(-)

diff --cc src/core/bash_ast.h
index fb42663,190b020..1dd7be2
--- a/src/core/bash_ast.h
+++ b/src/core/bash_ast.h
@@@ -63,18 -58,15 +63,18 @@@ class bash_ast: public boost::noncopyab
    antlr_pointer<ANTLR3_COMMON_TOKEN_STREAM_struct> token_stream;
    antlr_pointer<libbashParser_Ctx_struct> parser;
    pANTLR3_BASE_TREE ast;
-   antlr_pointer<ANTLR3_COMMON_TREE_NODE_STREAM_struct> nodes;
    std::function<pANTLR3_BASE_TREE(libbashParser_Ctx_struct*)> parse;
  
 -  typedef std::unique_ptr<libbashWalker_Ctx_struct, std::function<void(plibbashWalker)>> walker_pointer;
 +  typedef std::unique_ptr<libbashWalker_Ctx_struct, std::function<void(libbashWalker_Ctx_struct*)>> walker_pointer;
  
    void init_parser(const std::string& script, const std::string& script_path);
-   walker_pointer create_walker(interpreter& walker);
+   walker_pointer create_walker(interpreter& walker,
+                                antlr_pointer<ANTLR3_COMMON_TREE_NODE_STREAM_struct>& nodes);
  
  public:
 +  /// \brief build AST from istream
 +  /// \param source input source
 +  /// \param p the parser rule for building the AST
    bash_ast(const std::istream& source,
             std::function<pANTLR3_BASE_TREE(libbashParser_Ctx_struct*)> p=parser_start);
  
@@@ -108,14 -86,15 +108,16 @@@
  
    ///
    /// \brief interpret the script with a given interpreter
 -  /// \param the interpreter object
 +  /// \param walker the interpreter object
 +  /// \param walk the walker rule to evaluate the AST
    /// \return the interpreted result
    template<typename Functor>
 -  typename std::result_of<Functor(plibbashWalker)>::type
 +  typename std::result_of<Functor(libbashWalker_Ctx_struct*)>::type
    interpret_with(interpreter& walker, Functor walk)
    {
-     walker_pointer p_tree_parser = create_walker(walker);
+     antlr_pointer<ANTLR3_COMMON_TREE_NODE_STREAM_struct> nodes(
+       antlr3CommonTreeNodeStreamNewTree(ast, ANTLR3_SIZE_HINT));
+     walker_pointer p_tree_parser = create_walker(walker, nodes);
      return walk(p_tree_parser.get());
    }