Skip to content

Commit 9bafce7

Browse files
lkupergraydon
authored andcommitted
---
yaml --- r: 2526 b: refs/heads/master c: 6a53e39 h: refs/heads/master v: v3
1 parent 3d90936 commit 9bafce7

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 7c2979e26f23739b62fcda7500d4c5eac092c42c
2+
refs/heads/master: 6a53e39e710d4a31785015d042cc491692954ab7

trunk/src/comp/front/ast.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,12 @@ type _obj = rec(vec[obj_field] fields,
372372
vec[@method] methods,
373373
option::t[@method] dtor);
374374

375-
376-
// Hmm. An anon_obj might extend an existing object, in which case it'll
377-
// probably add fields and methods.
378-
type anon_obj = rec(option.t[vec[obj_field]] fields,
379-
vec[@method] methods,
380-
option.t[ident] with_obj);
375+
type anon_obj = rec(
376+
// New fields and methods, if they exist.
377+
Option.t[vec[obj_field]] fields,
378+
vec[@method] methods,
379+
// with_obj: the original object being extended, if it exists.
380+
Option.t[ident] with_obj);
381381

382382
tag mod_index_entry {
383383
mie_view_item(@view_item);

trunk/src/comp/front/parser.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,6 @@ fn parse_bottom_expr(parser p) -> @ast::expr {
795795
} else {
796796
unexpected(p, p.peek());
797797
}
798-
799798
}
800799

801800
ex = ast::expr_rec(fields, base, p.get_ann());
@@ -836,9 +835,9 @@ fn parse_bottom_expr(parser p) -> @ast::expr {
836835
hi = p.get_hi_pos();
837836
expect(p, token.RBRACE);
838837

839-
// fields and methods may be *additional* or *overriding* fields
840-
// and methods if there's a with_obj, or they may be the *only*
841-
// fields and methods if there's no with_obj.
838+
// fields and methods may be *additional* or *overriding* fields and
839+
// methods if there's a with_obj, or they may be the *only* fields and
840+
// methods if there's no with_obj.
842841

843842
// We don't need to pull ".node" out of fields because it's not a
844843
// "spanned".

0 commit comments

Comments
 (0)