public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Petteri Räty" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/libbash:master commit in: /
Date: Sun,  8 May 2011 13:07:14 +0000 (UTC)	[thread overview]
Message-ID: <d99d179bbe397cf69bca41b0dd3962b1676676f9.betelgeuse@gentoo> (raw)

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();
  }



             reply	other threads:[~2011-05-08 13:08 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-08 13:07 Petteri Räty [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-19 14:54 [gentoo-commits] proj/libbash:master commit in: / Petteri Räty
2012-06-03  9:08 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-07-20 14:01 Petteri Räty
2011-07-08 14:03 Petteri Räty
2011-07-08 14:03 Petteri Räty
2011-07-03 20:21 Petteri Räty
2011-06-26 13:38 Petteri Räty
2011-06-26 13:38 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:05 Petteri Räty
2011-06-16 16:53 Petteri Räty
2011-06-11  8:52 Petteri Räty
2011-06-11  8:52 Petteri Räty
2011-06-11  8:24 Petteri Räty
2011-06-03 14:48 Petteri Räty
2011-06-03 12:43 Petteri Räty
2011-05-27 23:03 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-14 14:58 Petteri Räty
2011-05-14 14:58 Petteri Räty
2011-05-12 14:06 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-07 12:25 Petteri Räty
2011-04-27 15:11 Petteri Räty
2011-04-20 11:26 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-12 18:29 Petteri Räty
2011-04-11  6:50 Petteri Räty
2011-04-09 13:08 Petteri Räty
2011-04-08 11:12 Petteri Räty
2011-04-07 16:44 Petteri Räty
2011-04-03 13:46 Petteri Räty
2011-04-03 13:46 Petteri Räty
2011-04-02 15:50 Petteri Räty
2011-03-30 12:48 Petteri Räty
2011-03-27  8:56 Petteri Räty
2011-03-26 19:08 Petteri Räty
2011-03-26 19:08 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-25 12:11 Petteri Räty
2011-03-17  9:44 Petteri Räty
2011-03-12 11:53 Petteri Räty
2011-03-06 12:05 Petteri Räty

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d99d179bbe397cf69bca41b0dd3962b1676676f9.betelgeuse@gentoo \
    --to=betelgeuse@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox