squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Correct capitalization of "Option".

Browse source
This commit is contained in:
Lindsey Kuper 2011-05-10 11:55:32 -07:00 committed by Graydon Hoare
parent 7c2979e26f
commit 6a53e39e71
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/comp/front/ast.rs
View file

@ -372,12 +372,12 @@ type _obj = rec(vec[obj_field] fields,
vec[@method] methods,
option::t[@method] dtor);
// Hmm. An anon_obj might extend an existing object, in which case it'll
// probably add fields and methods.
type anon_obj = rec(option.t[vec[obj_field]] fields,
type anon_obj = rec(
// New fields and methods, if they exist.
Option.t[vec[obj_field]] fields,
vec[@method] methods,
option.t[ident] with_obj);
// with_obj: the original object being extended, if it exists.
Option.t[ident] with_obj);
tag mod_index_entry {
mie_view_item(@view_item);

7
src/comp/front/parser.rs
View file

@ -795,7 +795,6 @@ fn parse_bottom_expr(parser p) -> @ast::expr {
} else {
unexpected(p, p.peek());
}
}
ex = ast::expr_rec(fields, base, p.get_ann());
@ -836,9 +835,9 @@ fn parse_bottom_expr(parser p) -> @ast::expr {
hi = p.get_hi_pos();
expect(p, token.RBRACE);
// fields and methods may be *additional* or *overriding* fields
// and methods if there's a with_obj, or they may be the *only*
// fields and methods if there's no with_obj.
// fields and methods may be *additional* or *overriding* fields and
// methods if there's a with_obj, or they may be the *only* fields and
// methods if there's no with_obj.
// We don't need to pull ".node" out of fields because it's not a
// "spanned".