@@ -50,7 +50,7 @@ export encode_def_id;
50
50
type abbrev_map = map:: HashMap < ty:: t , tyencode:: ty_abbrev > ;
51
51
52
52
type encode_inlined_item = fn @( ecx : @encode_ctxt ,
53
- ebml_w : writer:: Serializer ,
53
+ ebml_w : writer:: Encoder ,
54
54
path : ast_map:: path ,
55
55
ii : ast:: inlined_item ) ;
56
56
@@ -96,31 +96,31 @@ fn reachable(ecx: @encode_ctxt, id: node_id) -> bool {
96
96
ecx. reachable . contains_key ( id)
97
97
}
98
98
99
- fn encode_name ( ecx : @encode_ctxt , ebml_w : writer:: Serializer , name : ident ) {
99
+ fn encode_name ( ecx : @encode_ctxt , ebml_w : writer:: Encoder , name : ident ) {
100
100
ebml_w. wr_tagged_str ( tag_paths_data_name, ecx. tcx . sess . str_of ( name) ) ;
101
101
}
102
102
103
- fn encode_impl_type_basename ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
103
+ fn encode_impl_type_basename ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
104
104
name : ident ) {
105
105
ebml_w. wr_tagged_str ( tag_item_impl_type_basename,
106
106
ecx. tcx . sess . str_of ( name) ) ;
107
107
}
108
108
109
- fn encode_def_id ( ebml_w : writer:: Serializer , id : def_id ) {
109
+ fn encode_def_id ( ebml_w : writer:: Encoder , id : def_id ) {
110
110
ebml_w. wr_tagged_str ( tag_def_id, def_to_str ( id) ) ;
111
111
}
112
112
113
- fn encode_region_param ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
113
+ fn encode_region_param ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
114
114
it : @ast:: item ) {
115
115
let opt_rp = ecx. tcx . region_paramd_items . find ( it. id ) ;
116
116
for opt_rp. each |rp| {
117
117
do ebml_w. wr_tag( tag_region_param) {
118
- ( * rp) . serialize ( & ebml_w) ;
118
+ ( * rp) . encode ( & ebml_w) ;
119
119
}
120
120
}
121
121
}
122
122
123
- fn encode_mutability ( ebml_w : writer:: Serializer , mt : struct_mutability ) {
123
+ fn encode_mutability ( ebml_w : writer:: Encoder , mt : struct_mutability ) {
124
124
do ebml_w. wr_tag ( tag_struct_mut) {
125
125
let val = match mt {
126
126
struct_immutable => 'a' ,
@@ -132,7 +132,7 @@ fn encode_mutability(ebml_w: writer::Serializer, mt: struct_mutability) {
132
132
133
133
type entry < T > = { val : T , pos : uint } ;
134
134
135
- fn add_to_index ( ecx : @encode_ctxt , ebml_w : writer:: Serializer , path : & [ ident ] ,
135
+ fn add_to_index ( ecx : @encode_ctxt , ebml_w : writer:: Encoder , path : & [ ident ] ,
136
136
index : & mut ~[ entry < ~str > ] , name : ident ) {
137
137
let mut full_path = ~[ ] ;
138
138
full_path. push_all ( path) ;
@@ -143,7 +143,7 @@ fn add_to_index(ecx: @encode_ctxt, ebml_w: writer::Serializer, path: &[ident],
143
143
pos: ebml_w. writer . tell ( ) } ) ;
144
144
}
145
145
146
- fn encode_trait_ref ( ebml_w : writer:: Serializer , ecx : @encode_ctxt ,
146
+ fn encode_trait_ref ( ebml_w : writer:: Encoder , ecx : @encode_ctxt ,
147
147
t : @trait_ref ) {
148
148
ebml_w. start_tag ( tag_impl_trait) ;
149
149
encode_type ( ecx, ebml_w, node_id_to_type ( ecx. tcx , t. ref_id ) ) ;
@@ -152,15 +152,15 @@ fn encode_trait_ref(ebml_w: writer::Serializer, ecx: @encode_ctxt,
152
152
153
153
154
154
// Item info table encoding
155
- fn encode_family ( ebml_w : writer:: Serializer , c : char ) {
155
+ fn encode_family ( ebml_w : writer:: Encoder , c : char ) {
156
156
ebml_w. start_tag ( tag_items_data_item_family) ;
157
157
ebml_w. writer . write ( & [ c as u8 ] ) ;
158
158
ebml_w. end_tag ( ) ;
159
159
}
160
160
161
161
fn def_to_str ( did : def_id ) -> ~str { fmt ! ( "%d:%d" , did. crate , did. node) }
162
162
163
- fn encode_ty_type_param_bounds ( ebml_w : writer:: Serializer , ecx : @encode_ctxt ,
163
+ fn encode_ty_type_param_bounds ( ebml_w : writer:: Encoder , ecx : @encode_ctxt ,
164
164
params : @~[ ty:: param_bounds ] ) {
165
165
let ty_str_ctxt = @{ diag: ecx. diag ,
166
166
ds: def_to_str,
@@ -174,21 +174,21 @@ fn encode_ty_type_param_bounds(ebml_w: writer::Serializer, ecx: @encode_ctxt,
174
174
}
175
175
}
176
176
177
- fn encode_type_param_bounds ( ebml_w : writer:: Serializer , ecx : @encode_ctxt ,
177
+ fn encode_type_param_bounds ( ebml_w : writer:: Encoder , ecx : @encode_ctxt ,
178
178
params : ~[ ty_param ] ) {
179
179
let ty_param_bounds =
180
180
@params. map ( |param| ecx. tcx . ty_param_bounds . get ( param. id ) ) ;
181
181
encode_ty_type_param_bounds ( ebml_w, ecx, ty_param_bounds) ;
182
182
}
183
183
184
184
185
- fn encode_variant_id ( ebml_w : writer:: Serializer , vid : def_id ) {
185
+ fn encode_variant_id ( ebml_w : writer:: Encoder , vid : def_id ) {
186
186
ebml_w. start_tag ( tag_items_data_item_variant) ;
187
187
ebml_w. writer . write ( str:: to_bytes ( def_to_str ( vid) ) ) ;
188
188
ebml_w. end_tag ( ) ;
189
189
}
190
190
191
- fn write_type ( ecx : @encode_ctxt , ebml_w : writer:: Serializer , typ : ty:: t ) {
191
+ fn write_type ( ecx : @encode_ctxt , ebml_w : writer:: Encoder , typ : ty:: t ) {
192
192
let ty_str_ctxt =
193
193
@{ diag: ecx. diag ,
194
194
ds: def_to_str,
@@ -198,7 +198,7 @@ fn write_type(ecx: @encode_ctxt, ebml_w: writer::Serializer, typ: ty::t) {
198
198
tyencode:: enc_ty ( ebml_w. writer , ty_str_ctxt, typ) ;
199
199
}
200
200
201
- fn write_vstore ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
201
+ fn write_vstore ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
202
202
vstore : ty:: vstore ) {
203
203
let ty_str_ctxt =
204
204
@{ diag: ecx. diag ,
@@ -209,13 +209,13 @@ fn write_vstore(ecx: @encode_ctxt, ebml_w: writer::Serializer,
209
209
tyencode:: enc_vstore ( ebml_w. writer , ty_str_ctxt, vstore) ;
210
210
}
211
211
212
- fn encode_type ( ecx : @encode_ctxt , ebml_w : writer:: Serializer , typ : ty:: t ) {
212
+ fn encode_type ( ecx : @encode_ctxt , ebml_w : writer:: Encoder , typ : ty:: t ) {
213
213
ebml_w. start_tag ( tag_items_data_item_type) ;
214
214
write_type ( ecx, ebml_w, typ) ;
215
215
ebml_w. end_tag ( ) ;
216
216
}
217
217
218
- fn encode_symbol ( ecx : @encode_ctxt , ebml_w : writer:: Serializer , id : node_id ) {
218
+ fn encode_symbol ( ecx : @encode_ctxt , ebml_w : writer:: Encoder , id : node_id ) {
219
219
ebml_w. start_tag ( tag_items_data_item_symbol) ;
220
220
let sym = match ecx. item_symbols . find ( id) {
221
221
Some ( ref x) => ( * x) ,
@@ -228,27 +228,27 @@ fn encode_symbol(ecx: @encode_ctxt, ebml_w: writer::Serializer, id: node_id) {
228
228
ebml_w. end_tag ( ) ;
229
229
}
230
230
231
- fn encode_discriminant ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
231
+ fn encode_discriminant ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
232
232
id : node_id ) {
233
233
ebml_w. start_tag ( tag_items_data_item_symbol) ;
234
234
ebml_w. writer . write ( str:: to_bytes ( ecx. discrim_symbols . get ( id) ) ) ;
235
235
ebml_w. end_tag ( ) ;
236
236
}
237
237
238
- fn encode_disr_val ( _ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
238
+ fn encode_disr_val ( _ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
239
239
disr_val : int ) {
240
240
ebml_w. start_tag ( tag_disr_val) ;
241
241
ebml_w. writer . write ( str:: to_bytes ( int:: to_str ( disr_val, 10 u) ) ) ;
242
242
ebml_w. end_tag ( ) ;
243
243
}
244
244
245
- fn encode_parent_item ( ebml_w : writer:: Serializer , id : def_id ) {
245
+ fn encode_parent_item ( ebml_w : writer:: Encoder , id : def_id ) {
246
246
ebml_w. start_tag ( tag_items_data_parent_item) ;
247
247
ebml_w. writer . write ( str:: to_bytes ( def_to_str ( id) ) ) ;
248
248
ebml_w. end_tag ( ) ;
249
249
}
250
250
251
- fn encode_enum_variant_info ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
251
+ fn encode_enum_variant_info ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
252
252
id : node_id , variants : ~[ variant ] ,
253
253
path : ast_map:: path , index : @mut ~[ entry < int > ] ,
254
254
ty_params : ~[ ty_param ] ) {
@@ -285,9 +285,9 @@ fn encode_enum_variant_info(ecx: @encode_ctxt, ebml_w: writer::Serializer,
285
285
}
286
286
}
287
287
288
- fn encode_path ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
288
+ fn encode_path ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
289
289
path : ast_map:: path , name : ast_map:: path_elt ) {
290
- fn encode_path_elt ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
290
+ fn encode_path_elt ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
291
291
elt : ast_map:: path_elt ) {
292
292
let ( tag, name) = match elt {
293
293
ast_map:: path_mod( name) => ( tag_path_elt_mod, name) ,
@@ -306,7 +306,7 @@ fn encode_path(ecx: @encode_ctxt, ebml_w: writer::Serializer,
306
306
}
307
307
}
308
308
309
- fn encode_info_for_mod ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
309
+ fn encode_info_for_mod ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
310
310
md : _mod , id : node_id , path : ast_map:: path ,
311
311
name : ident ) {
312
312
ebml_w. start_tag ( tag_items_data_item) ;
@@ -365,15 +365,15 @@ fn encode_info_for_mod(ecx: @encode_ctxt, ebml_w: writer::Serializer,
365
365
ebml_w. end_tag ( ) ;
366
366
}
367
367
368
- fn encode_visibility ( ebml_w : writer:: Serializer , visibility : visibility ) {
368
+ fn encode_visibility ( ebml_w : writer:: Encoder , visibility : visibility ) {
369
369
encode_family ( ebml_w, match visibility {
370
370
public => 'g' ,
371
371
private => 'j' ,
372
372
inherited => 'N'
373
373
} ) ;
374
374
}
375
375
376
- fn encode_self_type ( ebml_w : writer:: Serializer , self_type : ast:: self_ty_ ) {
376
+ fn encode_self_type ( ebml_w : writer:: Encoder , self_type : ast:: self_ty_ ) {
377
377
ebml_w. start_tag ( tag_item_trait_method_self_ty) ;
378
378
379
379
// Encode the base self type.
@@ -405,14 +405,14 @@ fn encode_self_type(ebml_w: writer::Serializer, self_type: ast::self_ty_) {
405
405
ebml_w. end_tag ( ) ;
406
406
}
407
407
408
- fn encode_method_sort ( ebml_w : writer:: Serializer , sort : char ) {
408
+ fn encode_method_sort ( ebml_w : writer:: Encoder , sort : char ) {
409
409
ebml_w. start_tag ( tag_item_trait_method_sort) ;
410
410
ebml_w. writer . write ( & [ sort as u8 ] ) ;
411
411
ebml_w. end_tag ( ) ;
412
412
}
413
413
414
414
/* Returns an index of items in this class */
415
- fn encode_info_for_struct ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
415
+ fn encode_info_for_struct ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
416
416
path : ast_map:: path ,
417
417
fields : ~[ @struct_field ] ,
418
418
global_index : @mut ~[ entry < int > ] ) -> ~[ entry < int > ] {
@@ -447,7 +447,7 @@ fn encode_info_for_struct(ecx: @encode_ctxt, ebml_w: writer::Serializer,
447
447
}
448
448
449
449
// This is for encoding info for ctors and dtors
450
- fn encode_info_for_ctor ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
450
+ fn encode_info_for_ctor ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
451
451
id : node_id , ident : ident , path : ast_map:: path ,
452
452
item : Option < inlined_item > , tps : ~[ ty_param ] ) {
453
453
ebml_w. start_tag ( tag_items_data_item) ;
@@ -472,7 +472,7 @@ fn encode_info_for_ctor(ecx: @encode_ctxt, ebml_w: writer::Serializer,
472
472
ebml_w. end_tag ( ) ;
473
473
}
474
474
475
- fn encode_info_for_method ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
475
+ fn encode_info_for_method ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
476
476
impl_path : ast_map:: path , should_inline : bool ,
477
477
parent_id : node_id ,
478
478
m : @method , all_tps : ~[ ty_param ] ) {
@@ -527,7 +527,7 @@ fn should_inline(attrs: ~[attribute]) -> bool {
527
527
}
528
528
529
529
530
- fn encode_info_for_item( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
530
+ fn encode_info_for_item( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
531
531
item: @item, index : @mut ~[ entry < int > ] ,
532
532
path : ast_map:: path ) {
533
533
@@ -540,7 +540,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Serializer,
540
540
} ;
541
541
if !must_write && !reachable ( ecx, item. id ) { return ; }
542
542
543
- fn add_to_index_ ( item : @item, ebml_w : writer:: Serializer ,
543
+ fn add_to_index_ ( item : @item, ebml_w : writer:: Encoder ,
544
544
index : @mut ~[ entry < int > ] ) {
545
545
index. push ( { val: item. id , pos: ebml_w. writer . tell ( ) } ) ;
546
546
}
@@ -804,7 +804,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Serializer,
804
804
}
805
805
}
806
806
807
- fn encode_info_for_foreign_item ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
807
+ fn encode_info_for_foreign_item ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
808
808
nitem : @foreign_item ,
809
809
index : @mut ~[ entry < int > ] ,
810
810
path : ast_map:: path , abi : foreign_abi ) {
@@ -837,7 +837,7 @@ fn encode_info_for_foreign_item(ecx: @encode_ctxt, ebml_w: writer::Serializer,
837
837
ebml_w. end_tag ( ) ;
838
838
}
839
839
840
- fn encode_info_for_items ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
840
+ fn encode_info_for_items ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
841
841
crate : @crate ) -> ~[ entry < int > ] {
842
842
let index = @mut ~[ ] ;
843
843
ebml_w. start_tag ( tag_items_data) ;
@@ -892,7 +892,7 @@ fn create_index<T: Copy Hash IterBytes>(index: ~[entry<T>]) ->
892
892
return buckets_frozen;
893
893
}
894
894
895
- fn encode_index < T > ( ebml_w : writer:: Serializer , buckets : ~[ @~[ entry < T > ] ] ,
895
+ fn encode_index < T > ( ebml_w : writer:: Encoder , buckets : ~[ @~[ entry < T > ] ] ,
896
896
write_fn : fn ( io:: Writer , T ) ) {
897
897
let writer = ebml_w. writer ;
898
898
ebml_w. start_tag ( tag_index) ;
@@ -927,7 +927,7 @@ fn write_int(writer: io::Writer, &&n: int) {
927
927
writer. write_be_u32 ( n as u32 ) ;
928
928
}
929
929
930
- fn encode_meta_item ( ebml_w : writer:: Serializer , mi : meta_item ) {
930
+ fn encode_meta_item ( ebml_w : writer:: Encoder , mi : meta_item ) {
931
931
match mi. node {
932
932
meta_word( ref name) => {
933
933
ebml_w. start_tag ( tag_meta_item_word) ;
@@ -964,7 +964,7 @@ fn encode_meta_item(ebml_w: writer::Serializer, mi: meta_item) {
964
964
}
965
965
}
966
966
967
- fn encode_attributes ( ebml_w : writer:: Serializer , attrs : ~[ attribute ] ) {
967
+ fn encode_attributes ( ebml_w : writer:: Encoder , attrs : ~[ attribute ] ) {
968
968
ebml_w. start_tag ( tag_attributes) ;
969
969
for attrs. each |attr| {
970
970
ebml_w. start_tag ( tag_attribute) ;
@@ -1025,7 +1025,7 @@ fn synthesize_crate_attrs(ecx: @encode_ctxt, crate: @crate) -> ~[attribute] {
1025
1025
return attrs;
1026
1026
}
1027
1027
1028
- fn encode_crate_deps ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
1028
+ fn encode_crate_deps ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
1029
1029
cstore : cstore:: CStore ) {
1030
1030
1031
1031
fn get_ordered_deps ( ecx : @encode_ctxt , cstore : cstore:: CStore )
@@ -1071,7 +1071,7 @@ fn encode_crate_deps(ecx: @encode_ctxt, ebml_w: writer::Serializer,
1071
1071
ebml_w. end_tag ( ) ;
1072
1072
}
1073
1073
1074
- fn encode_crate_dep ( ecx : @encode_ctxt , ebml_w : writer:: Serializer ,
1074
+ fn encode_crate_dep ( ecx : @encode_ctxt , ebml_w : writer:: Encoder ,
1075
1075
dep : decoder:: crate_dep ) {
1076
1076
ebml_w. start_tag ( tag_crate_dep) ;
1077
1077
ebml_w. start_tag ( tag_crate_dep_name) ;
@@ -1086,7 +1086,7 @@ fn encode_crate_dep(ecx: @encode_ctxt, ebml_w: writer::Serializer,
1086
1086
ebml_w. end_tag ( ) ;
1087
1087
}
1088
1088
1089
- fn encode_hash ( ebml_w : writer:: Serializer , hash : ~str ) {
1089
+ fn encode_hash ( ebml_w : writer:: Encoder , hash : ~str ) {
1090
1090
ebml_w. start_tag ( tag_crate_hash) ;
1091
1091
ebml_w. writer . write ( str:: to_bytes ( hash) ) ;
1092
1092
ebml_w. end_tag ( ) ;
@@ -1124,7 +1124,7 @@ fn encode_metadata(parms: encode_parms, crate: @crate) -> ~[u8] {
1124
1124
type_abbrevs: ty:: new_ty_hash ( )
1125
1125
} ) ;
1126
1126
1127
- let ebml_w = writer:: Serializer ( wr as io:: Writer ) ;
1127
+ let ebml_w = writer:: Encoder ( wr as io:: Writer ) ;
1128
1128
1129
1129
encode_hash ( ebml_w, ecx. link_meta . extras_hash ) ;
1130
1130
0 commit comments