@@ -541,12 +541,12 @@ fn visit_item_with_scope(e: @env, i: @ast::item, sc: scopes, v: vt<scopes>) {
541
541
v. visit_ty ( m. decl . output , msc, v) ;
542
542
}
543
543
}
544
- ast:: item_class ( tps, members, ctor_id , ctor_decl , ctor_block ) {
544
+ ast:: item_class ( tps, members, ctor ) {
545
545
visit:: visit_ty_params ( tps, sc, v) ;
546
546
let class_scope = cons ( scope_item ( i) , @sc) ;
547
547
/* visit the constructor... */
548
- visit_fn_with_scope ( e, visit:: fk_item_fn ( i. ident , tps) , ctor_decl ,
549
- ctor_block , ctor_block . span , ctor_id ,
548
+ visit_fn_with_scope ( e, visit:: fk_item_fn ( i. ident , tps) , ctor . node . dec ,
549
+ ctor . node . body , ctor . span , ctor . node . id ,
550
550
class_scope, v) ;
551
551
/* visit the items */
552
552
for cm in members {
@@ -1029,12 +1029,12 @@ fn lookup_in_scope(e: env, sc: scopes, sp: span, name: ident, ns: namespace)
1029
1029
ast:: item_native_mod ( m) {
1030
1030
ret lookup_in_local_native_mod ( e, it. id , sp, name, ns) ;
1031
1031
}
1032
- ast:: item_class ( tps, members, ctor_id , _ , _ ) {
1032
+ ast:: item_class ( tps, members, ctor ) {
1033
1033
if ns == ns_type {
1034
1034
ret lookup_in_ty_params ( e, name, tps) ;
1035
1035
}
1036
1036
if ns == ns_val ( value_or_enum) && name == it. ident {
1037
- ret some ( ast:: def_fn ( local_def ( ctor_id ) ,
1037
+ ret some ( ast:: def_fn ( local_def ( ctor . node . id ) ,
1038
1038
ast:: impure_fn) ) ;
1039
1039
}
1040
1040
if ns == ns_val ( value_or_enum) {
@@ -1359,7 +1359,7 @@ fn found_def_item(i: @ast::item, ns: namespace) -> option<def> {
1359
1359
_ { }
1360
1360
}
1361
1361
}
1362
- ast:: item_class ( _, _, _, _ , _ ) {
1362
+ ast:: item_class ( _, _, _) {
1363
1363
if ns == ns_type {
1364
1364
ret some ( ast:: def_class ( local_def ( i. id ) ) ) ;
1365
1365
}
@@ -1664,16 +1664,16 @@ fn index_mod(md: ast::_mod) -> mod_index {
1664
1664
variant_idx += 1 u;
1665
1665
}
1666
1666
}
1667
- ast:: item_class ( tps, items, ctor_id , ctor_decl , ctor_body ) {
1667
+ ast:: item_class ( tps, items, ctor ) {
1668
1668
// add the class name itself
1669
1669
add_to_index ( index, it. ident , mie_item ( it) ) ;
1670
1670
// add the constructor decl
1671
1671
add_to_index ( index, it. ident ,
1672
1672
mie_item ( @{ ident: it. ident , attrs: [ ] ,
1673
- id: ctor_id ,
1674
- node:
1675
- item_fn ( ctor_decl , tps, ctor_body ) ,
1676
- span: ctor_body . span } ) ) ;
1673
+ id: ctor . node . id ,
1674
+ node:
1675
+ item_fn ( ctor . node . dec , tps, ctor . node . body ) ,
1676
+ span: ctor . node . body . span } ) ) ;
1677
1677
// add the members
1678
1678
for ci in items {
1679
1679
add_to_index ( index, class_item_ident ( ci) ,
0 commit comments