mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly remember desugard exprs

Browse Source
This commit is contained in:
Aleksey Kladov 2020-03-06 15:11:05 +01:00
parent fb5891c433
commit 5ffddc4b92
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_hir_def/src/body.rs
View File

@ -149,14 +149,14 @@ pub type PatSource = InFile<PatPtr>;
#[derive(Default, Debug, Eq, PartialEq)]
pub struct BodySourceMap {
expr_map: FxHashMap<ExprSource, ExprId>,
expr_map_back: ArenaMap<ExprId, ExprSource>,
expr_map_back: ArenaMap<ExprId, Result<ExprSource, SyntheticSyntax>>,
pat_map: FxHashMap<PatSource, PatId>,
pat_map_back: ArenaMap<PatId, PatSource>,
field_map: FxHashMap<(ExprId, usize), AstPtr<ast::RecordField>>,
expansions: FxHashMap<InFile<AstPtr<ast::MacroCall>>, HirFileId>,
}
#[derive(Debug)]
#[derive(Default, Debug, Eq, PartialEq, Clone, Copy)]
pub struct SyntheticSyntax;
impl Body {
@ -223,7 +223,7 @@ impl Index<PatId> for Body {
impl BodySourceMap {
pub fn expr_syntax(&self, expr: ExprId) -> Result<ExprSource, SyntheticSyntax> {
self.expr_map_back.get(expr).copied().ok_or(SyntheticSyntax)
self.expr_map_back[expr]
}
pub fn node_expr(&self, node: InFile<&ast::Expr>) -> Option<ExprId> {

31
crates/ra_hir_def/src/body/lower.rs
View File

@ -14,9 +14,10 @@ use ra_syntax::{
};
use test_utils::tested_by;
use super::ExprSource;
use crate::{
adt::StructKind,
body::{Body, BodySourceMap, Expander, PatPtr},
body::{Body, BodySourceMap, Expander, PatPtr, SyntheticSyntax},
builtin_type::{BuiltinFloat, BuiltinInt},
db::DefDatabase,
expr::{
@ -102,25 +103,35 @@ where
fn alloc_expr(&mut self, expr: Expr, ptr: AstPtr<ast::Expr>) -> ExprId {
let ptr = Either::Left(ptr);
let id = self.body.exprs.alloc(expr);
let src = self.expander.to_source(ptr);
let id = self.make_expr(expr, Ok(src));
self.source_map.expr_map.insert(src, id);
self.source_map.expr_map_back.insert(id, src);
id
}
// desugared 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)
self.make_expr(expr, Err(SyntheticSyntax))
}
fn alloc_expr_field_shorthand(&mut self, expr: Expr, ptr: AstPtr<ast::RecordField>) -> ExprId {
let ptr = Either::Right(ptr);
let id = self.body.exprs.alloc(expr);
let src = self.expander.to_source(ptr);
let id = self.make_expr(expr, Ok(src));
self.source_map.expr_map.insert(src, id);
id
}
fn empty_block(&mut self) -> ExprId {
self.alloc_expr_desugared(Expr::Block { statements: Vec::new(), tail: None })
}
fn missing_expr(&mut self) -> ExprId {
self.alloc_expr_desugared(Expr::Missing)
}
fn make_expr(&mut self, expr: Expr, src: Result<ExprSource, SyntheticSyntax>) -> ExprId {
let id = self.body.exprs.alloc(expr);
self.source_map.expr_map_back.insert(id, src);
id
}
fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId {
let id = self.body.pats.alloc(pat);
let src = self.expander.to_source(ptr);
@ -128,16 +139,6 @@ where
self.source_map.pat_map_back.insert(id, src);
id
}
fn empty_block(&mut self) -> ExprId {
let block = Expr::Block { statements: Vec::new(), tail: None };
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)
}