diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-03-07 02:49:03 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-03-07 03:38:09 -0600 |
| commit | c86bbd45471ab4ef5d0dd133f6923596230975da (patch) | |
| tree | 17a328bb75e2e2305a437d70303bf28319c3362d | |
| parent | cabec6db1a9a6dab3dd190494a2a786aebe5f22f (diff) | |
| download | fork-ledger-c86bbd45471ab4ef5d0dd133f6923596230975da.tar.gz fork-ledger-c86bbd45471ab4ef5d0dd133f6923596230975da.tar.bz2 fork-ledger-c86bbd45471ab4ef5d0dd133f6923596230975da.zip | |
Whitespace fixes
| -rw-r--r-- | src/annotate.h | 1 | ||||
| -rw-r--r-- | src/global.h | 1 | ||||
| -rw-r--r-- | src/scope.cc | 4 | ||||
| -rw-r--r-- | src/scope.h | 8 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/annotate.h b/src/annotate.h index 38553752..c1f52a62 100644 --- a/src/annotate.h +++ b/src/annotate.h @@ -97,7 +97,6 @@ struct annotation_t : public supports_flags<>, } void parse(std::istream& in); - void print(std::ostream& out, bool keep_base = false, bool no_computed_annotations = false) const; diff --git a/src/global.h b/src/global.h index 2cb7842e..ce0534b0 100644 --- a/src/global.h +++ b/src/global.h @@ -82,6 +82,7 @@ public: void pop_report() { assert(! report_stack.empty()); report_stack.pop_front(); + // There should always be the "default report" waiting on the stack. assert(! report_stack.empty()); scope_t::default_scope = &report(); diff --git a/src/scope.cc b/src/scope.cc index b2a7b17b..160a97c9 100644 --- a/src/scope.cc +++ b/src/scope.cc @@ -53,8 +53,8 @@ void symbol_scope_t::define(const symbol_t::kind_t kind, assert(i != symbols->end()); symbols->erase(i); - result = symbols->insert(symbol_map::value_type(symbol_t(kind, name, def), - def)); + result = symbols->insert(symbol_map::value_type + (symbol_t(kind, name, def), def)); if (! result.second) throw_(compile_error, _("Redefinition of '%1' in the same scope") << name); diff --git a/src/scope.h b/src/scope.h index e5127dbd..7a50c423 100644 --- a/src/scope.h +++ b/src/scope.h @@ -144,8 +144,7 @@ public: explicit child_scope_t() : parent(NULL) { TRACE_CTOR(child_scope_t, ""); } - explicit child_scope_t(scope_t& _parent) - : parent(&_parent) { + explicit child_scope_t(scope_t& _parent) : parent(&_parent) { TRACE_CTOR(child_scope_t, "scope_t&"); } virtual ~child_scope_t() { @@ -276,7 +275,7 @@ class symbol_scope_t : public child_scope_t optional<symbol_map> symbols; public: - explicit symbol_scope_t() { + explicit symbol_scope_t() : child_scope_t() { TRACE_CTOR(symbol_scope_t, ""); } explicit symbol_scope_t(scope_t& _parent) : child_scope_t(_parent) { @@ -388,8 +387,7 @@ public: : context_scope_t(_parent, _parent.type_context(), _parent.type_required()), ptr(NULL), locus(_locus), depth(_depth) { - TRACE_CTOR(call_scope_t, - "scope_t&, value_t::type_t, bool, expr_t::ptr_op_t *, int"); + TRACE_CTOR(call_scope_t, "scope_t&, expr_t::ptr_op_t *, const int"); } virtual ~call_scope_t() { TRACE_DTOR(call_scope_t); |