---

yaml
---
r: 4430
b: refs/heads/master
c: fd7ffd5
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59e9b629c042e9417e5ac662cbf21c0205e765c7
+refs/heads/master: fd7ffd5ac27aa131a858a8a4954c545ece48644b

trunk/src/comp/front/test.rs

@@ -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;

trunk/src/comp/syntax/ast.rs

@@ -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)[]};
 

trunk/src/comp/syntax/fold.rs

@@ -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,

trunk/src/comp/syntax/parse/parser.rs

@@ -1730,13 +1730,15 @@ 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};
       }
       a_bang. {
         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};