Skip to content

Commit 76d79f7

Browse files
muglugmuglug
committed
Simplify getting codebase/interner
1 parent cd9b465 commit 76d79f7

File tree

64 files changed

+451
-501
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+451
-501
lines changed

‎src/analyzer/algebra_analyzer.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub(crate) fn check_for_paradox(
5050
})
5151
})
5252
{
53-
let clause_string = formula_2_clause.to_string(statements_analyzer.get_interner());
53+
let clause_string = formula_2_clause.to_string(statements_analyzer.interner);
5454

5555
analysis_data.maybe_add_issue(
5656
Issue::new(
@@ -116,7 +116,7 @@ pub(crate) fn check_for_paradox(
116116
paradox_message += "(";
117117
paradox_message += mini_formula_2
118118
.iter()
119-
.map(|c| c.to_string(statements_analyzer.get_interner()))
119+
.map(|c| c.to_string(statements_analyzer.interner))
120120
.collect::<Vec<String>>()
121121
.join(") && (")
122122
.as_str();
@@ -125,19 +125,19 @@ pub(crate) fn check_for_paradox(
125125
paradox_message += mini_formula_2
126126
.first()
127127
.unwrap()
128-
.to_string(statements_analyzer.get_interner())
128+
.to_string(statements_analyzer.interner)
129129
.as_str();
130130
}
131131
} else {
132132
paradox_message += "Condition not (";
133133
paradox_message += negated_clause_2
134-
.to_string(statements_analyzer.get_interner())
134+
.to_string(statements_analyzer.interner)
135135
.as_str();
136136
}
137137

138138
paradox_message += ") contradicts a previously-established condition (";
139139
paradox_message += clause_1
140-
.to_string(statements_analyzer.get_interner())
140+
.to_string(statements_analyzer.interner)
141141
.as_str();
142142
paradox_message += ")";
143143

‎src/analyzer/classlike_analyzer.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl<'a> ClassLikeAnalyzer<'a> {
4141
));
4242
};
4343

44-
let codebase = self.file_analyzer.get_codebase();
44+
let codebase = self.file_analyzer.codebase;
4545

4646
if self.file_analyzer.analysis_config.ast_diff
4747
&& self.file_analyzer.codebase.safe_symbols.contains(&name)
@@ -244,8 +244,8 @@ fn emit_dupe_enum_case_issue(
244244
IssueKind::DuplicateEnumValue,
245245
format!(
246246
"Duplicate enum value for {}, previously defined by case {}",
247-
statements_analyzer.get_interner().lookup(&enum_name),
248-
statements_analyzer.get_interner().lookup(existing_name)
247+
statements_analyzer.interner.lookup(&enum_name),
248+
statements_analyzer.interner.lookup(existing_name)
249249
),
250250
statements_analyzer.get_hpos(expr.pos()),
251251
&Some(FunctionLikeIdentifier::Function(enum_name)),

‎src/analyzer/def_analyzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub(crate) fn analyze(
2626
if statements_analyzer.get_config().in_codegen
2727
&& !statements_analyzer.get_config().hooks.iter().any(|hook| {
2828
hook.can_codegen_def(
29-
statements_analyzer.get_interner(),
30-
statements_analyzer.get_codebase(),
29+
statements_analyzer.interner,
30+
statements_analyzer.codebase,
3131
statements_analyzer.get_file_analyzer().resolved_names,
3232
def,
3333
)

‎src/analyzer/expr/as_analyzer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ pub(crate) fn analyze<'expr>(
134134
.unwrap_or(get_mixed_any());
135135

136136
if ternary_type.is_mixed() {
137-
let codebase = statements_analyzer.get_codebase();
137+
let codebase = statements_analyzer.codebase;
138138
let mut hint_type = get_type_from_hint(
139139
&hint.1,
140140
context.function_context.calling_class.as_ref(),
@@ -159,7 +159,7 @@ pub(crate) fn analyze<'expr>(
159159
);
160160
type_expander::expand_union(
161161
codebase,
162-
&Some(statements_analyzer.get_interner()),
162+
&Some(statements_analyzer.interner),
163163
&mut hint_type,
164164
&TypeExpansionOptions {
165165
self_class: context.function_context.calling_class.as_ref(),

‎src/analyzer/expr/assignment/array_assignment_analyzer.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ pub(crate) fn analyze(
7272
context.function_context.calling_class.as_ref(),
7373
statements_analyzer.get_file_analyzer().resolved_names,
7474
Some((
75-
statements_analyzer.get_codebase(),
76-
statements_analyzer.get_interner(),
75+
statements_analyzer.codebase,
76+
statements_analyzer.interner,
7777
)),
7878
);
7979

@@ -91,7 +91,7 @@ pub(crate) fn analyze(
9191
if analysis_data.data_flow_graph.kind == GraphKind::FunctionBody {
9292
if let Some(root_var_id) = &root_var_id {
9393
if let aast::Expr_::Lvar(_) = &root_array_expr.2 {
94-
let interner = statements_analyzer.get_interner();
94+
let interner = statements_analyzer.interner;
9595
analysis_data
9696
.data_flow_graph
9797
.add_node(DataFlowNode::get_for_variable_source(
@@ -186,7 +186,7 @@ pub(crate) fn update_type_with_key_values(
186186
key_type: Option<Rc<TUnion>>,
187187
) -> TUnion {
188188
let mut has_matching_item = false;
189-
let codebase = statements_analyzer.get_codebase();
189+
let codebase = statements_analyzer.codebase;
190190

191191
new_type.types = new_type
192192
.types
@@ -390,7 +390,7 @@ fn add_array_assignment_dataflow(
390390
}
391391

392392
let parent_node = if let Some(var_var_id) = var_var_id {
393-
if let Some(var_id) = statements_analyzer.get_interner().get(&var_var_id) {
393+
if let Some(var_id) = statements_analyzer.interner.get(&var_var_id) {
394394
DataFlowNode::get_for_lvar(VarId(var_id), statements_analyzer.get_hpos(expr_var_pos))
395395
} else {
396396
DataFlowNode::get_for_array_assignment(statements_analyzer.get_hpos(expr_var_pos))
@@ -446,7 +446,7 @@ fn add_array_assignment_dataflow(
446446
..
447447
} => {
448448
if let Some(literal_value) = statements_analyzer
449-
.get_codebase()
449+
.codebase
450450
.get_classconst_literal_value(enum_name, member_name)
451451
{
452452
if let Some(value) = literal_value.get_literal_string_value() {
@@ -499,7 +499,7 @@ fn update_array_assignment_child_type(
499499
value_type: TUnion,
500500
root_type: TUnion,
501501
) -> TUnion {
502-
let codebase = statements_analyzer.get_codebase();
502+
let codebase = statements_analyzer.codebase;
503503
let mut collection_types = Vec::new();
504504

505505
if let Some(key_type) = &key_type {
@@ -694,8 +694,8 @@ pub(crate) fn analyze_nested_array_assignment<'a>(
694694
if let Some(dim_id) = expression_identifier::get_dim_id(
695695
dim,
696696
Some((
697-
statements_analyzer.get_codebase(),
698-
statements_analyzer.get_interner(),
697+
statements_analyzer.codebase,
698+
statements_analyzer.interner,
699699
)),
700700
statements_analyzer.get_file_analyzer().resolved_names,
701701
) {
@@ -705,8 +705,8 @@ pub(crate) fn analyze_nested_array_assignment<'a>(
705705
context.function_context.calling_class.as_ref(),
706706
statements_analyzer.get_file_analyzer().resolved_names,
707707
Some((
708-
statements_analyzer.get_codebase(),
709-
statements_analyzer.get_interner(),
708+
statements_analyzer.codebase,
709+
statements_analyzer.interner,
710710
)),
711711
) {
712712
format!("[{}]", dim_id)
@@ -786,8 +786,8 @@ pub(crate) fn analyze_nested_array_assignment<'a>(
786786
context.function_context.calling_class.as_ref(),
787787
statements_analyzer.get_file_analyzer().resolved_names,
788788
Some((
789-
statements_analyzer.get_codebase(),
790-
statements_analyzer.get_interner(),
789+
statements_analyzer.codebase,
790+
statements_analyzer.interner,
791791
)),
792792
),
793793
&array_expr_offset_atomic_types,
@@ -877,8 +877,8 @@ pub(crate) fn analyze_nested_array_assignment<'a>(
877877
context.function_context.calling_class.as_ref(),
878878
statements_analyzer.get_file_analyzer().resolved_names,
879879
Some((
880-
statements_analyzer.get_codebase(),
881-
statements_analyzer.get_interner(),
880+
statements_analyzer.codebase,
881+
statements_analyzer.interner,
882882
)),
883883
) {
884884
parent_array_var_id = Some(var_var_id.clone());

‎src/analyzer/expr/assignment/instance_property_assignment_analyzer.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub(crate) fn analyze(
4444
analysis_data: &mut FunctionAnalysisData,
4545
context: &mut BlockContext,
4646
) -> Result<(), AnalysisError> {
47-
let codebase = statements_analyzer.get_codebase();
47+
let codebase = statements_analyzer.codebase;
4848
let stmt_var = expr.0;
4949

5050
// TODO if ($stmt instanceof PropertyProperty) {
@@ -111,8 +111,8 @@ pub(crate) fn analyze(
111111
IssueKind::UpcastAwaitable,
112112
format!(
113113
"{} contains Awaitable but was passed into a more general type {}",
114-
assignment_type.get_id(Some(statements_analyzer.get_interner())),
115-
class_property_type.get_id(Some(statements_analyzer.get_interner())),
114+
assignment_type.get_id(Some(statements_analyzer.interner)),
115+
class_property_type.get_id(Some(statements_analyzer.interner)),
116116
),
117117
statements_analyzer.get_hpos(&stmt_var.1),
118118
&context.function_context.calling_functionlike_id,
@@ -134,8 +134,8 @@ pub(crate) fn analyze(
134134
"{} expects {}, parent type {} provided",
135135
var_id.clone().unwrap_or("var".to_string()),
136136
class_property_type
137-
.get_id(Some(statements_analyzer.get_interner())),
138-
assignment_type.get_id(Some(statements_analyzer.get_interner())),
137+
.get_id(Some(statements_analyzer.interner)),
138+
assignment_type.get_id(Some(statements_analyzer.interner)),
139139
),
140140
statements_analyzer.get_hpos(&stmt_var.1),
141141
&context.function_context.calling_functionlike_id,
@@ -151,8 +151,8 @@ pub(crate) fn analyze(
151151
"{} expects {}, parent type {} provided",
152152
var_id.clone().unwrap_or("var".to_string()),
153153
class_property_type
154-
.get_id(Some(statements_analyzer.get_interner())),
155-
assignment_type.get_id(Some(statements_analyzer.get_interner())),
154+
.get_id(Some(statements_analyzer.interner)),
155+
assignment_type.get_id(Some(statements_analyzer.interner)),
156156
),
157157
statements_analyzer.get_hpos(&stmt_var.1),
158158
&context.function_context.calling_functionlike_id,
@@ -177,7 +177,7 @@ pub(crate) fn analyze(
177177
// }
178178
invalid_assignment_value_types.insert(
179179
&assigned_property.1 .1,
180-
class_property_type.get_id(Some(statements_analyzer.get_interner())),
180+
class_property_type.get_id(Some(statements_analyzer.interner)),
181181
);
182182
} else {
183183
// has_valid_assignment_value_type = true;
@@ -192,9 +192,9 @@ pub(crate) fn analyze(
192192
IssueKind::InvalidPropertyAssignmentValue,
193193
format!(
194194
"Property ${} with declared type {}, cannot be assigned type {}",
195-
statements_analyzer.get_interner().lookup(property_id),
195+
statements_analyzer.interner.lookup(property_id),
196196
invalid_class_property_type,
197-
assignment_type.get_id(Some(statements_analyzer.get_interner())),
197+
assignment_type.get_id(Some(statements_analyzer.interner)),
198198
),
199199
statements_analyzer.get_hpos(&stmt_var.1),
200200
&context.function_context.calling_functionlike_id,
@@ -222,7 +222,7 @@ pub(crate) fn analyze_regular_assignment(
222222

223223
let mut assigned_properties = Vec::new();
224224
let mut context_type = None;
225-
let codebase = statements_analyzer.get_codebase();
225+
let codebase = statements_analyzer.codebase;
226226

227227
let was_inside_general_use = context.inside_general_use;
228228
context.inside_general_use = true;
@@ -247,8 +247,8 @@ pub(crate) fn analyze_regular_assignment(
247247
context.function_context.calling_class.as_ref(),
248248
statements_analyzer.get_file_analyzer().resolved_names,
249249
Some((
250-
statements_analyzer.get_codebase(),
251-
statements_analyzer.get_interner(),
250+
statements_analyzer.codebase,
251+
statements_analyzer.interner,
252252
)),
253253
);
254254

@@ -369,7 +369,7 @@ pub(crate) fn analyze_atomic_assignment(
369369
context: &mut BlockContext,
370370
is_lhs_reference_free: bool,
371371
) -> Option<(TUnion, (StrId, StrId), TUnion)> {
372-
let codebase = statements_analyzer.get_codebase();
372+
let codebase = statements_analyzer.codebase;
373373
let fq_class_name = match lhs_type_part {
374374
TAtomic::TNamedObject { name, .. } => *name,
375375
TAtomic::TReference { name, .. } => {
@@ -378,7 +378,7 @@ pub(crate) fn analyze_atomic_assignment(
378378
IssueKind::NonExistentClass,
379379
format!(
380380
"Undefined class {}",
381-
statements_analyzer.get_interner().lookup(name)
381+
statements_analyzer.interner.lookup(name)
382382
),
383383
statements_analyzer.get_hpos(expr.1.pos()),
384384
&context.function_context.calling_functionlike_id,
@@ -399,15 +399,15 @@ pub(crate) fn analyze_atomic_assignment(
399399
};
400400

401401
let prop_name = if let aast::Expr_::Id(id) = &expr.1 .2 {
402-
if let Some(prop_name) = statements_analyzer.get_interner().get(&id.1) {
402+
if let Some(prop_name) = statements_analyzer.interner.get(&id.1) {
403403
prop_name
404404
} else {
405405
analysis_data.maybe_add_issue(
406406
Issue::new(
407407
IssueKind::NonExistentProperty,
408408
format!(
409409
"Undefined property {}::${}",
410-
statements_analyzer.get_interner().lookup(&fq_class_name),
410+
statements_analyzer.interner.lookup(&fq_class_name),
411411
&id.1
412412
),
413413
statements_analyzer.get_hpos(expr.1.pos()),
@@ -439,8 +439,8 @@ pub(crate) fn analyze_atomic_assignment(
439439
None,
440440
statements_analyzer.get_file_analyzer().resolved_names,
441441
Some((
442-
statements_analyzer.get_codebase(),
443-
statements_analyzer.get_interner(),
442+
statements_analyzer.codebase,
443+
statements_analyzer.interner,
444444
)),
445445
);
446446

@@ -505,8 +505,8 @@ pub(crate) fn analyze_atomic_assignment(
505505
IssueKind::ImmutablePropertyWrite,
506506
format!(
507507
"Property {}::${} is defined on an immutable class",
508-
statements_analyzer.get_interner().lookup(&property_id.0),
509-
statements_analyzer.get_interner().lookup(&property_id.1),
508+
statements_analyzer.interner.lookup(&property_id.0),
509+
statements_analyzer.interner.lookup(&property_id.1),
510510
),
511511
statements_analyzer.get_hpos(expr.1.pos()),
512512
&context.function_context.calling_functionlike_id,
@@ -543,7 +543,7 @@ pub(crate) fn analyze_atomic_assignment(
543543
if !class_property_type.is_mixed() {
544544
type_expander::expand_union(
545545
codebase,
546-
&Some(statements_analyzer.get_interner()),
546+
&Some(statements_analyzer.interner),
547547
&mut class_property_type,
548548
&TypeExpansionOptions {
549549
self_class: Some(&declaring_classlike_storage.name),
@@ -576,8 +576,8 @@ pub(crate) fn analyze_atomic_assignment(
576576
IssueKind::NonExistentProperty,
577577
format!(
578578
"Undefined property {}::${}",
579-
statements_analyzer.get_interner().lookup(&property_id.0),
580-
statements_analyzer.get_interner().lookup(&property_id.1),
579+
statements_analyzer.interner.lookup(&property_id.0),
580+
statements_analyzer.interner.lookup(&property_id.1),
581581
),
582582
statements_analyzer.get_hpos(expr.1.pos()),
583583
&context.function_context.calling_functionlike_id,
@@ -602,7 +602,7 @@ fn add_instance_property_dataflow(
602602
fq_class_name: &StrId,
603603
property_id: &(StrId, StrId),
604604
) {
605-
let codebase = statements_analyzer.get_codebase();
605+
let codebase = statements_analyzer.codebase;
606606

607607
if let Some(classlike_storage) = codebase.classlike_infos.get(fq_class_name) {
608608
if classlike_storage.specialize_instance {

0 commit comments

Comments
 (0)