aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src
diff options
context:
space:
mode:
authorSeivan Heidari <[email protected]>2019-11-12 18:04:54 +0000
committerSeivan Heidari <[email protected]>2019-11-12 18:04:54 +0000
commit0525778a3ad590492b51cc11085d815f9bb8f92b (patch)
tree56096932b19861ab86c9564717f88cf7cd86d023 /crates/ra_hir/src
parent11755f3eff87cd8ee0af7961377e0ae3ffea5050 (diff)
parent3322d65addd9ec61b8c5bc055803f6549946da8b (diff)
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r--crates/ra_hir/src/code_model.rs10
-rw-r--r--crates/ra_hir/src/db.rs10
-rw-r--r--crates/ra_hir/src/expr.rs571
-rw-r--r--crates/ra_hir/src/expr/lower.rs647
-rw-r--r--crates/ra_hir/src/expr/scope.rs2
-rw-r--r--crates/ra_hir/src/marks.rs1
-rw-r--r--crates/ra_hir/src/source_binder.rs2
-rw-r--r--crates/ra_hir/src/ty/infer.rs11
-rw-r--r--crates/ra_hir/src/ty/infer/expr.rs12
-rw-r--r--crates/ra_hir/src/ty/lower.rs40
-rw-r--r--crates/ra_hir/src/ty/primitive.rs26
-rw-r--r--crates/ra_hir/src/ty/tests.rs3
-rw-r--r--crates/ra_hir/src/ty/traits/chalk.rs2
13 files changed, 93 insertions, 1244 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 5a0bd0c19..2fd4ccb10 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -550,7 +550,7 @@ where
550 } 550 }
551 551
552 fn body(self, db: &impl HirDatabase) -> Arc<Body> { 552 fn body(self, db: &impl HirDatabase) -> Arc<Body> {
553 db.body_hir(self.into()) 553 db.body(self.into())
554 } 554 }
555 555
556 fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> { 556 fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
@@ -564,7 +564,7 @@ impl HasBody for DefWithBody {
564 } 564 }
565 565
566 fn body(self, db: &impl HirDatabase) -> Arc<Body> { 566 fn body(self, db: &impl HirDatabase) -> Arc<Body> {
567 db.body_hir(self) 567 db.body(self)
568 } 568 }
569 569
570 fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> { 570 fn body_source_map(self, db: &impl HirDatabase) -> Arc<BodySourceMap> {
@@ -666,7 +666,7 @@ impl Function {
666 } 666 }
667 667
668 pub fn body(self, db: &impl HirDatabase) -> Arc<Body> { 668 pub fn body(self, db: &impl HirDatabase) -> Arc<Body> {
669 db.body_hir(self.into()) 669 db.body(self.into())
670 } 670 }
671 671
672 pub fn ty(self, db: &impl HirDatabase) -> Ty { 672 pub fn ty(self, db: &impl HirDatabase) -> Ty {
@@ -1079,7 +1079,7 @@ pub struct Local {
1079 1079
1080impl Local { 1080impl Local {
1081 pub fn name(self, db: &impl HirDatabase) -> Option<Name> { 1081 pub fn name(self, db: &impl HirDatabase) -> Option<Name> {
1082 let body = db.body_hir(self.parent); 1082 let body = db.body(self.parent);
1083 match &body[self.pat_id] { 1083 match &body[self.pat_id] {
1084 Pat::Bind { name, .. } => Some(name.clone()), 1084 Pat::Bind { name, .. } => Some(name.clone()),
1085 _ => None, 1085 _ => None,
@@ -1091,7 +1091,7 @@ impl Local {
1091 } 1091 }
1092 1092
1093 pub fn is_mut(self, db: &impl HirDatabase) -> bool { 1093 pub fn is_mut(self, db: &impl HirDatabase) -> bool {
1094 let body = db.body_hir(self.parent); 1094 let body = db.body(self.parent);
1095 match &body[self.pat_id] { 1095 match &body[self.pat_id] {
1096 Pat::Bind { mode, .. } => match mode { 1096 Pat::Bind { mode, .. } => match mode {
1097 BindingAnnotation::Mutable | BindingAnnotation::RefMut => true, 1097 BindingAnnotation::Mutable | BindingAnnotation::RefMut => true,
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index 75c322c99..9ac811232 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -8,6 +8,7 @@ use ra_syntax::SmolStr;
8 8
9use crate::{ 9use crate::{
10 debug::HirDebugDatabase, 10 debug::HirDebugDatabase,
11 expr::{Body, BodySourceMap},
11 generics::{GenericDef, GenericParams}, 12 generics::{GenericDef, GenericParams},
12 ids, 13 ids,
13 impl_block::{ImplBlock, ImplSourceMap, ModuleImplBlocks}, 14 impl_block::{ImplBlock, ImplSourceMap, ModuleImplBlocks},
@@ -113,13 +114,10 @@ pub trait HirDatabase: DefDatabase + AstDatabase {
113 fn generic_defaults(&self, def: GenericDef) -> Substs; 114 fn generic_defaults(&self, def: GenericDef) -> Substs;
114 115
115 #[salsa::invoke(crate::expr::body_with_source_map_query)] 116 #[salsa::invoke(crate::expr::body_with_source_map_query)]
116 fn body_with_source_map( 117 fn body_with_source_map(&self, def: DefWithBody) -> (Arc<Body>, Arc<BodySourceMap>);
117 &self,
118 def: DefWithBody,
119 ) -> (Arc<crate::expr::Body>, Arc<crate::expr::BodySourceMap>);
120 118
121 #[salsa::invoke(crate::expr::body_hir_query)] 119 #[salsa::invoke(crate::expr::body_query)]
122 fn body_hir(&self, def: DefWithBody) -> Arc<crate::expr::Body>; 120 fn body(&self, def: DefWithBody) -> Arc<Body>;
123 121
124 #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)] 122 #[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)]
125 fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>; 123 fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>;
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
index 6e23197a4..82955fa55 100644
--- a/crates/ra_hir/src/expr.rs
+++ b/crates/ra_hir/src/expr.rs
@@ -1,549 +1,24 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3pub(crate) mod lower;
4pub(crate) mod scope; 3pub(crate) mod scope;
5pub(crate) mod validation; 4pub(crate) mod validation;
6 5
7use std::{ops::Index, sync::Arc}; 6use std::sync::Arc;
8 7
9use hir_def::{
10 path::GenericArgs,
11 type_ref::{Mutability, TypeRef},
12};
13use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
14use ra_syntax::{ast, AstPtr}; 8use ra_syntax::{ast, AstPtr};
15use rustc_hash::FxHashMap;
16 9
17use crate::{ 10use crate::{db::HirDatabase, DefWithBody, HasSource, Resolver};
18 db::HirDatabase,
19 ty::primitive::{UncertainFloatTy, UncertainIntTy},
20 DefWithBody, Either, HasSource, Name, Path, Resolver, Source,
21};
22 11
23pub use self::scope::ExprScopes; 12pub use self::scope::ExprScopes;
24 13
25#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] 14pub use hir_def::{
26pub struct ExprId(RawId); 15 body::{Body, BodySourceMap, ExprPtr, ExprSource, PatPtr, PatSource},
27impl_arena_id!(ExprId); 16 expr::{
28 17 ArithOp, Array, BinaryOp, BindingAnnotation, CmpOp, Expr, ExprId, Literal, LogicOp,
29#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] 18 MatchArm, Ordering, Pat, PatId, RecordFieldPat, RecordLitField, Statement, UnaryOp,
30pub struct PatId(RawId);
31impl_arena_id!(PatId);
32
33/// The body of an item (function, const etc.).
34#[derive(Debug, Eq, PartialEq)]
35pub struct Body {
36 /// The def of the item this body belongs to
37 owner: DefWithBody,
38 exprs: Arena<ExprId, Expr>,
39 pats: Arena<PatId, Pat>,
40 /// The patterns for the function's parameters. While the parameter types are
41 /// part of the function signature, the patterns are not (they don't change
42 /// the external type of the function).
43 ///
44 /// If this `Body` is for the body of a constant, this will just be
45 /// empty.
46 params: Vec<PatId>,
47 /// The `ExprId` of the actual body expression.
48 body_expr: ExprId,
49}
50
51type ExprPtr = Either<AstPtr<ast::Expr>, AstPtr<ast::RecordField>>;
52type ExprSource = Source<ExprPtr>;
53
54type PatPtr = Either<AstPtr<ast::Pat>, AstPtr<ast::SelfParam>>;
55type PatSource = Source<PatPtr>;
56
57/// An item body together with the mapping from syntax nodes to HIR expression
58/// IDs. This is needed to go from e.g. a position in a file to the HIR
59/// expression containing it; but for type inference etc., we want to operate on
60/// a structure that is agnostic to the actual positions of expressions in the
61/// file, so that we don't recompute types whenever some whitespace is typed.
62///
63/// One complication here is that, due to macro expansion, a single `Body` might
64/// be spread across several files. So, for each ExprId and PatId, we record
65/// both the HirFileId and the position inside the file. However, we only store
66/// AST -> ExprId mapping for non-macro files, as it is not clear how to handle
67/// this properly for macros.
68#[derive(Default, Debug, Eq, PartialEq)]
69pub struct BodySourceMap {
70 expr_map: FxHashMap<ExprPtr, ExprId>,
71 expr_map_back: ArenaMap<ExprId, ExprSource>,
72 pat_map: FxHashMap<PatPtr, PatId>,
73 pat_map_back: ArenaMap<PatId, PatSource>,
74 field_map: FxHashMap<(ExprId, usize), AstPtr<ast::RecordField>>,
75}
76
77impl Body {
78 pub fn params(&self) -> &[PatId] {
79 &self.params
80 }
81
82 pub fn body_expr(&self) -> ExprId {
83 self.body_expr
84 }
85
86 pub fn owner(&self) -> DefWithBody {
87 self.owner
88 }
89
90 pub fn exprs(&self) -> impl Iterator<Item = (ExprId, &Expr)> {
91 self.exprs.iter()
92 }
93
94 pub fn pats(&self) -> impl Iterator<Item = (PatId, &Pat)> {
95 self.pats.iter()
96 }
97}
98
99// needs arbitrary_self_types to be a method... or maybe move to the def?
100pub(crate) fn resolver_for_expr(
101 body: Arc<Body>,
102 db: &impl HirDatabase,
103 expr_id: ExprId,
104) -> Resolver {
105 let scopes = db.expr_scopes(body.owner);
106 resolver_for_scope(body, db, scopes.scope_for(expr_id))
107}
108
109pub(crate) fn resolver_for_scope(
110 body: Arc<Body>,
111 db: &impl HirDatabase,
112 scope_id: Option<scope::ScopeId>,
113) -> Resolver {
114 let mut r = body.owner.resolver(db);
115 let scopes = db.expr_scopes(body.owner);
116 let scope_chain = scopes.scope_chain(scope_id).collect::<Vec<_>>();
117 for scope in scope_chain.into_iter().rev() {
118 r = r.push_expr_scope(Arc::clone(&scopes), scope);
119 }
120 r
121}
122
123impl Index<ExprId> for Body {
124 type Output = Expr;
125
126 fn index(&self, expr: ExprId) -> &Expr {
127 &self.exprs[expr]
128 }
129}
130
131impl Index<PatId> for Body {
132 type Output = Pat;
133
134 fn index(&self, pat: PatId) -> &Pat {
135 &self.pats[pat]
136 }
137}
138
139impl BodySourceMap {
140 pub(crate) fn expr_syntax(&self, expr: ExprId) -> Option<ExprSource> {
141 self.expr_map_back.get(expr).copied()
142 }
143
144 pub(crate) fn node_expr(&self, node: &ast::Expr) -> Option<ExprId> {
145 self.expr_map.get(&Either::A(AstPtr::new(node))).cloned()
146 }
147
148 pub(crate) fn pat_syntax(&self, pat: PatId) -> Option<PatSource> {
149 self.pat_map_back.get(pat).copied()
150 }
151
152 pub(crate) fn node_pat(&self, node: &ast::Pat) -> Option<PatId> {
153 self.pat_map.get(&Either::A(AstPtr::new(node))).cloned()
154 }
155
156 pub(crate) fn field_syntax(&self, expr: ExprId, field: usize) -> AstPtr<ast::RecordField> {
157 self.field_map[&(expr, field)]
158 }
159}
160
161#[derive(Debug, Clone, Eq, PartialEq)]
162pub enum Literal {
163 String(String),
164 ByteString(Vec<u8>),
165 Char(char),
166 Bool(bool),
167 Int(u64, UncertainIntTy),
168 Float(u64, UncertainFloatTy), // FIXME: f64 is not Eq
169}
170
171#[derive(Debug, Clone, Eq, PartialEq)]
172pub enum Expr {
173 /// This is produced if syntax tree does not have a required expression piece.
174 Missing,
175 Path(Path),
176 If {
177 condition: ExprId,
178 then_branch: ExprId,
179 else_branch: Option<ExprId>,
180 },
181 Block {
182 statements: Vec<Statement>,
183 tail: Option<ExprId>,
184 },
185 Loop {
186 body: ExprId,
187 },
188 While {
189 condition: ExprId,
190 body: ExprId,
191 },
192 For {
193 iterable: ExprId,
194 pat: PatId,
195 body: ExprId,
196 },
197 Call {
198 callee: ExprId,
199 args: Vec<ExprId>,
200 },
201 MethodCall {
202 receiver: ExprId,
203 method_name: Name,
204 args: Vec<ExprId>,
205 generic_args: Option<GenericArgs>,
206 },
207 Match {
208 expr: ExprId,
209 arms: Vec<MatchArm>,
210 },
211 Continue,
212 Break {
213 expr: Option<ExprId>,
214 },
215 Return {
216 expr: Option<ExprId>,
217 },
218 RecordLit {
219 path: Option<Path>,
220 fields: Vec<RecordLitField>,
221 spread: Option<ExprId>,
222 },
223 Field {
224 expr: ExprId,
225 name: Name,
226 },
227 Await {
228 expr: ExprId,
229 },
230 Try {
231 expr: ExprId,
232 },
233 TryBlock {
234 body: ExprId,
235 },
236 Cast {
237 expr: ExprId,
238 type_ref: TypeRef,
239 }, 19 },
240 Ref { 20};
241 expr: ExprId,
242 mutability: Mutability,
243 },
244 Box {
245 expr: ExprId,
246 },
247 UnaryOp {
248 expr: ExprId,
249 op: UnaryOp,
250 },
251 BinaryOp {
252 lhs: ExprId,
253 rhs: ExprId,
254 op: Option<BinaryOp>,
255 },
256 Index {
257 base: ExprId,
258 index: ExprId,
259 },
260 Lambda {
261 args: Vec<PatId>,
262 arg_types: Vec<Option<TypeRef>>,
263 body: ExprId,
264 },
265 Tuple {
266 exprs: Vec<ExprId>,
267 },
268 Array(Array),
269 Literal(Literal),
270}
271
272#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
273pub enum BinaryOp {
274 LogicOp(LogicOp),
275 ArithOp(ArithOp),
276 CmpOp(CmpOp),
277 Assignment { op: Option<ArithOp> },
278}
279
280#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
281pub enum LogicOp {
282 And,
283 Or,
284}
285
286#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
287pub enum CmpOp {
288 Eq { negated: bool },
289 Ord { ordering: Ordering, strict: bool },
290}
291
292#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
293pub enum Ordering {
294 Less,
295 Greater,
296}
297
298#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
299pub enum ArithOp {
300 Add,
301 Mul,
302 Sub,
303 Div,
304 Rem,
305 Shl,
306 Shr,
307 BitXor,
308 BitOr,
309 BitAnd,
310}
311
312pub use ra_syntax::ast::PrefixOp as UnaryOp;
313#[derive(Debug, Clone, Eq, PartialEq)]
314pub enum Array {
315 ElementList(Vec<ExprId>),
316 Repeat { initializer: ExprId, repeat: ExprId },
317}
318
319#[derive(Debug, Clone, Eq, PartialEq)]
320pub struct MatchArm {
321 pub pats: Vec<PatId>,
322 pub guard: Option<ExprId>,
323 pub expr: ExprId,
324}
325
326#[derive(Debug, Clone, Eq, PartialEq)]
327pub struct RecordLitField {
328 pub name: Name,
329 pub expr: ExprId,
330}
331
332#[derive(Debug, Clone, Eq, PartialEq)]
333pub enum Statement {
334 Let { pat: PatId, type_ref: Option<TypeRef>, initializer: Option<ExprId> },
335 Expr(ExprId),
336}
337
338impl Expr {
339 pub fn walk_child_exprs(&self, mut f: impl FnMut(ExprId)) {
340 match self {
341 Expr::Missing => {}
342 Expr::Path(_) => {}
343 Expr::If { condition, then_branch, else_branch } => {
344 f(*condition);
345 f(*then_branch);
346 if let Some(else_branch) = else_branch {
347 f(*else_branch);
348 }
349 }
350 Expr::Block { statements, tail } => {
351 for stmt in statements {
352 match stmt {
353 Statement::Let { initializer, .. } => {
354 if let Some(expr) = initializer {
355 f(*expr);
356 }
357 }
358 Statement::Expr(e) => f(*e),
359 }
360 }
361 if let Some(expr) = tail {
362 f(*expr);
363 }
364 }
365 Expr::TryBlock { body } => f(*body),
366 Expr::Loop { body } => f(*body),
367 Expr::While { condition, body } => {
368 f(*condition);
369 f(*body);
370 }
371 Expr::For { iterable, body, .. } => {
372 f(*iterable);
373 f(*body);
374 }
375 Expr::Call { callee, args } => {
376 f(*callee);
377 for arg in args {
378 f(*arg);
379 }
380 }
381 Expr::MethodCall { receiver, args, .. } => {
382 f(*receiver);
383 for arg in args {
384 f(*arg);
385 }
386 }
387 Expr::Match { expr, arms } => {
388 f(*expr);
389 for arm in arms {
390 f(arm.expr);
391 }
392 }
393 Expr::Continue => {}
394 Expr::Break { expr } | Expr::Return { expr } => {
395 if let Some(expr) = expr {
396 f(*expr);
397 }
398 }
399 Expr::RecordLit { fields, spread, .. } => {
400 for field in fields {
401 f(field.expr);
402 }
403 if let Some(expr) = spread {
404 f(*expr);
405 }
406 }
407 Expr::Lambda { body, .. } => {
408 f(*body);
409 }
410 Expr::BinaryOp { lhs, rhs, .. } => {
411 f(*lhs);
412 f(*rhs);
413 }
414 Expr::Index { base, index } => {
415 f(*base);
416 f(*index);
417 }
418 Expr::Field { expr, .. }
419 | Expr::Await { expr }
420 | Expr::Try { expr }
421 | Expr::Cast { expr, .. }
422 | Expr::Ref { expr, .. }
423 | Expr::UnaryOp { expr, .. }
424 | Expr::Box { expr } => {
425 f(*expr);
426 }
427 Expr::Tuple { exprs } => {
428 for expr in exprs {
429 f(*expr);
430 }
431 }
432 Expr::Array(a) => match a {
433 Array::ElementList(exprs) => {
434 for expr in exprs {
435 f(*expr);
436 }
437 }
438 Array::Repeat { initializer, repeat } => {
439 f(*initializer);
440 f(*repeat)
441 }
442 },
443 Expr::Literal(_) => {}
444 }
445 }
446}
447
448/// Explicit binding annotations given in the HIR for a binding. Note
449/// that this is not the final binding *mode* that we infer after type
450/// inference.
451#[derive(Clone, PartialEq, Eq, Debug, Copy)]
452pub enum BindingAnnotation {
453 /// No binding annotation given: this means that the final binding mode
454 /// will depend on whether we have skipped through a `&` reference
455 /// when matching. For example, the `x` in `Some(x)` will have binding
456 /// mode `None`; if you do `let Some(x) = &Some(22)`, it will
457 /// ultimately be inferred to be by-reference.
458 Unannotated,
459
460 /// Annotated with `mut x` -- could be either ref or not, similar to `None`.
461 Mutable,
462
463 /// Annotated as `ref`, like `ref x`
464 Ref,
465
466 /// Annotated as `ref mut x`.
467 RefMut,
468}
469
470impl BindingAnnotation {
471 fn new(is_mutable: bool, is_ref: bool) -> Self {
472 match (is_mutable, is_ref) {
473 (true, true) => BindingAnnotation::RefMut,
474 (false, true) => BindingAnnotation::Ref,
475 (true, false) => BindingAnnotation::Mutable,
476 (false, false) => BindingAnnotation::Unannotated,
477 }
478 }
479}
480
481#[derive(Debug, Clone, Eq, PartialEq)]
482pub struct RecordFieldPat {
483 pub(crate) name: Name,
484 pub(crate) pat: PatId,
485}
486
487/// Close relative to rustc's hir::PatKind
488#[derive(Debug, Clone, Eq, PartialEq)]
489pub enum Pat {
490 Missing,
491 Wild,
492 Tuple(Vec<PatId>),
493 Record {
494 path: Option<Path>,
495 args: Vec<RecordFieldPat>,
496 // FIXME: 'ellipsis' option
497 },
498 Range {
499 start: ExprId,
500 end: ExprId,
501 },
502 Slice {
503 prefix: Vec<PatId>,
504 rest: Option<PatId>,
505 suffix: Vec<PatId>,
506 },
507 Path(Path),
508 Lit(ExprId),
509 Bind {
510 mode: BindingAnnotation,
511 name: Name,
512 subpat: Option<PatId>,
513 },
514 TupleStruct {
515 path: Option<Path>,
516 args: Vec<PatId>,
517 },
518 Ref {
519 pat: PatId,
520 mutability: Mutability,
521 },
522}
523
524impl Pat {
525 pub fn walk_child_pats(&self, mut f: impl FnMut(PatId)) {
526 match self {
527 Pat::Range { .. } | Pat::Lit(..) | Pat::Path(..) | Pat::Wild | Pat::Missing => {}
528 Pat::Bind { subpat, .. } => {
529 subpat.iter().copied().for_each(f);
530 }
531 Pat::Tuple(args) | Pat::TupleStruct { args, .. } => {
532 args.iter().copied().for_each(f);
533 }
534 Pat::Ref { pat, .. } => f(*pat),
535 Pat::Slice { prefix, rest, suffix } => {
536 let total_iter = prefix.iter().chain(rest.iter()).chain(suffix.iter());
537 total_iter.copied().for_each(f);
538 }
539 Pat::Record { args, .. } => {
540 args.iter().map(|f| f.pat).for_each(f);
541 }
542 }
543 }
544}
545 21
546// Queries
547pub(crate) fn body_with_source_map_query( 22pub(crate) fn body_with_source_map_query(
548 db: &impl HirDatabase, 23 db: &impl HirDatabase,
549 def: DefWithBody, 24 def: DefWithBody,
@@ -565,11 +40,35 @@ pub(crate) fn body_with_source_map_query(
565 (src.file_id, src.ast.body()) 40 (src.file_id, src.ast.body())
566 } 41 }
567 }; 42 };
568 43 let resolver = hir_def::body::MacroResolver::new(db, def.module(db).id);
569 let (body, source_map) = lower::lower(db, def.resolver(db), file_id, def, params, body); 44 let (body, source_map) = Body::new(db, resolver, file_id, params, body);
570 (Arc::new(body), Arc::new(source_map)) 45 (Arc::new(body), Arc::new(source_map))
571} 46}
572 47
573pub(crate) fn body_hir_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<Body> { 48pub(crate) fn body_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<Body> {
574 db.body_with_source_map(def).0 49 db.body_with_source_map(def).0
575} 50}
51
52// needs arbitrary_self_types to be a method... or maybe move to the def?
53pub(crate) fn resolver_for_expr(
54 db: &impl HirDatabase,
55 owner: DefWithBody,
56 expr_id: ExprId,
57) -> Resolver {
58 let scopes = db.expr_scopes(owner);
59 resolver_for_scope(db, owner, scopes.scope_for(expr_id))
60}
61
62pub(crate) fn resolver_for_scope(
63 db: &impl HirDatabase,
64 owner: DefWithBody,
65 scope_id: Option<scope::ScopeId>,
66) -> Resolver {
67 let mut r = owner.resolver(db);
68 let scopes = db.expr_scopes(owner);
69 let scope_chain = scopes.scope_chain(scope_id).collect::<Vec<_>>();
70 for scope in scope_chain.into_iter().rev() {
71 r = r.push_expr_scope(Arc::clone(&scopes), scope);
72 }
73 r
74}
diff --git a/crates/ra_hir/src/expr/lower.rs b/crates/ra_hir/src/expr/lower.rs
deleted file mode 100644
index 6463dd65e..000000000
--- a/crates/ra_hir/src/expr/lower.rs
+++ /dev/null
@@ -1,647 +0,0 @@
1//! FIXME: write short doc here
2
3use hir_def::{path::GenericArgs, type_ref::TypeRef};
4use hir_expand::{
5 hygiene::Hygiene,
6 name::{self, AsName, Name},
7};
8use ra_arena::Arena;
9use ra_syntax::{
10 ast::{
11 self, ArgListOwner, ArrayExprKind, LiteralKind, LoopBodyOwner, NameOwner,
12 TypeAscriptionOwner,
13 },
14 AstNode, AstPtr,
15};
16use test_utils::tested_by;
17
18use crate::{
19 db::HirDatabase,
20 ty::primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
21 AstId, DefWithBody, Either, HirFileId, MacroCallLoc, MacroFileKind, Mutability, Path, Resolver,
22 Source,
23};
24
25use super::{
26 ArithOp, Array, BinaryOp, BindingAnnotation, Body, BodySourceMap, CmpOp, Expr, ExprId, Literal,
27 LogicOp, MatchArm, Ordering, Pat, PatId, PatPtr, RecordFieldPat, RecordLitField, Statement,
28};
29
30pub(super) fn lower(
31 db: &impl HirDatabase,
32 resolver: Resolver,
33 file_id: HirFileId,
34 owner: DefWithBody,
35 params: Option<ast::ParamList>,
36 body: Option<ast::Expr>,
37) -> (Body, BodySourceMap) {
38 ExprCollector {
39 resolver,
40 db,
41 original_file_id: file_id,
42 current_file_id: file_id,
43 source_map: BodySourceMap::default(),
44 body: Body {
45 owner,
46 exprs: Arena::default(),
47 pats: Arena::default(),
48 params: Vec::new(),
49 body_expr: ExprId((!0).into()),
50 },
51 }
52 .collect(params, body)
53}
54
55struct ExprCollector<DB> {
56 db: DB,
57 resolver: Resolver,
58 // Expr collector expands macros along the way. original points to the file
59 // we started with, current points to the current macro expansion. source
60 // maps don't support macros yet, so we only record info into source map if
61 // current == original (see #1196)
62 original_file_id: HirFileId,
63 current_file_id: HirFileId,
64
65 body: Body,
66 source_map: BodySourceMap,
67}
68
69impl<'a, DB> ExprCollector<&'a DB>
70where
71 DB: HirDatabase,
72{
73 fn collect(
74 mut self,
75 param_list: Option<ast::ParamList>,
76 body: Option<ast::Expr>,
77 ) -> (Body, BodySourceMap) {
78 if let Some(param_list) = param_list {
79 if let Some(self_param) = param_list.self_param() {
80 let ptr = AstPtr::new(&self_param);
81 let param_pat = self.alloc_pat(
82 Pat::Bind {
83 name: name::SELF_PARAM,
84 mode: BindingAnnotation::Unannotated,
85 subpat: None,
86 },
87 Either::B(ptr),
88 );
89 self.body.params.push(param_pat);
90 }
91
92 for param in param_list.params() {
93 let pat = match param.pat() {
94 None => continue,
95 Some(pat) => pat,
96 };
97 let param_pat = self.collect_pat(pat);
98 self.body.params.push(param_pat);
99 }
100 };
101
102 self.body.body_expr = self.collect_expr_opt(body);
103 (self.body, self.source_map)
104 }
105
106 fn alloc_expr(&mut self, expr: Expr, ptr: AstPtr<ast::Expr>) -> ExprId {
107 let ptr = Either::A(ptr);
108 let id = self.body.exprs.alloc(expr);
109 if self.current_file_id == self.original_file_id {
110 self.source_map.expr_map.insert(ptr, id);
111 }
112 self.source_map
113 .expr_map_back
114 .insert(id, Source { file_id: self.current_file_id, ast: ptr });
115 id
116 }
117 // desugared exprs don't have ptr, that's wrong and should be fixed
118 // somehow.
119 fn alloc_expr_desugared(&mut self, expr: Expr) -> ExprId {
120 self.body.exprs.alloc(expr)
121 }
122 fn alloc_expr_field_shorthand(&mut self, expr: Expr, ptr: AstPtr<ast::RecordField>) -> ExprId {
123 let ptr = Either::B(ptr);
124 let id = self.body.exprs.alloc(expr);
125 if self.current_file_id == self.original_file_id {
126 self.source_map.expr_map.insert(ptr, id);
127 }
128 self.source_map
129 .expr_map_back
130 .insert(id, Source { file_id: self.current_file_id, ast: ptr });
131 id
132 }
133 fn alloc_pat(&mut self, pat: Pat, ptr: PatPtr) -> PatId {
134 let id = self.body.pats.alloc(pat);
135 if self.current_file_id == self.original_file_id {
136 self.source_map.pat_map.insert(ptr, id);
137 }
138 self.source_map.pat_map_back.insert(id, Source { file_id: self.current_file_id, ast: ptr });
139 id
140 }
141
142 fn empty_block(&mut self) -> ExprId {
143 let block = Expr::Block { statements: Vec::new(), tail: None };
144 self.body.exprs.alloc(block)
145 }
146
147 fn missing_expr(&mut self) -> ExprId {
148 self.body.exprs.alloc(Expr::Missing)
149 }
150
151 fn missing_pat(&mut self) -> PatId {
152 self.body.pats.alloc(Pat::Missing)
153 }
154
155 fn collect_expr(&mut self, expr: ast::Expr) -> ExprId {
156 let syntax_ptr = AstPtr::new(&expr);
157 match expr {
158 ast::Expr::IfExpr(e) => {
159 let then_branch = self.collect_block_opt(e.then_branch());
160
161 let else_branch = e.else_branch().map(|b| match b {
162 ast::ElseBranch::Block(it) => self.collect_block(it),
163 ast::ElseBranch::IfExpr(elif) => {
164 let expr: ast::Expr = ast::Expr::cast(elif.syntax().clone()).unwrap();
165 self.collect_expr(expr)
166 }
167 });
168
169 let condition = match e.condition() {
170 None => self.missing_expr(),
171 Some(condition) => match condition.pat() {
172 None => self.collect_expr_opt(condition.expr()),
173 // if let -- desugar to match
174 Some(pat) => {
175 let pat = self.collect_pat(pat);
176 let match_expr = self.collect_expr_opt(condition.expr());
177 let placeholder_pat = self.missing_pat();
178 let arms = vec![
179 MatchArm { pats: vec![pat], expr: then_branch, guard: None },
180 MatchArm {
181 pats: vec![placeholder_pat],
182 expr: else_branch.unwrap_or_else(|| self.empty_block()),
183 guard: None,
184 },
185 ];
186 return self
187 .alloc_expr(Expr::Match { expr: match_expr, arms }, syntax_ptr);
188 }
189 },
190 };
191
192 self.alloc_expr(Expr::If { condition, then_branch, else_branch }, syntax_ptr)
193 }
194 ast::Expr::TryBlockExpr(e) => {
195 let body = self.collect_block_opt(e.body());
196 self.alloc_expr(Expr::TryBlock { body }, syntax_ptr)
197 }
198 ast::Expr::BlockExpr(e) => self.collect_block(e),
199 ast::Expr::LoopExpr(e) => {
200 let body = self.collect_block_opt(e.loop_body());
201 self.alloc_expr(Expr::Loop { body }, syntax_ptr)
202 }
203 ast::Expr::WhileExpr(e) => {
204 let body = self.collect_block_opt(e.loop_body());
205
206 let condition = match e.condition() {
207 None => self.missing_expr(),
208 Some(condition) => match condition.pat() {
209 None => self.collect_expr_opt(condition.expr()),
210 // if let -- desugar to match
211 Some(pat) => {
212 tested_by!(infer_while_let);
213 let pat = self.collect_pat(pat);
214 let match_expr = self.collect_expr_opt(condition.expr());
215 let placeholder_pat = self.missing_pat();
216 let break_ = self.alloc_expr_desugared(Expr::Break { expr: None });
217 let arms = vec![
218 MatchArm { pats: vec![pat], expr: body, guard: None },
219 MatchArm { pats: vec![placeholder_pat], expr: break_, guard: None },
220 ];
221 let match_expr =
222 self.alloc_expr_desugared(Expr::Match { expr: match_expr, arms });
223 return self.alloc_expr(Expr::Loop { body: match_expr }, syntax_ptr);
224 }
225 },
226 };
227
228 self.alloc_expr(Expr::While { condition, body }, syntax_ptr)
229 }
230 ast::Expr::ForExpr(e) => {
231 let iterable = self.collect_expr_opt(e.iterable());
232 let pat = self.collect_pat_opt(e.pat());
233 let body = self.collect_block_opt(e.loop_body());
234 self.alloc_expr(Expr::For { iterable, pat, body }, syntax_ptr)
235 }
236 ast::Expr::CallExpr(e) => {
237 let callee = self.collect_expr_opt(e.expr());
238 let args = if let Some(arg_list) = e.arg_list() {
239 arg_list.args().map(|e| self.collect_expr(e)).collect()
240 } else {
241 Vec::new()
242 };
243 self.alloc_expr(Expr::Call { callee, args }, syntax_ptr)
244 }
245 ast::Expr::MethodCallExpr(e) => {
246 let receiver = self.collect_expr_opt(e.expr());
247 let args = if let Some(arg_list) = e.arg_list() {
248 arg_list.args().map(|e| self.collect_expr(e)).collect()
249 } else {
250 Vec::new()
251 };
252 let method_name = e.name_ref().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
253 let generic_args = e.type_arg_list().and_then(GenericArgs::from_ast);
254 self.alloc_expr(
255 Expr::MethodCall { receiver, method_name, args, generic_args },
256 syntax_ptr,
257 )
258 }
259 ast::Expr::MatchExpr(e) => {
260 let expr = self.collect_expr_opt(e.expr());
261 let arms = if let Some(match_arm_list) = e.match_arm_list() {
262 match_arm_list
263 .arms()
264 .map(|arm| MatchArm {
265 pats: arm.pats().map(|p| self.collect_pat(p)).collect(),
266 expr: self.collect_expr_opt(arm.expr()),
267 guard: arm
268 .guard()
269 .and_then(|guard| guard.expr())
270 .map(|e| self.collect_expr(e)),
271 })
272 .collect()
273 } else {
274 Vec::new()
275 };
276 self.alloc_expr(Expr::Match { expr, arms }, syntax_ptr)
277 }
278 ast::Expr::PathExpr(e) => {
279 let path = e
280 .path()
281 .and_then(|path| self.parse_path(path))
282 .map(Expr::Path)
283 .unwrap_or(Expr::Missing);
284 self.alloc_expr(path, syntax_ptr)
285 }
286 ast::Expr::ContinueExpr(_e) => {
287 // FIXME: labels
288 self.alloc_expr(Expr::Continue, syntax_ptr)
289 }
290 ast::Expr::BreakExpr(e) => {
291 let expr = e.expr().map(|e| self.collect_expr(e));
292 self.alloc_expr(Expr::Break { expr }, syntax_ptr)
293 }
294 ast::Expr::ParenExpr(e) => {
295 let inner = self.collect_expr_opt(e.expr());
296 // make the paren expr point to the inner expression as well
297 self.source_map.expr_map.insert(Either::A(syntax_ptr), inner);
298 inner
299 }
300 ast::Expr::ReturnExpr(e) => {
301 let expr = e.expr().map(|e| self.collect_expr(e));
302 self.alloc_expr(Expr::Return { expr }, syntax_ptr)
303 }
304 ast::Expr::RecordLit(e) => {
305 let path = e.path().and_then(|path| self.parse_path(path));
306 let mut field_ptrs = Vec::new();
307 let record_lit = if let Some(nfl) = e.record_field_list() {
308 let fields = nfl
309 .fields()
310 .inspect(|field| field_ptrs.push(AstPtr::new(field)))
311 .map(|field| RecordLitField {
312 name: field
313 .name_ref()
314 .map(|nr| nr.as_name())
315 .unwrap_or_else(Name::missing),
316 expr: if let Some(e) = field.expr() {
317 self.collect_expr(e)
318 } else if let Some(nr) = field.name_ref() {
319 // field shorthand
320 self.alloc_expr_field_shorthand(
321 Expr::Path(Path::from_name_ref(&nr)),
322 AstPtr::new(&field),
323 )
324 } else {
325 self.missing_expr()
326 },
327 })
328 .collect();
329 let spread = nfl.spread().map(|s| self.collect_expr(s));
330 Expr::RecordLit { path, fields, spread }
331 } else {
332 Expr::RecordLit { path, fields: Vec::new(), spread: None }
333 };
334
335 let res = self.alloc_expr(record_lit, syntax_ptr);
336 for (i, ptr) in field_ptrs.into_iter().enumerate() {
337 self.source_map.field_map.insert((res, i), ptr);
338 }
339 res
340 }
341 ast::Expr::FieldExpr(e) => {
342 let expr = self.collect_expr_opt(e.expr());
343 let name = match e.field_access() {
344 Some(kind) => kind.as_name(),
345 _ => Name::missing(),
346 };
347 self.alloc_expr(Expr::Field { expr, name }, syntax_ptr)
348 }
349 ast::Expr::AwaitExpr(e) => {
350 let expr = self.collect_expr_opt(e.expr());
351 self.alloc_expr(Expr::Await { expr }, syntax_ptr)
352 }
353 ast::Expr::TryExpr(e) => {
354 let expr = self.collect_expr_opt(e.expr());
355 self.alloc_expr(Expr::Try { expr }, syntax_ptr)
356 }
357 ast::Expr::CastExpr(e) => {
358 let expr = self.collect_expr_opt(e.expr());
359 let type_ref = TypeRef::from_ast_opt(e.type_ref());
360 self.alloc_expr(Expr::Cast { expr, type_ref }, syntax_ptr)
361 }
362 ast::Expr::RefExpr(e) => {
363 let expr = self.collect_expr_opt(e.expr());
364 let mutability = Mutability::from_mutable(e.is_mut());
365 self.alloc_expr(Expr::Ref { expr, mutability }, syntax_ptr)
366 }
367 ast::Expr::PrefixExpr(e) => {
368 let expr = self.collect_expr_opt(e.expr());
369 if let Some(op) = e.op_kind() {
370 self.alloc_expr(Expr::UnaryOp { expr, op }, syntax_ptr)
371 } else {
372 self.alloc_expr(Expr::Missing, syntax_ptr)
373 }
374 }
375 ast::Expr::LambdaExpr(e) => {
376 let mut args = Vec::new();
377 let mut arg_types = Vec::new();
378 if let Some(pl) = e.param_list() {
379 for param in pl.params() {
380 let pat = self.collect_pat_opt(param.pat());
381 let type_ref = param.ascribed_type().map(TypeRef::from_ast);
382 args.push(pat);
383 arg_types.push(type_ref);
384 }
385 }
386 let body = self.collect_expr_opt(e.body());
387 self.alloc_expr(Expr::Lambda { args, arg_types, body }, syntax_ptr)
388 }
389 ast::Expr::BinExpr(e) => {
390 let lhs = self.collect_expr_opt(e.lhs());
391 let rhs = self.collect_expr_opt(e.rhs());
392 let op = e.op_kind().map(BinaryOp::from);
393 self.alloc_expr(Expr::BinaryOp { lhs, rhs, op }, syntax_ptr)
394 }
395 ast::Expr::TupleExpr(e) => {
396 let exprs = e.exprs().map(|expr| self.collect_expr(expr)).collect();
397 self.alloc_expr(Expr::Tuple { exprs }, syntax_ptr)
398 }
399 ast::Expr::BoxExpr(e) => {
400 let expr = self.collect_expr_opt(e.expr());
401 self.alloc_expr(Expr::Box { expr }, syntax_ptr)
402 }
403
404 ast::Expr::ArrayExpr(e) => {
405 let kind = e.kind();
406
407 match kind {
408 ArrayExprKind::ElementList(e) => {
409 let exprs = e.map(|expr| self.collect_expr(expr)).collect();
410 self.alloc_expr(Expr::Array(Array::ElementList(exprs)), syntax_ptr)
411 }
412 ArrayExprKind::Repeat { initializer, repeat } => {
413 let initializer = self.collect_expr_opt(initializer);
414 let repeat = self.collect_expr_opt(repeat);
415 self.alloc_expr(
416 Expr::Array(Array::Repeat { initializer, repeat }),
417 syntax_ptr,
418 )
419 }
420 }
421 }
422
423 ast::Expr::Literal(e) => {
424 let lit = match e.kind() {
425 LiteralKind::IntNumber { suffix } => {
426 let known_name = suffix
427 .and_then(|it| IntTy::from_suffix(&it).map(UncertainIntTy::Known));
428
429 Literal::Int(
430 Default::default(),
431 known_name.unwrap_or(UncertainIntTy::Unknown),
432 )
433 }
434 LiteralKind::FloatNumber { suffix } => {
435 let known_name = suffix
436 .and_then(|it| FloatTy::from_suffix(&it).map(UncertainFloatTy::Known));
437
438 Literal::Float(
439 Default::default(),
440 known_name.unwrap_or(UncertainFloatTy::Unknown),
441 )
442 }
443 LiteralKind::ByteString => Literal::ByteString(Default::default()),
444 LiteralKind::String => Literal::String(Default::default()),
445 LiteralKind::Byte => {
446 Literal::Int(Default::default(), UncertainIntTy::Known(IntTy::u8()))
447 }
448 LiteralKind::Bool => Literal::Bool(Default::default()),
449 LiteralKind::Char => Literal::Char(Default::default()),
450 };
451 self.alloc_expr(Expr::Literal(lit), syntax_ptr)
452 }
453 ast::Expr::IndexExpr(e) => {
454 let base = self.collect_expr_opt(e.base());
455 let index = self.collect_expr_opt(e.index());
456 self.alloc_expr(Expr::Index { base, index }, syntax_ptr)
457 }
458
459 // FIXME implement HIR for these:
460 ast::Expr::Label(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
461 ast::Expr::RangeExpr(_e) => self.alloc_expr(Expr::Missing, syntax_ptr),
462 ast::Expr::MacroCall(e) => {
463 let ast_id = AstId::new(
464 self.current_file_id,
465 self.db.ast_id_map(self.current_file_id).ast_id(&e),
466 );
467
468 if let Some(path) = e.path().and_then(|path| self.parse_path(path)) {
469 if let Some(def) = self.resolver.resolve_path_as_macro(self.db, &path) {
470 let call_id = self.db.intern_macro(MacroCallLoc { def: def.id, ast_id });
471 let file_id = call_id.as_file(MacroFileKind::Expr);
472 if let Some(node) = self.db.parse_or_expand(file_id) {
473 if let Some(expr) = ast::Expr::cast(node) {
474 log::debug!("macro expansion {:#?}", expr.syntax());
475 let old_file_id =
476 std::mem::replace(&mut self.current_file_id, file_id);
477 let id = self.collect_expr(expr);
478 self.current_file_id = old_file_id;
479 return id;
480 }
481 }
482 }
483 }
484 // FIXME: Instead of just dropping the error from expansion
485 // report it
486 self.alloc_expr(Expr::Missing, syntax_ptr)
487 }
488 }
489 }
490
491 fn collect_expr_opt(&mut self, expr: Option<ast::Expr>) -> ExprId {
492 if let Some(expr) = expr {
493 self.collect_expr(expr)
494 } else {
495 self.missing_expr()
496 }
497 }
498
499 fn collect_block(&mut self, expr: ast::BlockExpr) -> ExprId {
500 let syntax_node_ptr = AstPtr::new(&expr.clone().into());
501 let block = match expr.block() {
502 Some(block) => block,
503 None => return self.alloc_expr(Expr::Missing, syntax_node_ptr),
504 };
505 let statements = block
506 .statements()
507 .map(|s| match s {
508 ast::Stmt::LetStmt(stmt) => {
509 let pat = self.collect_pat_opt(stmt.pat());
510 let type_ref = stmt.ascribed_type().map(TypeRef::from_ast);
511 let initializer = stmt.initializer().map(|e| self.collect_expr(e));
512 Statement::Let { pat, type_ref, initializer }
513 }
514 ast::Stmt::ExprStmt(stmt) => Statement::Expr(self.collect_expr_opt(stmt.expr())),
515 })
516 .collect();
517 let tail = block.expr().map(|e| self.collect_expr(e));
518 self.alloc_expr(Expr::Block { statements, tail }, syntax_node_ptr)
519 }
520
521 fn collect_block_opt(&mut self, expr: Option<ast::BlockExpr>) -> ExprId {
522 if let Some(block) = expr {
523 self.collect_block(block)
524 } else {
525 self.missing_expr()
526 }
527 }
528
529 fn collect_pat(&mut self, pat: ast::Pat) -> PatId {
530 let pattern = match &pat {
531 ast::Pat::BindPat(bp) => {
532 let name = bp.name().map(|nr| nr.as_name()).unwrap_or_else(Name::missing);
533 let annotation = BindingAnnotation::new(bp.is_mutable(), bp.is_ref());
534 let subpat = bp.pat().map(|subpat| self.collect_pat(subpat));
535 Pat::Bind { name, mode: annotation, subpat }
536 }
537 ast::Pat::TupleStructPat(p) => {
538 let path = p.path().and_then(|path| self.parse_path(path));
539 let args = p.args().map(|p| self.collect_pat(p)).collect();
540 Pat::TupleStruct { path, args }
541 }
542 ast::Pat::RefPat(p) => {
543 let pat = self.collect_pat_opt(p.pat());
544 let mutability = Mutability::from_mutable(p.is_mut());
545 Pat::Ref { pat, mutability }
546 }
547 ast::Pat::PathPat(p) => {
548 let path = p.path().and_then(|path| self.parse_path(path));
549 path.map(Pat::Path).unwrap_or(Pat::Missing)
550 }
551 ast::Pat::TuplePat(p) => {
552 let args = p.args().map(|p| self.collect_pat(p)).collect();
553 Pat::Tuple(args)
554 }
555 ast::Pat::PlaceholderPat(_) => Pat::Wild,
556 ast::Pat::RecordPat(p) => {
557 let path = p.path().and_then(|path| self.parse_path(path));
558 let record_field_pat_list =
559 p.record_field_pat_list().expect("every struct should have a field list");
560 let mut fields: Vec<_> = record_field_pat_list
561 .bind_pats()
562 .filter_map(|bind_pat| {
563 let ast_pat =
564 ast::Pat::cast(bind_pat.syntax().clone()).expect("bind pat is a pat");
565 let pat = self.collect_pat(ast_pat);
566 let name = bind_pat.name()?.as_name();
567 Some(RecordFieldPat { name, pat })
568 })
569 .collect();
570 let iter = record_field_pat_list.record_field_pats().filter_map(|f| {
571 let ast_pat = f.pat()?;
572 let pat = self.collect_pat(ast_pat);
573 let name = f.name()?.as_name();
574 Some(RecordFieldPat { name, pat })
575 });
576 fields.extend(iter);
577
578 Pat::Record { path, args: fields }
579 }
580
581 // FIXME: implement
582 ast::Pat::DotDotPat(_) => Pat::Missing,
583 ast::Pat::BoxPat(_) => Pat::Missing,
584 ast::Pat::LiteralPat(_) => Pat::Missing,
585 ast::Pat::SlicePat(_) | ast::Pat::RangePat(_) => Pat::Missing,
586 };
587 let ptr = AstPtr::new(&pat);
588 self.alloc_pat(pattern, Either::A(ptr))
589 }
590
591 fn collect_pat_opt(&mut self, pat: Option<ast::Pat>) -> PatId {
592 if let Some(pat) = pat {
593 self.collect_pat(pat)
594 } else {
595 self.missing_pat()
596 }
597 }
598
599 fn parse_path(&mut self, path: ast::Path) -> Option<Path> {
600 let hygiene = Hygiene::new(self.db, self.current_file_id);
601 Path::from_src(path, &hygiene)
602 }
603}
604
605impl From<ast::BinOp> for BinaryOp {
606 fn from(ast_op: ast::BinOp) -> Self {
607 match ast_op {
608 ast::BinOp::BooleanOr => BinaryOp::LogicOp(LogicOp::Or),
609 ast::BinOp::BooleanAnd => BinaryOp::LogicOp(LogicOp::And),
610 ast::BinOp::EqualityTest => BinaryOp::CmpOp(CmpOp::Eq { negated: false }),
611 ast::BinOp::NegatedEqualityTest => BinaryOp::CmpOp(CmpOp::Eq { negated: true }),
612 ast::BinOp::LesserEqualTest => {
613 BinaryOp::CmpOp(CmpOp::Ord { ordering: Ordering::Less, strict: false })
614 }
615 ast::BinOp::GreaterEqualTest => {
616 BinaryOp::CmpOp(CmpOp::Ord { ordering: Ordering::Greater, strict: false })
617 }
618 ast::BinOp::LesserTest => {
619 BinaryOp::CmpOp(CmpOp::Ord { ordering: Ordering::Less, strict: true })
620 }
621 ast::BinOp::GreaterTest => {
622 BinaryOp::CmpOp(CmpOp::Ord { ordering: Ordering::Greater, strict: true })
623 }
624 ast::BinOp::Addition => BinaryOp::ArithOp(ArithOp::Add),
625 ast::BinOp::Multiplication => BinaryOp::ArithOp(ArithOp::Mul),
626 ast::BinOp::Subtraction => BinaryOp::ArithOp(ArithOp::Sub),
627 ast::BinOp::Division => BinaryOp::ArithOp(ArithOp::Div),
628 ast::BinOp::Remainder => BinaryOp::ArithOp(ArithOp::Rem),
629 ast::BinOp::LeftShift => BinaryOp::ArithOp(ArithOp::Shl),
630 ast::BinOp::RightShift => BinaryOp::ArithOp(ArithOp::Shr),
631 ast::BinOp::BitwiseXor => BinaryOp::ArithOp(ArithOp::BitXor),
632 ast::BinOp::BitwiseOr => BinaryOp::ArithOp(ArithOp::BitOr),
633 ast::BinOp::BitwiseAnd => BinaryOp::ArithOp(ArithOp::BitAnd),
634 ast::BinOp::Assignment => BinaryOp::Assignment { op: None },
635 ast::BinOp::AddAssign => BinaryOp::Assignment { op: Some(ArithOp::Add) },
636 ast::BinOp::DivAssign => BinaryOp::Assignment { op: Some(ArithOp::Div) },
637 ast::BinOp::MulAssign => BinaryOp::Assignment { op: Some(ArithOp::Mul) },
638 ast::BinOp::RemAssign => BinaryOp::Assignment { op: Some(ArithOp::Rem) },
639 ast::BinOp::ShlAssign => BinaryOp::Assignment { op: Some(ArithOp::Shl) },
640 ast::BinOp::ShrAssign => BinaryOp::Assignment { op: Some(ArithOp::Shr) },
641 ast::BinOp::SubAssign => BinaryOp::Assignment { op: Some(ArithOp::Sub) },
642 ast::BinOp::BitOrAssign => BinaryOp::Assignment { op: Some(ArithOp::BitOr) },
643 ast::BinOp::BitAndAssign => BinaryOp::Assignment { op: Some(ArithOp::BitAnd) },
644 ast::BinOp::BitXorAssign => BinaryOp::Assignment { op: Some(ArithOp::BitXor) },
645 }
646 }
647}
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs
index daf8d8d07..0e49a28d6 100644
--- a/crates/ra_hir/src/expr/scope.rs
+++ b/crates/ra_hir/src/expr/scope.rs
@@ -46,7 +46,7 @@ pub(crate) struct ScopeData {
46 46
47impl ExprScopes { 47impl ExprScopes {
48 pub(crate) fn expr_scopes_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<ExprScopes> { 48 pub(crate) fn expr_scopes_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<ExprScopes> {
49 let body = db.body_hir(def); 49 let body = db.body(def);
50 let res = ExprScopes::new(body); 50 let res = ExprScopes::new(body);
51 Arc::new(res) 51 Arc::new(res)
52 } 52 }
diff --git a/crates/ra_hir/src/marks.rs b/crates/ra_hir/src/marks.rs
index 0d4fa5b67..0f754eb9c 100644
--- a/crates/ra_hir/src/marks.rs
+++ b/crates/ra_hir/src/marks.rs
@@ -5,6 +5,5 @@ test_utils::marks!(
5 type_var_cycles_resolve_as_possible 5 type_var_cycles_resolve_as_possible
6 type_var_resolves_to_int_var 6 type_var_resolves_to_int_var
7 match_ergonomics_ref 7 match_ergonomics_ref
8 infer_while_let
9 coerce_merge_fail_fallback 8 coerce_merge_fail_fallback
10); 9);
diff --git a/crates/ra_hir/src/source_binder.rs b/crates/ra_hir/src/source_binder.rs
index fe4211819..f28e9c931 100644
--- a/crates/ra_hir/src/source_binder.rs
+++ b/crates/ra_hir/src/source_binder.rs
@@ -150,7 +150,7 @@ impl SourceAnalyzer {
150 None => scope_for(&scopes, &source_map, &node), 150 None => scope_for(&scopes, &source_map, &node),
151 Some(offset) => scope_for_offset(&scopes, &source_map, file_id.into(), offset), 151 Some(offset) => scope_for_offset(&scopes, &source_map, file_id.into(), offset),
152 }; 152 };
153 let resolver = expr::resolver_for_scope(def.body(db), db, scope); 153 let resolver = expr::resolver_for_scope(db, def, scope);
154 SourceAnalyzer { 154 SourceAnalyzer {
155 resolver, 155 resolver,
156 body_owner: Some(def), 156 body_owner: Some(def),
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
index 2370e8d4f..f17c6c614 100644
--- a/crates/ra_hir/src/ty/infer.rs
+++ b/crates/ra_hir/src/ty/infer.rs
@@ -43,7 +43,7 @@ use crate::{
43 expr::{BindingAnnotation, Body, ExprId, PatId}, 43 expr::{BindingAnnotation, Body, ExprId, PatId},
44 resolve::{Resolver, TypeNs}, 44 resolve::{Resolver, TypeNs},
45 ty::infer::diagnostics::InferenceDiagnostic, 45 ty::infer::diagnostics::InferenceDiagnostic,
46 Adt, AssocItem, ConstData, DefWithBody, FnData, Function, HasBody, Path, StructField, 46 Adt, AssocItem, ConstData, DefWithBody, FnData, Function, Path, StructField,
47}; 47};
48 48
49macro_rules! ty_app { 49macro_rules! ty_app {
@@ -64,9 +64,8 @@ mod coerce;
64/// The entry point of type inference. 64/// The entry point of type inference.
65pub fn infer_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<InferenceResult> { 65pub fn infer_query(db: &impl HirDatabase, def: DefWithBody) -> Arc<InferenceResult> {
66 let _p = profile("infer_query"); 66 let _p = profile("infer_query");
67 let body = def.body(db);
68 let resolver = def.resolver(db); 67 let resolver = def.resolver(db);
69 let mut ctx = InferenceContext::new(db, body, resolver); 68 let mut ctx = InferenceContext::new(db, def, resolver);
70 69
71 match def { 70 match def {
72 DefWithBody::Const(ref c) => ctx.collect_const(&c.data(db)), 71 DefWithBody::Const(ref c) => ctx.collect_const(&c.data(db)),
@@ -187,6 +186,7 @@ impl Index<PatId> for InferenceResult {
187#[derive(Clone, Debug)] 186#[derive(Clone, Debug)]
188struct InferenceContext<'a, D: HirDatabase> { 187struct InferenceContext<'a, D: HirDatabase> {
189 db: &'a D, 188 db: &'a D,
189 owner: DefWithBody,
190 body: Arc<Body>, 190 body: Arc<Body>,
191 resolver: Resolver, 191 resolver: Resolver,
192 var_unification_table: InPlaceUnificationTable<TypeVarId>, 192 var_unification_table: InPlaceUnificationTable<TypeVarId>,
@@ -204,7 +204,7 @@ struct InferenceContext<'a, D: HirDatabase> {
204} 204}
205 205
206impl<'a, D: HirDatabase> InferenceContext<'a, D> { 206impl<'a, D: HirDatabase> InferenceContext<'a, D> {
207 fn new(db: &'a D, body: Arc<Body>, resolver: Resolver) -> Self { 207 fn new(db: &'a D, owner: DefWithBody, resolver: Resolver) -> Self {
208 InferenceContext { 208 InferenceContext {
209 result: InferenceResult::default(), 209 result: InferenceResult::default(),
210 var_unification_table: InPlaceUnificationTable::new(), 210 var_unification_table: InPlaceUnificationTable::new(),
@@ -213,7 +213,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
213 trait_env: lower::trait_env(db, &resolver), 213 trait_env: lower::trait_env(db, &resolver),
214 coerce_unsized_map: Self::init_coerce_unsized_map(db, &resolver), 214 coerce_unsized_map: Self::init_coerce_unsized_map(db, &resolver),
215 db, 215 db,
216 body, 216 owner,
217 body: db.body(owner),
217 resolver, 218 resolver,
218 } 219 }
219 } 220 }
diff --git a/crates/ra_hir/src/ty/infer/expr.rs b/crates/ra_hir/src/ty/infer/expr.rs
index 4af1d65ee..c6802487a 100644
--- a/crates/ra_hir/src/ty/infer/expr.rs
+++ b/crates/ra_hir/src/ty/infer/expr.rs
@@ -130,10 +130,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
130 TypeCtor::FnPtr { num_args: sig_tys.len() as u16 - 1 }, 130 TypeCtor::FnPtr { num_args: sig_tys.len() as u16 - 1 },
131 Substs(sig_tys.into()), 131 Substs(sig_tys.into()),
132 ); 132 );
133 let closure_ty = Ty::apply_one( 133 let closure_ty =
134 TypeCtor::Closure { def: self.body.owner(), expr: tgt_expr }, 134 Ty::apply_one(TypeCtor::Closure { def: self.owner, expr: tgt_expr }, sig_ty);
135 sig_ty,
136 );
137 135
138 // Eagerly try to relate the closure type with the expected 136 // Eagerly try to relate the closure type with the expected
139 // type, otherwise we often won't have enough information to 137 // type, otherwise we often won't have enough information to
@@ -184,7 +182,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
184 } 182 }
185 Expr::Path(p) => { 183 Expr::Path(p) => {
186 // FIXME this could be more efficient... 184 // FIXME this could be more efficient...
187 let resolver = expr::resolver_for_expr(self.body.clone(), self.db, tgt_expr); 185 let resolver = expr::resolver_for_expr(self.db, self.owner, tgt_expr);
188 self.infer_path(&resolver, p, tgt_expr.into()).unwrap_or(Ty::Unknown) 186 self.infer_path(&resolver, p, tgt_expr.into()).unwrap_or(Ty::Unknown)
189 } 187 }
190 Expr::Continue => Ty::simple(TypeCtor::Never), 188 Expr::Continue => Ty::simple(TypeCtor::Never),
@@ -452,8 +450,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
452 Ty::apply_one(TypeCtor::Ref(Mutability::Shared), slice_type) 450 Ty::apply_one(TypeCtor::Ref(Mutability::Shared), slice_type)
453 } 451 }
454 Literal::Char(..) => Ty::simple(TypeCtor::Char), 452 Literal::Char(..) => Ty::simple(TypeCtor::Char),
455 Literal::Int(_v, ty) => Ty::simple(TypeCtor::Int(*ty)), 453 Literal::Int(_v, ty) => Ty::simple(TypeCtor::Int((*ty).into())),
456 Literal::Float(_v, ty) => Ty::simple(TypeCtor::Float(*ty)), 454 Literal::Float(_v, ty) => Ty::simple(TypeCtor::Float((*ty).into())),
457 }, 455 },
458 }; 456 };
459 // use a new type variable if we got Ty::Unknown here 457 // use a new type variable if we got Ty::Unknown here
diff --git a/crates/ra_hir/src/ty/lower.rs b/crates/ra_hir/src/ty/lower.rs
index 1fed5025e..1832fcf50 100644
--- a/crates/ra_hir/src/ty/lower.rs
+++ b/crates/ra_hir/src/ty/lower.rs
@@ -9,7 +9,7 @@ use std::iter;
9use std::sync::Arc; 9use std::sync::Arc;
10 10
11use hir_def::{ 11use hir_def::{
12 builtin_type::BuiltinType, 12 builtin_type::{BuiltinFloat, BuiltinInt, BuiltinType},
13 path::{GenericArg, PathSegment}, 13 path::{GenericArg, PathSegment},
14 type_ref::{TypeBound, TypeRef}, 14 type_ref::{TypeBound, TypeRef},
15}; 15};
@@ -25,7 +25,7 @@ use crate::{
25 generics::{GenericDef, WherePredicate}, 25 generics::{GenericDef, WherePredicate},
26 resolve::{Resolver, TypeNs}, 26 resolve::{Resolver, TypeNs},
27 ty::{ 27 ty::{
28 primitive::{FloatTy, IntTy}, 28 primitive::{FloatTy, IntTy, UncertainFloatTy, UncertainIntTy},
29 Adt, 29 Adt,
30 }, 30 },
31 util::make_mut_slice, 31 util::make_mut_slice,
@@ -657,13 +657,41 @@ fn type_for_builtin(def: BuiltinType) -> Ty {
657 BuiltinType::Char => TypeCtor::Char, 657 BuiltinType::Char => TypeCtor::Char,
658 BuiltinType::Bool => TypeCtor::Bool, 658 BuiltinType::Bool => TypeCtor::Bool,
659 BuiltinType::Str => TypeCtor::Str, 659 BuiltinType::Str => TypeCtor::Str,
660 BuiltinType::Int { signedness, bitness } => { 660 BuiltinType::Int(t) => TypeCtor::Int(IntTy::from(t).into()),
661 TypeCtor::Int(IntTy { signedness, bitness }.into()) 661 BuiltinType::Float(t) => TypeCtor::Float(FloatTy::from(t).into()),
662 }
663 BuiltinType::Float { bitness } => TypeCtor::Float(FloatTy { bitness }.into()),
664 }) 662 })
665} 663}
666 664
665impl From<BuiltinInt> for IntTy {
666 fn from(t: BuiltinInt) -> Self {
667 IntTy { signedness: t.signedness, bitness: t.bitness }
668 }
669}
670
671impl From<BuiltinFloat> for FloatTy {
672 fn from(t: BuiltinFloat) -> Self {
673 FloatTy { bitness: t.bitness }
674 }
675}
676
677impl From<Option<BuiltinInt>> for UncertainIntTy {
678 fn from(t: Option<BuiltinInt>) -> Self {
679 match t {
680 None => UncertainIntTy::Unknown,
681 Some(t) => UncertainIntTy::Known(t.into()),
682 }
683 }
684}
685
686impl From<Option<BuiltinFloat>> for UncertainFloatTy {
687 fn from(t: Option<BuiltinFloat>) -> Self {
688 match t {
689 None => UncertainFloatTy::Unknown,
690 Some(t) => UncertainFloatTy::Known(t.into()),
691 }
692 }
693}
694
667fn fn_sig_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> FnSig { 695fn fn_sig_for_struct_constructor(db: &impl HirDatabase, def: Struct) -> FnSig {
668 let struct_data = db.struct_data(def.id.into()); 696 let struct_data = db.struct_data(def.id.into());
669 let fields = match struct_data.variant_data.fields() { 697 let fields = match struct_data.variant_data.fields() {
diff --git a/crates/ra_hir/src/ty/primitive.rs b/crates/ra_hir/src/ty/primitive.rs
index 1749752f1..7362de4c3 100644
--- a/crates/ra_hir/src/ty/primitive.rs
+++ b/crates/ra_hir/src/ty/primitive.rs
@@ -129,24 +129,6 @@ impl IntTy {
129 (Signedness::Unsigned, IntBitness::X128) => "u128", 129 (Signedness::Unsigned, IntBitness::X128) => "u128",
130 } 130 }
131 } 131 }
132
133 pub(crate) fn from_suffix(suffix: &str) -> Option<IntTy> {
134 match suffix {
135 "isize" => Some(IntTy::isize()),
136 "i8" => Some(IntTy::i8()),
137 "i16" => Some(IntTy::i16()),
138 "i32" => Some(IntTy::i32()),
139 "i64" => Some(IntTy::i64()),
140 "i128" => Some(IntTy::i128()),
141 "usize" => Some(IntTy::usize()),
142 "u8" => Some(IntTy::u8()),
143 "u16" => Some(IntTy::u16()),
144 "u32" => Some(IntTy::u32()),
145 "u64" => Some(IntTy::u64()),
146 "u128" => Some(IntTy::u128()),
147 _ => None,
148 }
149 }
150} 132}
151 133
152#[derive(Copy, Clone, PartialEq, Eq, Hash)] 134#[derive(Copy, Clone, PartialEq, Eq, Hash)]
@@ -181,12 +163,4 @@ impl FloatTy {
181 FloatBitness::X64 => "f64", 163 FloatBitness::X64 => "f64",
182 } 164 }
183 } 165 }
184
185 pub(crate) fn from_suffix(suffix: &str) -> Option<FloatTy> {
186 match suffix {
187 "f32" => Some(FloatTy::f32()),
188 "f64" => Some(FloatTy::f64()),
189 _ => None,
190 }
191 }
192} 166}
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index 896bf2924..8863c3608 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -222,7 +222,6 @@ mod collections {
222 222
223#[test] 223#[test]
224fn infer_while_let() { 224fn infer_while_let() {
225 covers!(infer_while_let);
226 let (db, pos) = TestDB::with_position( 225 let (db, pos) = TestDB::with_position(
227 r#" 226 r#"
228//- /main.rs 227//- /main.rs
@@ -4825,7 +4824,7 @@ fn main() {
4825 @r###" 4824 @r###"
4826 ![0; 1) '6': i32 4825 ![0; 1) '6': i32
4827 [64; 88) '{ ...!(); }': () 4826 [64; 88) '{ ...!(); }': ()
4828 [74; 75) 'x': i32 4827 [74; 75) 'x': i32
4829 "### 4828 "###
4830 ); 4829 );
4831} 4830}
diff --git a/crates/ra_hir/src/ty/traits/chalk.rs b/crates/ra_hir/src/ty/traits/chalk.rs
index 14c54b9fb..de322dd52 100644
--- a/crates/ra_hir/src/ty/traits/chalk.rs
+++ b/crates/ra_hir/src/ty/traits/chalk.rs
@@ -714,7 +714,7 @@ fn closure_fn_trait_impl_datum(
714 let fn_once_trait = get_fn_trait(db, krate, super::FnTrait::FnOnce)?; 714 let fn_once_trait = get_fn_trait(db, krate, super::FnTrait::FnOnce)?;
715 let trait_ = get_fn_trait(db, krate, data.fn_trait)?; // get corresponding fn trait 715 let trait_ = get_fn_trait(db, krate, data.fn_trait)?; // get corresponding fn trait
716 716
717 let num_args: u16 = match &db.body_hir(data.def)[data.expr] { 717 let num_args: u16 = match &db.body(data.def)[data.expr] {
718 crate::expr::Expr::Lambda { args, .. } => args.len() as u16, 718 crate::expr::Expr::Lambda { args, .. } => args.len() as u16,
719 _ => { 719 _ => {
720 log::warn!("closure for closure type {:?} not found", data); 720 log::warn!("closure for closure type {:?} not found", data);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 10:16:29 +0000