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

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

commit:     d99d179bbe397cf69bca41b0dd3962b1676676f9
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sun May  8 13:04:54 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sun May  8 13:04:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=d99d179b

Merge remote-tracking branch 'mu/variable_setup'

Conflicts:
	src/builtins/source_builtin.cpp


 .gitignore                                     |    2 +
 Makefile.am                                    |   15 ++-
 configure.ac                                   |    2 +
 src/builtins/source_builtin.cpp                |   19 ++-
 src/core/symbols.hpp                           |    2 +-
 src/core/tests/symbols_test.cpp                |    2 +
 src/libbash.cpp                                |    5 +
 src/libbash.h                                  |    3 +-
 utils/command_line.cpp                         |   88 +++++++++
 utils/command_line.h                           |   62 ++++++
 utils/instruo.cpp                              |  251 ++++++++++++++++++++++++
 utils/{metadata_generator.cpp => metadata.cpp} |   35 +---
 src/common.h => utils/metadata.h               |   20 +-
 utils/metadata_generator.cpp                   |   84 +--------
 14 files changed, 465 insertions(+), 125 deletions(-)

diff --cc src/builtins/source_builtin.cpp
index 1e82c77,6ba6b11..277eb94
--- a/src/builtins/source_builtin.cpp
+++ b/src/builtins/source_builtin.cpp
@@@ -26,8 -26,8 +26,9 @@@
  
  #include <fstream>
  #include <string>
+ #include <unordered_map>
  
 +#include "builtins/builtin_exceptions.h"
  #include "cppbash_builtin.h"
  #include "core/interpreter.h"
  #include "core/interpreter_exception.h"
@@@ -40,16 -42,17 +43,22 @@@ int source_builtin::exec(const std::vec
  
    // we need fix this to pass extra arguments as positional parameters
    const std::string& path = bash_args[0];
-   std::ifstream input(path);
-   if(!input)
-     throw interpreter_exception(path + " can't be read");
  
-   bash_ast ast(input);
+   auto& stored_ast = ast_cache[path];
+   if(!stored_ast)
+   {
+     std::ifstream input(path);
+     if(!input)
+       throw interpreter_exception(path + " can't be read");
+ 
+     stored_ast.reset(new bash_ast(input));
+   }
 -  stored_ast->interpret_with(_walker);
++  
 +  try
 +  {
-     ast.interpret_with(_walker);
++    stored_ast->interpret_with(_walker);
 +  }
 +  catch(return_exception& e) {}
  
    return _walker.get_status();
  }