sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Whitespace fixes

Browse source
This commit is contained in:
John Wiegley 2012-03-07 02:49:03 -06:00
parent cabec6db1a
commit c86bbd4547
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/annotate.h
View file

@ -97,7 +97,6 @@ struct annotation_t : public supports_flags<>,
} }
void parse(std::istream& in); void parse(std::istream& in);
void print(std::ostream& out, bool keep_base = false, void print(std::ostream& out, bool keep_base = false,
bool no_computed_annotations = false) const; bool no_computed_annotations = false) const;

1
src/global.h
View file

@ -82,6 +82,7 @@ public:
void pop_report() { void pop_report() {
assert(! report_stack.empty()); assert(! report_stack.empty());
report_stack.pop_front(); report_stack.pop_front();
// There should always be the "default report" waiting on the stack. // There should always be the "default report" waiting on the stack.
assert(! report_stack.empty()); assert(! report_stack.empty());
scope_t::default_scope = &report(); scope_t::default_scope = &report();

4
src/scope.cc
View file

@ -53,8 +53,8 @@ void symbol_scope_t::define(const symbol_t::kind_t kind,
assert(i != symbols->end()); assert(i != symbols->end());
symbols->erase(i); symbols->erase(i);
result = symbols->insert(symbol_map::value_type(symbol_t(kind, name, def), result = symbols->insert(symbol_map::value_type
def)); (symbol_t(kind, name, def), def));
if (! result.second) if (! result.second)
throw_(compile_error, throw_(compile_error,
_("Redefinition of '%1' in the same scope") << name); _("Redefinition of '%1' in the same scope") << name);

8
src/scope.h
View file

@ -144,8 +144,7 @@ public:
explicit child_scope_t() : parent(NULL) { explicit child_scope_t() : parent(NULL) {
TRACE_CTOR(child_scope_t, ""); TRACE_CTOR(child_scope_t, "");
} }
explicit child_scope_t(scope_t& _parent) explicit child_scope_t(scope_t& _parent) : parent(&_parent) {
: parent(&_parent) {
TRACE_CTOR(child_scope_t, "scope_t&"); TRACE_CTOR(child_scope_t, "scope_t&");
} }
virtual ~child_scope_t() { virtual ~child_scope_t() {
@ -276,7 +275,7 @@ class symbol_scope_t : public child_scope_t
optional<symbol_map> symbols; optional<symbol_map> symbols;
public: public:
explicit symbol_scope_t() { explicit symbol_scope_t() : child_scope_t() {
TRACE_CTOR(symbol_scope_t, ""); TRACE_CTOR(symbol_scope_t, "");
} }
explicit symbol_scope_t(scope_t& _parent) : child_scope_t(_parent) { explicit symbol_scope_t(scope_t& _parent) : child_scope_t(_parent) {
@ -388,8 +387,7 @@ public:
: context_scope_t(_parent, _parent.type_context(), : context_scope_t(_parent, _parent.type_context(),
_parent.type_required()), _parent.type_required()),
ptr(NULL), locus(_locus), depth(_depth) { ptr(NULL), locus(_locus), depth(_depth) {
TRACE_CTOR(call_scope_t, TRACE_CTOR(call_scope_t, "scope_t&, expr_t::ptr_op_t *, const int");
"scope_t&, value_t::type_t, bool, expr_t::ptr_op_t *, int");
} }
virtual ~call_scope_t() { virtual ~call_scope_t() {
TRACE_DTOR(call_scope_t); TRACE_DTOR(call_scope_t);