Skip to content

Commit 85a7105

Browse files
eddybeddyb
committed
Implement type ascription.
1 parent a2aee62 commit 85a7105

23 files changed

+131
-34
lines changed

‎src/librustc/lint/builtin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,7 @@ impl UnusedParens {
11541154
}
11551155
ast::ExprUnary(_, ref x) |
11561156
ast::ExprCast(ref x, _) |
1157+
ast::ExprType(ref x, _) |
11571158
ast::ExprField(ref x, _) |
11581159
ast::ExprTupField(ref x, _) |
11591160
ast::ExprIndex(ref x, _) => {

‎src/librustc/middle/cfg/construct.rs

+1
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@ impl<'a, 'tcx> CFGBuilder<'a, 'tcx> {
434434
ast::ExprBox(None, ref e) |
435435
ast::ExprAddrOf(_, ref e) |
436436
ast::ExprCast(ref e, _) |
437+
ast::ExprType(ref e, _) |
437438
ast::ExprUnary(_, ref e) |
438439
ast::ExprParen(ref e) |
439440
ast::ExprField(ref e, _) |

‎src/librustc/middle/check_const.rs

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ fn check_expr(v: &mut CheckCrateVisitor, e: &ast::Expr) {
167167
ast::ExprTupField(..) |
168168
ast::ExprIndex(..) |
169169
ast::ExprTup(..) |
170+
ast::ExprType(..) |
170171
ast::ExprRepeat(..) |
171172
ast::ExprStruct(..) => {}
172173

‎src/librustc/middle/const_eval.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ impl<'a, 'tcx> ConstEvalVisitor<'a, 'tcx> {
232232
}
233233
}
234234

235-
ast::ExprField(ref base, _) => self.classify(&**base),
236-
235+
ast::ExprType(ref base, _) |
236+
ast::ExprField(ref base, _) |
237237
ast::ExprTupField(ref base, _) => self.classify(&**base),
238238

239239
ast::ExprIndex(ref base, ref idx) =>
@@ -556,7 +556,8 @@ pub fn eval_const_expr_partial(tcx: &ty::ctxt, e: &Expr) -> Result<const_val, St
556556
}
557557
}
558558
ast::ExprLit(ref lit) => Ok(lit_to_const(&**lit)),
559-
ast::ExprParen(ref e) => eval_const_expr_partial(tcx, &**e),
559+
ast::ExprParen(ref e) |
560+
ast::ExprType(ref e, _) => eval_const_expr_partial(tcx, &**e),
560561
ast::ExprBlock(ref block) => {
561562
match block.expr {
562563
Some(ref expr) => eval_const_expr_partial(tcx, &**expr),

‎src/librustc/middle/expr_use_visitor.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,8 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> {
423423
self.walk_adjustment(expr);
424424

425425
match expr.node {
426-
ast::ExprParen(ref subexpr) => {
426+
ast::ExprParen(ref subexpr) |
427+
ast::ExprType(ref subexpr, _) => {
427428
self.walk_expr(&**subexpr)
428429
}
429430

‎src/librustc/middle/liveness.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ fn visit_expr(ir: &mut IrMaps, expr: &Expr) {
505505
ast::ExprBlock(..) | ast::ExprAssign(..) | ast::ExprAssignOp(..) |
506506
ast::ExprMac(..) | ast::ExprStruct(..) | ast::ExprRepeat(..) |
507507
ast::ExprParen(..) | ast::ExprInlineAsm(..) | ast::ExprBox(..) |
508-
ast::ExprRange(..) => {
508+
ast::ExprRange(..) | ast::ExprType(..) => {
509509
visit::walk_expr(ir, expr);
510510
}
511511
}
@@ -1188,6 +1188,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
11881188
ast::ExprBox(None, ref e) |
11891189
ast::ExprAddrOf(_, ref e) |
11901190
ast::ExprCast(ref e, _) |
1191+
ast::ExprType(ref e, _) |
11911192
ast::ExprUnary(_, ref e) |
11921193
ast::ExprParen(ref e) => {
11931194
self.propagate_through_expr(&**e, succ)
@@ -1468,7 +1469,7 @@ fn check_expr(this: &mut Liveness, expr: &Expr) {
14681469
ast::ExprBlock(..) | ast::ExprMac(..) | ast::ExprAddrOf(..) |
14691470
ast::ExprStruct(..) | ast::ExprRepeat(..) | ast::ExprParen(..) |
14701471
ast::ExprClosure(..) | ast::ExprPath(..) | ast::ExprBox(..) |
1471-
ast::ExprRange(..) | ast::ExprQPath(..) => {
1472+
ast::ExprRange(..) | ast::ExprQPath(..) | ast::ExprType(..) => {
14721473
visit::walk_expr(this, expr);
14731474
}
14741475
ast::ExprIfLet(..) => {

‎src/librustc/middle/mem_categorization.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ impl<'t,'tcx,TYPER:Typer<'tcx>> MemCategorizationContext<'t,TYPER> {
520520
self.cat_def(expr.id, expr.span, expr_ty, def)
521521
}
522522

523-
ast::ExprParen(ref e) => {
523+
ast::ExprParen(ref e) | ast::ExprType(ref e, _) => {
524524
self.cat_expr(&**e)
525525
}
526526

‎src/librustc/middle/ty.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4618,7 +4618,8 @@ pub fn expr_kind(tcx: &ctxt, expr: &ast::Expr) -> ExprKind {
46184618
}
46194619
}
46204620

4621-
ast::ExprParen(ref e) => expr_kind(tcx, &**e),
4621+
ast::ExprParen(ref e) |
4622+
ast::ExprType(ref e, _) => expr_kind(tcx, &**e),
46224623

46234624
ast::ExprMac(..) => {
46244625
tcx.sess.span_bug(

‎src/librustc_back/svh.rs

+2
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ mod svh_visitor {
235235
SawExprUnary(ast::UnOp),
236236
SawExprLit(ast::Lit_),
237237
SawExprCast,
238+
SawExprType,
238239
SawExprIf,
239240
SawExprWhile,
240241
SawExprMatch,
@@ -265,6 +266,7 @@ mod svh_visitor {
265266
ExprUnary(op, _) => SawExprUnary(op),
266267
ExprLit(ref lit) => SawExprLit(lit.node.clone()),
267268
ExprCast(..) => SawExprCast,
269+
ExprType(..) => SawExprType,
268270
ExprIf(..) => SawExprIf,
269271
ExprWhile(..) => SawExprWhile,
270272
ExprLoop(_, id) => SawExprLoop(id.map(content)),

‎src/librustc_trans/trans/consts.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,8 @@ fn const_expr_unadjusted(cx: &CrateContext, e: &ast::Expr) -> ValueRef {
663663
_ => cx.sess().span_bug(e.span, "expected a struct or variant def")
664664
}
665665
}
666-
ast::ExprParen(ref e) => const_expr(cx, &**e).0,
666+
ast::ExprParen(ref e) |
667+
ast::ExprType(ref e, _) => const_expr(cx, &**e).0,
667668
ast::ExprBlock(ref block) => {
668669
match block.expr {
669670
Some(ref expr) => const_expr(cx, &**expr).0,

‎src/librustc_trans/trans/debuginfo.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -3502,7 +3502,8 @@ fn create_scope_map(cx: &CrateContext,
35023502
ast::ExprAddrOf(_, ref sub_exp) |
35033503
ast::ExprField(ref sub_exp, _) |
35043504
ast::ExprTupField(ref sub_exp, _) |
3505-
ast::ExprParen(ref sub_exp) =>
3505+
ast::ExprParen(ref sub_exp) |
3506+
ast::ExprType(ref sub_exp, _) =>
35063507
walk_expr(cx, &**sub_exp, scope_stack, scope_map),
35073508

35083509
ast::ExprBox(ref place, ref sub_expr) => {

‎src/librustc_trans/trans/expr.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,8 @@ fn trans_datum_unadjusted<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
564564
let _icx = push_ctxt("trans_datum_unadjusted");
565565

566566
match expr.node {
567-
ast::ExprParen(ref e) => {
567+
ast::ExprParen(ref e) |
568+
ast::ExprType(ref e, _) => {
568569
trans(bcx, &**e)
569570
}
570571
ast::ExprPath(_) | ast::ExprQPath(_) => {
@@ -890,7 +891,8 @@ fn trans_rvalue_stmt_unadjusted<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
890891
debuginfo::set_source_location(bcx.fcx, expr.id, expr.span);
891892

892893
match expr.node {
893-
ast::ExprParen(ref e) => {
894+
ast::ExprParen(ref e) |
895+
ast::ExprType(ref e, _) => {
894896
trans_into(bcx, &**e, Ignore)
895897
}
896898
ast::ExprBreak(label_opt) => {
@@ -990,7 +992,8 @@ fn trans_rvalue_dps_unadjusted<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
990992
debuginfo::set_source_location(bcx.fcx, expr.id, expr.span);
991993

992994
match expr.node {
993-
ast::ExprParen(ref e) => {
995+
ast::ExprParen(ref e) |
996+
ast::ExprType(ref e, _) => {
994997
trans_into(bcx, &**e, dest)
995998
}
996999
ast::ExprPath(_) | ast::ExprQPath(_) => {

‎src/librustc_typeck/check/mod.rs

+5
Original file line numberDiff line numberDiff line change
@@ -3711,6 +3711,11 @@ fn check_expr_with_unifier<'a, 'tcx, F>(fcx: &FnCtxt<'a, 'tcx>,
37113711
}
37123712
check_cast(fcx, expr, &**e, &**t);
37133713
}
3714+
ast::ExprType(ref e, ref t) => {
3715+
let typ = fcx.to_ty(&**t);
3716+
check_expr_coercable_to_type(fcx, &**e, typ);
3717+
fcx.write_ty(id, typ);
3718+
}
37143719
ast::ExprVec(ref args) => {
37153720
let uty = expected.to_option(fcx).and_then(|uty| {
37163721
match uty.sty {

‎src/libsyntax/ast.rs

+1
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,7 @@ pub enum Expr_ {
724724
ExprUnary(UnOp, P<Expr>),
725725
ExprLit(P<Lit>),
726726
ExprCast(P<Expr>, P<Ty>),
727+
ExprType(P<Expr>, P<Ty>),
727728
ExprIf(P<Expr>, P<Block>, Option<P<Expr>>),
728729
ExprIfLet(P<Pat>, P<Expr>, P<Block>, Option<P<Expr>>),
729730
// FIXME #6993: change to Option<Name> ... or not, if these are hygienic.

‎src/libsyntax/ext/asm.rs

+23-5
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ use codemap;
1818
use codemap::Span;
1919
use ext::base;
2020
use ext::base::*;
21-
use parse::token::InternedString;
22-
use parse::token;
21+
use parse::{self, token};
2322
use ptr::P;
2423

2524
enum State {
@@ -48,8 +47,17 @@ static OPTIONS: &'static [&'static str] = &["volatile", "alignstack", "intel"];
4847

4948
pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
5049
-> Box<base::MacResult+'cx> {
51-
let mut p = cx.new_parser_from_tts(tts);
52-
let mut asm = InternedString::new("");
50+
// Split the tts before the first colon, to avoid `asm!("x": y)` being
51+
// parsed as `asm!(z)` with `z = "x": y` which is type ascription.
52+
let first_colon = tts.iter().position(|tt| {
53+
match *tt {
54+
ast::TtToken(_, token::Colon) |
55+
ast::TtToken(_, token::ModSep) => true,
56+
_ => false
57+
}
58+
}).unwrap_or(tts.len());
59+
let mut p = cx.new_parser_from_tts(&tts[first_colon..]);
60+
let mut asm = token::InternedString::new("");
5361
let mut asm_str_style = None;
5462
let mut outputs = Vec::new();
5563
let mut inputs = Vec::new();
@@ -69,12 +77,22 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
6977
cx.span_err(sp, "malformed inline assembly");
7078
return DummyResult::expr(sp);
7179
}
72-
let (s, style) = match expr_to_string(cx, p.parse_expr(),
80+
// Nested parser, stop before the first colon (see above).
81+
let mut p2 = cx.new_parser_from_tts(&tts[..first_colon]);
82+
let (s, style) = match expr_to_string(cx, p2.parse_expr(),
7383
"inline assembly must be a string literal") {
7484
Some((s, st)) => (s, st),
7585
// let compilation continue
7686
None => return DummyResult::expr(sp),
7787
};
88+
89+
// This is most likely malformed.
90+
if p2.token != token::Eof {
91+
let mut extra_tts = p2.parse_all_token_trees();
92+
extra_tts.extend(tts[first_colon..].iter().cloned());
93+
p = parse::tts_to_parser(cx.parse_sess, extra_tts, cx.cfg());
94+
}
95+
7896
asm = s;
7997
asm_str_style = Some(style);
8098
}

‎src/libsyntax/fold.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1287,6 +1287,9 @@ pub fn noop_fold_expr<T: Folder>(Expr {id, node, span}: Expr, folder: &mut T) ->
12871287
ExprCast(expr, ty) => {
12881288
ExprCast(folder.fold_expr(expr), folder.fold_ty(ty))
12891289
}
1290+
ExprType(expr, ty) => {
1291+
ExprType(folder.fold_expr(expr), folder.fold_ty(ty))
1292+
}
12901293
ExprAddrOf(m, ohs) => ExprAddrOf(m, folder.fold_expr(ohs)),
12911294
ExprIf(cond, tr, fl) => {
12921295
ExprIf(folder.fold_expr(cond),

‎src/libsyntax/parse/parser.rs

+18-12
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use ast::{ExprBreak, ExprCall, ExprCast};
2626
use ast::{ExprField, ExprTupField, ExprClosure, ExprIf, ExprIfLet, ExprIndex};
2727
use ast::{ExprLit, ExprLoop, ExprMac, ExprRange};
2828
use ast::{ExprMethodCall, ExprParen, ExprPath, ExprQPath};
29-
use ast::{ExprRepeat, ExprRet, ExprStruct, ExprTup, ExprUnary};
29+
use ast::{ExprRepeat, ExprRet, ExprStruct, ExprTup, ExprType, ExprUnary};
3030
use ast::{ExprVec, ExprWhile, ExprWhileLet, ExprForLoop, Field, FnDecl};
3131
use ast::{FnClosureKind, FnMutClosureKind};
3232
use ast::{FnOnceClosureKind};
@@ -2873,23 +2873,29 @@ impl<'a> Parser<'a> {
28732873
let rhs_span = rhs.span;
28742874
let binary = self.mk_binary(codemap::respan(cur_op_span, cur_op), lhs, rhs);
28752875
let bin = self.mk_expr(lhs_span.lo, rhs_span.hi, binary);
2876-
self.parse_more_binops(bin, min_prec)
2877-
} else {
2878-
lhs
2876+
return self.parse_more_binops(bin, min_prec);
28792877
}
28802878
}
28812879
None => {
2882-
if AS_PREC >= min_prec && self.eat_keyword(keywords::As) {
2883-
let rhs = self.parse_ty();
2884-
let _as = self.mk_expr(lhs.span.lo,
2885-
rhs.span.hi,
2886-
ExprCast(lhs, rhs));
2887-
self.parse_more_binops(_as, min_prec)
2888-
} else {
2889-
lhs
2880+
if AS_PREC >= min_prec {
2881+
if self.eat_keyword(keywords::As) {
2882+
let rhs = self.parse_ty();
2883+
let _as = self.mk_expr(lhs.span.lo,
2884+
rhs.span.hi,
2885+
ExprCast(lhs, rhs));
2886+
return self.parse_more_binops(_as, min_prec);
2887+
} else if self.token == token::Colon {
2888+
self.bump();
2889+
let rhs = self.parse_ty();
2890+
let ex = self.mk_expr(lhs.span.lo,
2891+
rhs.span.hi,
2892+
ExprType(lhs, rhs));
2893+
return self.parse_more_binops(ex, min_prec);
2894+
}
28902895
}
28912896
}
28922897
}
2898+
lhs
28932899
}
28942900

28952901
/// Produce an error if comparison operators are chained (RFC #558).

‎src/libsyntax/print/pprust.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,8 @@ fn needs_parentheses(expr: &ast::Expr) -> bool {
449449
match expr.node {
450450
ast::ExprAssign(..) | ast::ExprBinary(..) |
451451
ast::ExprClosure(..) |
452-
ast::ExprAssignOp(..) | ast::ExprCast(..) => true,
452+
ast::ExprAssignOp(..) | ast::ExprCast(..) |
453+
ast::ExprType(..) => true,
453454
_ => false,
454455
}
455456
}
@@ -1684,6 +1685,11 @@ impl<'a> State<'a> {
16841685
try!(self.word_space("as"));
16851686
try!(self.print_type(&**ty));
16861687
}
1688+
ast::ExprType(ref expr, ref ty) => {
1689+
try!(self.print_expr(&**expr));
1690+
try!(self.word_space(":"));
1691+
try!(self.print_type(&**ty));
1692+
}
16871693
ast::ExprIf(ref test, ref blk, ref elseopt) => {
16881694
try!(self.print_if(&**test, &**blk, elseopt.as_ref().map(|e| &**e)));
16891695
}

‎src/libsyntax/visit.rs

+4
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,10 @@ pub fn walk_expr<'v, V: Visitor<'v>>(visitor: &mut V, expression: &'v Expr) {
804804
visitor.visit_expr(&**subexpression);
805805
visitor.visit_ty(&**typ)
806806
}
807+
ExprType(ref subexpression, ref typ) => {
808+
visitor.visit_expr(&**subexpression);
809+
visitor.visit_ty(&**typ)
810+
}
807811
ExprIf(ref head_expression, ref if_block, ref optional_else) => {
808812
visitor.visit_expr(&**head_expression);
809813
visitor.visit_block(&**if_block);

‎src/test/compile-fail/struct-literal-in-for.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl Foo {
2020

2121
fn main() {
2222
for x in Foo {
23-
x: 3 //~ ERROR expected one of `!`, `.`, `::`, `;`, `{`, `}`, or an operator, found `:`
23+
x: 3 //~ ERROR expected type, found `3`
2424
}.hi() {
2525
println!("yo");
2626
}

‎src/test/compile-fail/struct-literal-in-if.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl Foo {
2020

2121
fn main() {
2222
if Foo {
23-
x: 3 //~ ERROR expected one of `!`, `.`, `::`, `;`, `{`, `}`, or an operator, found `:`
23+
x: 3 //~ ERROR expected type, found `3`
2424
}.hi() {
2525
println!("yo");
2626
}

‎src/test/compile-fail/struct-literal-in-while.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl Foo {
2020

2121
fn main() {
2222
while Foo {
23-
x: 3 //~ ERROR expected one of `!`, `.`, `::`, `;`, `{`, `}`, or an operator, found `:`
23+
x: 3 //~ ERROR expected type, found `3`
2424
}.hi() {
2525
println!("yo");
2626
}

0 commit comments

Comments
 (0)