diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-13 00:42:25 -0400 |
| commit | 40f553228f5a28034c6635fdcb4c86af28a385ed (patch) | |
| tree | 2c40305c9f9841a4c3d453a4a5c49ec69056b4b2 /src/scope.cc | |
| parent | 556211e623cad88213e5087b5c9c36e754d9aa02 (diff) | |
| parent | b1b4e2aadff5983d443d70c09ea86a41b015873f (diff) | |
| download | fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.gz fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.tar.bz2 fork-ledger-40f553228f5a28034c6635fdcb4c86af28a385ed.zip | |
Merge branch 'next'
Diffstat (limited to 'src/scope.cc')
| -rw-r--r-- | src/scope.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scope.cc b/src/scope.cc index 72cf4ad3..faad352a 100644 --- a/src/scope.cc +++ b/src/scope.cc @@ -38,7 +38,7 @@ namespace ledger { scope_t * scope_t::default_scope = NULL; void symbol_scope_t::define(const symbol_t::kind_t kind, - const string& name, expr_t::ptr_op_t def) + const string& name, expr_t::ptr_op_t def) { DEBUG("scope.symbols", "Defining '" << name << "' = " << def); @@ -53,15 +53,15 @@ void symbol_scope_t::define(const symbol_t::kind_t kind, symbols->erase(i); result = symbols->insert(symbol_map::value_type(symbol_t(kind, name, def), - def)); + def)); if (! result.second) throw_(compile_error, - _("Redefinition of '%1' in the same scope") << name); + _("Redefinition of '%1' in the same scope") << name); } } expr_t::ptr_op_t symbol_scope_t::lookup(const symbol_t::kind_t kind, - const string& name) + const string& name) { if (symbols) { symbol_map::const_iterator i = symbols->find(symbol_t(kind, name)); |