@@ -16,7 +16,7 @@ use ast;
16
16
use ast_util:: { new_rename, new_mark, resolve} ;
17
17
use attr;
18
18
use codemap;
19
- use codemap:: { span, CallInfo , ExpandedFrom , NameAndSpan , spanned} ;
19
+ use codemap:: { span, ExpnInfo , NameAndSpan , spanned} ;
20
20
use ext:: base:: * ;
21
21
use fold:: * ;
22
22
use parse;
@@ -60,13 +60,13 @@ pub fn expand_expr(extsbox: @mut SyntaxEnv,
60
60
expander : exp,
61
61
span : exp_sp
62
62
} ) ) ) => {
63
- cx. bt_push ( ExpandedFrom ( CallInfo {
63
+ cx. bt_push ( ExpnInfo {
64
64
call_site : s,
65
65
callee : NameAndSpan {
66
66
name : extnamestr,
67
67
span : exp_sp,
68
68
} ,
69
- } ) ) ;
69
+ } ) ;
70
70
71
71
let expanded = match exp ( cx, mac. span , * tts) {
72
72
MRExpr ( e) => e,
@@ -131,13 +131,13 @@ pub fn expand_mod_items(extsbox: @mut SyntaxEnv,
131
131
132
132
match ( * extsbox) . find ( & intern ( mname) ) {
133
133
Some ( @SE ( ItemDecorator ( dec_fn) ) ) => {
134
- cx. bt_push ( ExpandedFrom ( CallInfo {
134
+ cx. bt_push ( ExpnInfo {
135
135
call_site : attr. span ,
136
136
callee : NameAndSpan {
137
137
name : mname,
138
138
span : None
139
139
}
140
- } ) ) ;
140
+ } ) ;
141
141
let r = dec_fn ( cx, attr. span , attr. node . value , items) ;
142
142
cx. bt_pop ( ) ;
143
143
r
@@ -227,13 +227,13 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv,
227
227
given '%s'", extnamestr,
228
228
ident_to_str( & it. ident) ) ) ;
229
229
}
230
- cx. bt_push ( ExpandedFrom ( CallInfo {
230
+ cx. bt_push ( ExpnInfo {
231
231
call_site : it. span ,
232
232
callee : NameAndSpan {
233
233
name : extnamestr,
234
234
span : expand. span
235
235
}
236
- } ) ) ;
236
+ } ) ;
237
237
( ( * expand) . expander ) ( cx, it. span , tts)
238
238
}
239
239
Some ( @SE ( IdentTT ( ref expand) ) ) => {
@@ -242,13 +242,13 @@ pub fn expand_item_mac(extsbox: @mut SyntaxEnv,
242
242
fmt ! ( "macro %s! expects an ident argument" ,
243
243
extnamestr) ) ;
244
244
}
245
- cx. bt_push ( ExpandedFrom ( CallInfo {
245
+ cx. bt_push ( ExpnInfo {
246
246
call_site : it. span ,
247
247
callee : NameAndSpan {
248
248
name : extnamestr,
249
249
span : expand. span
250
250
}
251
- } ) ) ;
251
+ } ) ;
252
252
( ( * expand) . expander ) ( cx, it. span , it. ident , tts)
253
253
}
254
254
_ => cx. span_fatal (
@@ -319,10 +319,10 @@ pub fn expand_stmt(extsbox: @mut SyntaxEnv,
319
319
320
320
Some ( @SE ( NormalTT (
321
321
SyntaxExpanderTT { expander : exp, span : exp_sp} ) ) ) => {
322
- cx. bt_push ( ExpandedFrom ( CallInfo {
322
+ cx. bt_push ( ExpnInfo {
323
323
call_site : sp,
324
324
callee : NameAndSpan { name : extnamestr, span : exp_sp }
325
- } ) ) ;
325
+ } ) ;
326
326
let expanded = match exp ( cx, mac. span , tts) {
327
327
MRExpr ( e) =>
328
328
@codemap:: spanned { node : stmt_expr ( e, cx. next_id ( ) ) ,
0 commit comments