nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-07 20:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rustc: Add inlineness to the fn decl instead

Browse Source
This commit is contained in:
Patrick Walton 2011-08-05 11:46:43 -07:00
parent 59e9b629c0
commit fd7ffd5ac2
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/comp/front/test.rs
View File

@ -178,6 +178,7 @@ fn mk_tests(cx: &test_ctxt) -> @ast::item {
{inputs: ~[],
output: ret_ty,
purity: ast::impure_fn,
il: ast::il_normal,
cf: ast::return,
constraints: ~[]};
let proto = ast::proto_fn;
@ -295,6 +296,7 @@ fn mk_main(cx: &test_ctxt) -> @ast::item {
{inputs: ~[args_arg],
output: @ret_ty,
purity: ast::impure_fn,
il: ast::il_normal,
cf: ast::return,
constraints: ~[]};
let proto = ast::proto_fn;

3
src/comp/syntax/ast.rs
View File

@ -511,10 +511,13 @@ type ty_constr = spanned[ty_constr_];
corresponding to these. */
type arg = {mode: mode, ty: @ty, ident: ident, id: node_id};
tag inlineness { il_normal; il_inline; }
type fn_decl =
{inputs: arg[],
output: @ty,
purity: purity,
il: inlineness,
cf: controlflow,
constraints: (@constr)[]};

2
src/comp/syntax/fold.rs
View File

@ -191,6 +191,7 @@ fn noop_fold_native_item(ni: &@native_item, fld: ast_fold) -> @native_item {
{inputs: ivec::map(fold_arg, fdec.inputs),
output: fld.fold_ty(fdec.output),
purity: fdec.purity,
il: fdec.il,
cf: fdec.cf,
constraints:
ivec::map(fld.fold_constr,
@ -449,6 +450,7 @@ fn noop_fold_fn(f: &_fn, fld: ast_fold) -> _fn {
{inputs: ivec::map(fold_arg, f.decl.inputs),
output: fld.fold_ty(f.decl.output),
purity: f.decl.purity,
il: f.decl.il,
cf: f.decl.cf,
constraints: ivec::map(fld.fold_constr, f.decl.constraints)},
proto: f.proto,

3
src/comp/syntax/parse/parser.rs
View File

@ -1730,6 +1730,7 @@ fn parse_fn_decl(p: &parser, purity: ast::purity) -> ast::fn_decl {
ret {inputs: inputs.node,
output: t,
purity: purity,
il: ast::il_normal,
cf: ast::return,
constraints: constrs};
}
@ -1737,6 +1738,7 @@ fn parse_fn_decl(p: &parser, purity: ast::purity) -> ast::fn_decl {
ret {inputs: inputs.node,
output: @spanned(p.get_lo_pos(), p.get_hi_pos(), ast::ty_bot),
purity: purity,
il: ast::il_normal,
cf: ast::noreturn,
constraints: constrs};
}
@ -1839,6 +1841,7 @@ fn parse_item_res(p: &parser, attrs: &ast::attribute[]) ->
id: p.get_id()}],
output: @spanned(lo, lo, ast::ty_nil),
purity: ast::impure_fn,
il: ast::il_normal,
cf: ast::return,
constraints: ~[]};
let f = {decl: decl, proto: ast::proto_fn, body: dtor};