Skip to content

Commit 09d4c13

Browse files
CppCXYCppCXY
committed
basic work for name_expr
1 parent 1ee6431 commit 09d4c13

7 files changed

Lines changed: 258 additions & 45 deletions

File tree

‎crates/emmylua_code_analysis/src/compilation/analyzer/flow/bind_analyze/stats.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ pub fn bind_return_stat(
156156
let return_flow_id = binder.create_return();
157157
binder.add_antecedent(return_flow_id, current);
158158

159-
current
159+
return_flow_id
160160
}
161161

162162
pub fn bind_do_stat(binder: &mut FlowBinder, do_stat: LuaDoStat, mut current: FlowId) -> FlowId {
@@ -300,7 +300,7 @@ pub fn bind_if_stat(binder: &mut FlowBinder, if_stat: LuaIfStat, current: FlowId
300300
}
301301
}
302302

303-
finish_flow_label(binder, post_if_label, current)
303+
finish_flow_label(binder, post_if_label, else_label)
304304
}
305305

306306
pub fn bind_func_stat(binder: &mut FlowBinder, func_stat: LuaFuncStat, current: FlowId) -> FlowId {

‎crates/emmylua_code_analysis/src/semantic/infer/infer_index.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use std::collections::HashSet;
22

3-
use emmylua_parser::{
4-
LuaAstNode, LuaExpr, LuaIndexExpr, LuaIndexKey, LuaIndexMemberExpr, PathTrait,
5-
};
3+
use emmylua_parser::{LuaExpr, LuaIndexExpr, LuaIndexKey, LuaIndexMemberExpr};
64
use rowan::TextRange;
75
use smol_str::SmolStr;
86

@@ -18,8 +16,7 @@ use crate::{
1816
type_check::{self, check_type_compact},
1917
InferGuard,
2018
},
21-
InFiled, LuaClosureId, LuaInferCache, LuaInstanceType, LuaMemberOwner, LuaOperatorOwner,
22-
TypeOps,
19+
InFiled, LuaInferCache, LuaInstanceType, LuaMemberOwner, LuaOperatorOwner, TypeOps,
2320
};
2421

2522
use super::{infer_expr, infer_name::infer_global_type, InferFailReason, InferResult};

‎crates/emmylua_code_analysis/src/semantic/infer/infer_name/narrow/condition_flow/binary_flow.rs‎

Lines changed: 102 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
use emmylua_parser::{
22
BinaryOperator, LuaAstNode, LuaBinaryExpr, LuaCallExpr, LuaChunk, LuaExpr, LuaLiteralToken,
3-
LuaNameExpr,
43
};
54

65
use crate::{
6+
infer_expr,
77
semantic::infer::infer_name::narrow::{
8-
condition_flow::InferConditionFlow, get_single_antecedent,
9-
get_type_at_flow::get_type_at_flow, ResultTypeOrContinue,
8+
condition_flow::{call_flow::get_type_at_call_expr, InferConditionFlow},
9+
get_single_antecedent,
10+
get_type_at_flow::get_type_at_flow,
11+
ResultTypeOrContinue,
1012
},
1113
DbIndex, FlowNode, FlowTree, InferFailReason, LuaDeclId, LuaInferCache, LuaType, TypeOps,
1214
};
@@ -44,13 +46,25 @@ pub fn get_type_at_binary_expr(
4446
root,
4547
decl_id,
4648
flow_node,
47-
left_expr,
48-
right_expr,
49+
left_expr.clone(),
50+
right_expr.clone(),
4951
condition_flow,
5052
)?;
5153
if let ResultTypeOrContinue::Result(result_type) = result_type {
5254
return Ok(ResultTypeOrContinue::Result(result_type));
5355
}
56+
57+
return maybe_var_eq_narrow(
58+
db,
59+
tree,
60+
cache,
61+
root,
62+
decl_id,
63+
flow_node,
64+
left_expr,
65+
right_expr,
66+
condition_flow,
67+
);
5468
}
5569
BinaryOperator::OpNe => {
5670
let result_type = maybe_type_guard_bianry(
@@ -60,13 +74,25 @@ pub fn get_type_at_binary_expr(
6074
root,
6175
decl_id,
6276
flow_node,
63-
left_expr,
64-
right_expr,
77+
left_expr.clone(),
78+
right_expr.clone(),
6579
condition_flow.get_negated(),
6680
)?;
6781
if let ResultTypeOrContinue::Result(result_type) = result_type {
6882
return Ok(ResultTypeOrContinue::Result(result_type));
6983
}
84+
85+
return maybe_var_eq_narrow(
86+
db,
87+
tree,
88+
cache,
89+
root,
90+
decl_id,
91+
flow_node,
92+
left_expr,
93+
right_expr,
94+
condition_flow.get_negated(),
95+
);
7096
}
7197
_ => {}
7298
}
@@ -169,7 +195,7 @@ fn maybe_type_guard_bianry(
169195
Ok(ResultTypeOrContinue::Result(result_type))
170196
}
171197

172-
fn maybe_var_eq(
198+
fn maybe_var_eq_narrow(
173199
db: &DbIndex,
174200
tree: &FlowTree,
175201
cache: &mut LuaInferCache,
@@ -178,6 +204,74 @@ fn maybe_var_eq(
178204
flow_node: &FlowNode,
179205
left_expr: LuaExpr,
180206
right_expr: LuaExpr,
207+
condition_flow: InferConditionFlow,
181208
) -> Result<ResultTypeOrContinue, InferFailReason> {
209+
// only check left as need narrow
210+
match left_expr {
211+
LuaExpr::NameExpr(left_name_expr) => {
212+
let Some(maybe_ref_id) = db
213+
.get_reference_index()
214+
.get_var_reference_decl(&cache.get_file_id(), left_name_expr.get_range())
215+
else {
216+
return Ok(ResultTypeOrContinue::Continue);
217+
};
218+
219+
if maybe_ref_id != decl_id {
220+
// If the reference declaration ID does not match, we cannot narrow it
221+
return Ok(ResultTypeOrContinue::Continue);
222+
}
223+
224+
let right_expr_type = infer_expr(db, cache, right_expr)?;
225+
let antecedent_flow_id = get_single_antecedent(tree, flow_node)?;
226+
let antecedent_type =
227+
get_type_at_flow(db, tree, cache, root, maybe_ref_id, antecedent_flow_id)?;
228+
229+
let result_type = match condition_flow {
230+
InferConditionFlow::TrueCondition => {
231+
TypeOps::Narrow.apply(db, &antecedent_type, &right_expr_type)
232+
}
233+
InferConditionFlow::FalseCondition => {
234+
TypeOps::Remove.apply(db, &antecedent_type, &right_expr_type)
235+
}
236+
};
237+
return Ok(ResultTypeOrContinue::Result(result_type));
238+
}
239+
LuaExpr::CallExpr(left_call_expr) => {
240+
match right_expr {
241+
LuaExpr::LiteralExpr(literal_expr) => match literal_expr.get_literal() {
242+
Some(LuaLiteralToken::Bool(b)) => {
243+
let flow = if b.is_true() {
244+
condition_flow
245+
} else {
246+
condition_flow.get_negated()
247+
};
248+
249+
return get_type_at_call_expr(
250+
db,
251+
tree,
252+
cache,
253+
root,
254+
decl_id,
255+
flow_node,
256+
left_call_expr,
257+
flow,
258+
);
259+
}
260+
_ => return Ok(ResultTypeOrContinue::Continue),
261+
},
262+
_ => {}
263+
};
264+
265+
return Ok(ResultTypeOrContinue::Continue);
266+
}
267+
LuaExpr::IndexExpr(_) => {
268+
// todo
269+
}
270+
_ => {
271+
// If the left expression is not a name or call expression, we cannot narrow it
272+
return Ok(ResultTypeOrContinue::Continue);
273+
}
274+
}
275+
182276
Ok(ResultTypeOrContinue::Continue)
183277
}

‎crates/emmylua_code_analysis/src/semantic/infer/infer_name/narrow/condition_flow/call_flow.rs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
use emmylua_parser::{LuaCallExpr, LuaChunk};
22

33
use crate::{
4-
semantic::infer::infer_name::narrow::{condition_flow::InferConditionFlow, ResultTypeOrContinue}, DbIndex, FlowNode, FlowTree,
5-
InferFailReason, LuaDeclId, LuaInferCache,
4+
semantic::infer::infer_name::narrow::{
5+
condition_flow::InferConditionFlow, ResultTypeOrContinue,
6+
},
7+
DbIndex, FlowNode, FlowTree, InferFailReason, LuaDeclId, LuaInferCache,
68
};
79

810
#[allow(unused)]
@@ -14,16 +16,15 @@ pub fn get_type_at_call_expr(
1416
decl_id: LuaDeclId,
1517
flow_node: &FlowNode,
1618
call_expr: LuaCallExpr,
17-
condition_flow: InferConditionFlow
19+
condition_flow: InferConditionFlow,
1820
) -> Result<ResultTypeOrContinue, InferFailReason> {
1921
// let Some(call_prefix) = call_expr.get_prefix_expr() else {
2022
// return Ok(ResultTypeOrContinue::Continue);
2123
// };
2224

23-
2425
Ok(ResultTypeOrContinue::Continue)
2526
}
2627

2728
// pub fn get_type_cast_call(call_prefix: LuaExpr) {
28-
// let
29-
// }
29+
// let
30+
// }

0 commit comments

Comments
 (0)