nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-20 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1754

Browse Source 
1754: slightly simplify expr lowering flow r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-09-03 06:50:46 +00:00 committed by GitHub
commit f5b60a53f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 136 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_hir/src/db.rs
View File

@ -169,13 +169,13 @@ pub trait HirDatabase: DefDatabase + AstDatabase {
#[salsa::invoke(crate::ty::generic_defaults_query)] #[salsa::invoke(crate::ty::generic_defaults_query)]
fn generic_defaults(&self, def: GenericDef) -> Substs; fn generic_defaults(&self, def: GenericDef) -> Substs;
#[salsa::invoke(crate::expr::lower::body_with_source_map_query)] #[salsa::invoke(crate::expr::body_with_source_map_query)]
fn body_with_source_map( fn body_with_source_map(
&self, &self,
def: DefWithBody, def: DefWithBody,
) -> (Arc<crate::expr::Body>, Arc<crate::expr::BodySourceMap>); ) -> (Arc<crate::expr::Body>, Arc<crate::expr::BodySourceMap>);
#[salsa::invoke(crate::expr::lower::body_hir_query)] #[salsa::invoke(crate::expr::body_hir_query)]
fn body_hir(&self, def: DefWithBody) -> Arc<crate::expr::Body>; fn body_hir(&self, def: DefWithBody) -> Arc<crate::expr::Body>;
#[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)]

33
crates/ra_hir/src/expr.rs
View File

@ -12,7 +12,7 @@ use crate::{
path::GenericArgs, path::GenericArgs,
ty::primitive::{UncertainFloatTy, UncertainIntTy}, ty::primitive::{UncertainFloatTy, UncertainIntTy},
type_ref::{Mutability, TypeRef}, type_ref::{Mutability, TypeRef},
DefWithBody, Either, HirDatabase, Name, Path, Resolver, DefWithBody, Either, HasSource, HirDatabase, Name, Path, Resolver,
}; };
pub use self::scope::ExprScopes; pub use self::scope::ExprScopes;
@ -524,3 +524,34 @@ impl Pat {
} }
} }
} }
// Queries
pub(crate) fn body_with_source_map_query(
db: &impl HirDatabase,
def: DefWithBody,
) -> (Arc<Body>, Arc<BodySourceMap>) {
let mut params = None;
let (file_id, body) = match def {
DefWithBody::Function(f) => {
let src = f.source(db);
params = src.ast.param_list();
(src.file_id, src.ast.body().map(ast::Expr::from))
}
DefWithBody::Const(c) => {
let src = c.source(db);
(src.file_id, src.ast.body())
}
DefWithBody::Static(s) => {
let src = s.source(db);
(src.file_id, src.ast.body())
}
};
let (body, source_map) = lower::lower(db, def.resolver(db), file_id, def, params, body);
(Arc::new(body), Arc::new(source_map))
}
pub(crate) fn body_hir_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<Body> {
db.body_with_source_map(def).0
}

228
crates/ra_hir/src/expr/lower.rs
View File

@ -1,5 +1,3 @@
use std::sync::Arc;
use ra_arena::Arena; use ra_arena::Arena;
use ra_syntax::{ use ra_syntax::{
ast::{ ast::{
@ -15,8 +13,8 @@ use crate::{
path::GenericArgs, path::GenericArgs,
ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy}, ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
type_ref::TypeRef, type_ref::TypeRef,
DefWithBody, Either, HasSource, HirDatabase, HirFileId, MacroCallLoc, MacroFileKind, DefWithBody, Either, HirDatabase, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path,
Mutability, Path, Resolver, Resolver,
}; };
use super::{ use super::{
@ -24,14 +22,33 @@ use super::{
LogicOp, MatchArm, Ordering, Pat, PatId, PatPtr, RecordFieldPat, RecordLitField, Statement, LogicOp, MatchArm, Ordering, Pat, PatId, PatPtr, RecordFieldPat, RecordLitField, Statement,
}; };
pub(crate) struct ExprCollector<DB> { pub(super) fn lower(
db: DB, db: &impl HirDatabase,
resolver: Resolver,
file_id: HirFileId,
owner: DefWithBody, owner: DefWithBody,
exprs: Arena<ExprId, Expr>, params: Option<ast::ParamList>,
pats: Arena<PatId, Pat>, body: Option<ast::Expr>,
source_map: BodySourceMap, ) -> (Body, BodySourceMap) {
params: Vec<PatId>, ExprCollector {
body_expr: Option<ExprId>, resolver,
db,
original_file_id: file_id,
current_file_id: file_id,
source_map: BodySourceMap::default(),
body: Body {
owner,
exprs: Arena::default(),
pats: Arena::default(),
params: Vec::new(),
body_expr: ExprId((!0).into()),
},
}
.collect(params, body)
}
struct ExprCollector<DB> {
db: DB,
resolver: Resolver, resolver: Resolver,
// Expr collector expands macros along the way. original points to the file // Expr collector expands macros along the way. original points to the file
// we started with, current points to the current macro expansion. source // we started with, current points to the current macro expansion. source
@ -39,38 +56,73 @@ pub(crate) struct ExprCollector<DB> {
// current == original (see #1196) // current == original (see #1196)
original_file_id: HirFileId, original_file_id: HirFileId,
current_file_id: HirFileId, current_file_id: HirFileId,
body: Body,
source_map: BodySourceMap,
} }
impl<'a, DB> ExprCollector<&'a DB> impl<'a, DB> ExprCollector<&'a DB>
where where
DB: HirDatabase, DB: HirDatabase,
{ {
fn new(owner: DefWithBody, file_id: HirFileId, resolver: Resolver, db: &'a DB) -> Self { fn collect(
ExprCollector { mut self,
owner, param_list: Option<ast::ParamList>,
resolver, body: Option<ast::Expr>,
db, ) -> (Body, BodySourceMap) {
exprs: Arena::default(), if let Some(param_list) = param_list {
pats: Arena::default(), if let Some(self_param) = param_list.self_param() {
source_map: BodySourceMap::default(), let ptr = AstPtr::new(&self_param);
params: Vec::new(), let param_pat = self.alloc_pat(
body_expr: None, Pat::Bind {
original_file_id: file_id, name: SELF_PARAM,
current_file_id: file_id, mode: BindingAnnotation::Unannotated,
} subpat: None,
},
Either::B(ptr),
);
self.body.params.push(param_pat);
}
for param in param_list.params() {
let pat = match param.pat() {
None => continue,
Some(pat) => pat,
};
let param_pat = self.collect_pat(pat);
self.body.params.push(param_pat);
}
};
self.body.body_expr = self.collect_expr_opt(body);
(self.body, self.source_map)
} }
fn alloc_expr(&mut self, expr: Expr, ptr: AstPtr<ast::Expr>) -> ExprId { fn alloc_expr(&mut self, expr: Expr, ptr: AstPtr<ast::Expr>) -> ExprId {
let ptr = Either::A(ptr); let ptr = Either::A(ptr);
let id = self.exprs.alloc(expr); let id = self.body.exprs.alloc(expr);
if self.current_file_id == self.original_file_id {
self.source_map.expr_map.insert(ptr, id);
self.source_map.expr_map_back.insert(id, ptr);
}
id
}
// deshugared exprs don't have ptr, that's wrong and should be fixed
// somehow.
fn alloc_expr_desugared(&mut self, expr: Expr) -> ExprId {
self.body.exprs.alloc(expr)
}
fn alloc_expr_field_shorthand(&mut self, expr: Expr, ptr: AstPtr<ast::RecordField>) -> ExprId {
let ptr = Either::B(ptr);
let id = self.body.exprs.alloc(expr);
if self.current_file_id == self.original_file_id { if self.current_file_id == self.original_file_id {
self.source_map.expr_map.insert(ptr, id); self.source_map.expr_map.insert(ptr, id);
self.source_map.expr_map_back.insert(id, ptr); self.source_map.expr_map_back.insert(id, ptr);
} }
id id
} }
fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId { fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId {
let id = self.pats.alloc(pat); let id = self.body.pats.alloc(pat);
if self.current_file_id == self.original_file_id { if self.current_file_id == self.original_file_id {
self.source_map.pat_map.insert(ptr, id); self.source_map.pat_map.insert(ptr, id);
@ -82,7 +134,15 @@ where
fn empty_block(&mut self) -> ExprId { fn empty_block(&mut self) -> ExprId {
let block = Expr::Block { statements: Vec::new(), tail: None }; let block = Expr::Block { statements: Vec::new(), tail: None };
self.exprs.alloc(block) self.body.exprs.alloc(block)
}
fn missing_expr(&mut self) -> ExprId {
self.body.exprs.alloc(Expr::Missing)
}
fn missing_pat(&mut self) -> PatId {
self.body.pats.alloc(Pat::Missing)
} }
fn collect_expr(&mut self, expr: ast::Expr) -> ExprId { fn collect_expr(&mut self, expr: ast::Expr) -> ExprId {
@ -100,14 +160,14 @@ where
}); });
let condition = match e.condition() { let condition = match e.condition() {
None => self.exprs.alloc(Expr::Missing), None => self.missing_expr(),
Some(condition) => match condition.pat() { Some(condition) => match condition.pat() {
None => self.collect_expr_opt(condition.expr()), None => self.collect_expr_opt(condition.expr()),
// if let -- desugar to match // if let -- desugar to match
Some(pat) => { Some(pat) => {
let pat = self.collect_pat(pat); let pat = self.collect_pat(pat);
let match_expr = self.collect_expr_opt(condition.expr()); let match_expr = self.collect_expr_opt(condition.expr());
let placeholder_pat = self.pats.alloc(Pat::Missing); let placeholder_pat = self.missing_pat();
let arms = vec![ let arms = vec![
MatchArm { pats: vec![pat], expr: then_branch, guard: None }, MatchArm { pats: vec![pat], expr: then_branch, guard: None },
MatchArm { MatchArm {
@ -137,7 +197,7 @@ where
let body = self.collect_block_opt(e.loop_body()); let body = self.collect_block_opt(e.loop_body());
let condition = match e.condition() { let condition = match e.condition() {
None => self.exprs.alloc(Expr::Missing), None => self.missing_expr(),
Some(condition) => match condition.pat() { Some(condition) => match condition.pat() {
None => self.collect_expr_opt(condition.expr()), None => self.collect_expr_opt(condition.expr()),
// if let -- desugar to match // if let -- desugar to match
@ -145,14 +205,14 @@ where
tested_by!(infer_while_let); tested_by!(infer_while_let);
let pat = self.collect_pat(pat); let pat = self.collect_pat(pat);
let match_expr = self.collect_expr_opt(condition.expr()); let match_expr = self.collect_expr_opt(condition.expr());
let placeholder_pat = self.pats.alloc(Pat::Missing); let placeholder_pat = self.missing_pat();
let break_ = self.exprs.alloc(Expr::Break { expr: None }); let break_ = self.alloc_expr_desugared(Expr::Break { expr: None });
let arms = vec![ let arms = vec![
MatchArm { pats: vec![pat], expr: body, guard: None }, MatchArm { pats: vec![pat], expr: body, guard: None },
MatchArm { pats: vec![placeholder_pat], expr: break_, guard: None }, MatchArm { pats: vec![placeholder_pat], expr: break_, guard: None },
]; ];
let match_expr = let match_expr =
self.exprs.alloc(Expr::Match { expr: match_expr, arms }); self.alloc_expr_desugared(Expr::Match { expr: match_expr, arms });
return self.alloc_expr(Expr::Loop { body: match_expr }, syntax_ptr); return self.alloc_expr(Expr::Loop { body: match_expr }, syntax_ptr);
} }
}, },
@ -247,13 +307,12 @@ where
self.collect_expr(e) self.collect_expr(e)
} else if let Some(nr) = field.name_ref() { } else if let Some(nr) = field.name_ref() {
// field shorthand // field shorthand
let id = self.exprs.alloc(Expr::Path(Path::from_name_ref(&nr))); self.alloc_expr_field_shorthand(
let ptr = Either::B(AstPtr::new(&field)); Expr::Path(Path::from_name_ref(&nr)),
self.source_map.expr_map.insert(ptr, id); AstPtr::new(&field),
self.source_map.expr_map_back.insert(id, ptr); )
id
} else { } else {
self.exprs.alloc(Expr::Missing) self.missing_expr()
}, },
}) })
.collect(); .collect();
@ -420,7 +479,7 @@ where
if let Some(expr) = expr { if let Some(expr) = expr {
self.collect_expr(expr) self.collect_expr(expr)
} else { } else {
self.exprs.alloc(Expr::Missing) self.missing_expr()
} }
} }
@ -450,7 +509,7 @@ where
if let Some(block) = expr { if let Some(block) = expr {
self.collect_block(block) self.collect_block(block)
} else { } else {
self.exprs.alloc(Expr::Missing) self.missing_expr()
} }
} }
@ -519,60 +578,9 @@ where
if let Some(pat) = pat { if let Some(pat) = pat {
self.collect_pat(pat) self.collect_pat(pat)
} else { } else {
self.pats.alloc(Pat::Missing) self.missing_pat()
} }
} }
fn collect_const_body(&mut self, node: ast::ConstDef) {
let body = self.collect_expr_opt(node.body());
self.body_expr = Some(body);
}
fn collect_static_body(&mut self, node: ast::StaticDef) {
let body = self.collect_expr_opt(node.body());
self.body_expr = Some(body);
}
fn collect_fn_body(&mut self, node: ast::FnDef) {
if let Some(param_list) = node.param_list() {
if let Some(self_param) = param_list.self_param() {
let ptr = AstPtr::new(&self_param);
let param_pat = self.alloc_pat(
Pat::Bind {
name: SELF_PARAM,
mode: BindingAnnotation::Unannotated,
subpat: None,
},
Either::B(ptr),
);
self.params.push(param_pat);
}
for param in param_list.params() {
let pat = if let Some(pat) = param.pat() {
pat
} else {
continue;
};
let param_pat = self.collect_pat(pat);
self.params.push(param_pat);
}
};
let body = self.collect_block_opt(node.body());
self.body_expr = Some(body);
}
fn finish(self) -> (Body, BodySourceMap) {
let body = Body {
owner: self.owner,
exprs: self.exprs,
pats: self.pats,
params: self.params,
body_expr: self.body_expr.expect("A body should have been collected"),
};
(body, self.source_map)
}
} }
impl From<ast::BinOp> for BinaryOp { impl From<ast::BinOp> for BinaryOp {
@ -618,35 +626,3 @@ impl From<ast::BinOp> for BinaryOp {
} }
} }
} }
pub(crate) fn body_with_source_map_query(
db: &impl HirDatabase,
def: DefWithBody,
) -> (Arc<Body>, Arc<BodySourceMap>) {
let mut collector;
match def {
DefWithBody::Const(ref c) => {
let src = c.source(db);
collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
collector.collect_const_body(src.ast)
}
DefWithBody::Function(ref f) => {
let src = f.source(db);
collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
collector.collect_fn_body(src.ast)
}
DefWithBody::Static(ref s) => {
let src = s.source(db);
collector = ExprCollector::new(def, src.file_id, def.resolver(db), db);
collector.collect_static_body(src.ast)
}
}
let (body, source_map) = collector.finish();
(Arc::new(body), Arc::new(source_map))
}
pub(crate) fn body_hir_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<Body> {
db.body_with_source_map(def).0
}