Skip to content

Commit

Permalink
update spans
Browse files Browse the repository at this point in the history
  • Loading branch information
@sezna
sezna committed Sep 13, 2024
1 parent 83c25bc commit f2787df
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 140 deletions.
6 changes: 3 additions & 3 deletions compiler/qsc_partial_eval/src/tests/calls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1256,7 +1256,7 @@ fn call_to_unresolved_callee_with_dynamic_arg_fails() {

assert_error(
&error,
&expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 298, hi: 305 }))"],
&expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 288, hi: 295 }))"],
);
}

Expand All @@ -1283,7 +1283,7 @@ fn call_to_unresolved_callee_producing_dynamic_value_fails() {

assert_error(
&error,
&expect!["UnexpectedDynamicValue(PackageSpan { package: PackageId(2), span: Span { lo: 298, hi: 305 } })"],
&expect!["UnexpectedDynamicValue(PackageSpan { package: PackageId(2), span: Span { lo: 288, hi: 295 } })"],
);
}

Expand All @@ -1309,7 +1309,7 @@ fn call_to_unresolved_callee_via_closure_with_dynamic_arg_fails() {

assert_error(
&error,
&expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 302, hi: 309 }))"],
&expect!["CapabilityError(UseOfDynamicDouble(Span { lo: 292, hi: 299 }))"],
);
}

Expand Down
16 changes: 4 additions & 12 deletions compiler/qsc_partial_eval/src/tests/returns.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,9 +898,7 @@ fn explicit_return_embedded_in_assign_field_expr_yields_error() {
"#});
assert_error(
&error,
&expect![[
r#"Unexpected("updating a field of a dynamic user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 217, hi: 243 } })"#
]],
&expect![[r#"Unexpected("updating a field of a dynamic user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 207, hi: 233 } })"#]],
);
}

Expand Down Expand Up @@ -981,9 +979,7 @@ fn explicit_return_embedded_in_call_expr_yields_error() {
"#});
assert_error(
&error,
&expect![[
r#"Unexpected("embedded return in call arguments", PackageSpan { package: PackageId(2), span: Span { lo: 174, hi: 186 } })"#
]],
&expect![[r#"Unexpected("embedded return in call arguments", PackageSpan { package: PackageId(2), span: Span { lo: 164, hi: 176 } })"#]],
);
}

Expand All @@ -1004,9 +1000,7 @@ fn explicit_return_embedded_in_if_expr_yields_error() {
"#});
assert_error(
&error,
&expect![[
r#"Unexpected("embedded return in if condition", PackageSpan { package: PackageId(2), span: Span { lo: 175, hi: 187 } })"#
]],
&expect![[r#"Unexpected("embedded return in if condition", PackageSpan { package: PackageId(2), span: Span { lo: 165, hi: 177 } })"#]],
);
}

Expand Down Expand Up @@ -1087,9 +1081,7 @@ fn explicit_return_embedded_in_update_field_expr_yields_error() {
"#});
assert_error(
&error,
&expect![[
r#"Unexpected("assigning a dynamic value to a field of a user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 211, hi: 241 } })"#
]],
&expect![[r#"Unexpected("assigning a dynamic value to a field of a user-defined type is invalid", PackageSpan { package: PackageId(2), span: Span { lo: 201, hi: 231 } })"#]],
);
}

Expand Down
80 changes: 40 additions & 40 deletions compiler/qsc_passes/src/capabilitiesck/tests_adaptive.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ fn use_of_dynamic_int_yields_error() {
[
UseOfDynamicInt(
Span {
lo: 246,
hi: 271,
lo: 226,
hi: 251,
},
),
]
Expand Down Expand Up @@ -114,14 +114,14 @@ fn use_of_dynamic_double_yields_errors() {
[
UseOfDynamicInt(
Span {
lo: 246,
hi: 284,
lo: 226,
hi: 264,
},
),
UseOfDynamicDouble(
Span {
lo: 246,
hi: 284,
lo: 226,
hi: 264,
},
),
]
Expand Down Expand Up @@ -154,14 +154,14 @@ fn use_of_dynamic_big_int_yields_errors() {
[
UseOfDynamicInt(
Span {
lo: 247,
hi: 285,
lo: 227,
hi: 265,
},
),
UseOfDynamicBigInt(
Span {
lo: 247,
hi: 285,
lo: 227,
hi: 265,
},
),
]
Expand Down Expand Up @@ -217,20 +217,20 @@ fn use_of_dynamic_udt_yields_errors() {
[
UseOfDynamicInt(
Span {
lo: 283,
hi: 335,
lo: 253,
hi: 305,
},
),
UseOfDynamicDouble(
Span {
lo: 283,
hi: 335,
lo: 253,
hi: 305,
},
),
UseOfDynamicUdt(
Span {
lo: 283,
hi: 335,
lo: 253,
hi: 305,
},
),
]
Expand All @@ -246,8 +246,8 @@ fn use_of_dynamic_function_yields_errors() {
[
UseOfDynamicArrowFunction(
Span {
lo: 142,
hi: 166,
lo: 132,
hi: 156,
},
),
]
Expand All @@ -263,8 +263,8 @@ fn use_of_dynamic_operation_yields_errors() {
[
UseOfDynamicArrowOperation(
Span {
lo: 142,
hi: 162,
lo: 132,
hi: 152,
},
),
]
Expand Down Expand Up @@ -371,26 +371,26 @@ fn call_to_dynamic_function_yields_errors() {
[
UseOfDynamicArrowFunction(
Span {
lo: 142,
hi: 166,
lo: 132,
hi: 156,
},
),
UseOfDynamicDouble(
Span {
lo: 180,
hi: 188,
lo: 170,
hi: 178,
},
),
UseOfDynamicArrowFunction(
Span {
lo: 180,
hi: 188,
lo: 170,
hi: 178,
},
),
CallToDynamicCallee(
Span {
lo: 180,
hi: 188,
lo: 170,
hi: 178,
},
),
]
Expand All @@ -406,20 +406,20 @@ fn call_to_dynamic_operation_yields_errors() {
[
UseOfDynamicArrowOperation(
Span {
lo: 142,
hi: 162,
lo: 132,
hi: 152,
},
),
UseOfDynamicArrowOperation(
Span {
lo: 176,
hi: 181,
lo: 166,
hi: 171,
},
),
CallToDynamicCallee(
Span {
lo: 176,
hi: 181,
lo: 166,
hi: 171,
},
),
]
Expand Down Expand Up @@ -455,20 +455,20 @@ fn use_of_dynamic_index_yields_errors() {
[
UseOfDynamicInt(
Span {
lo: 246,
hi: 271,
lo: 226,
hi: 251,
},
),
UseOfDynamicInt(
Span {
lo: 319,
hi: 323,
lo: 299,
hi: 303,
},
),
UseOfDynamicIndex(
Span {
lo: 319,
hi: 323,
lo: 299,
hi: 303,
},
),
]
Expand Down
56 changes: 28 additions & 28 deletions compiler/qsc_passes/src/capabilitiesck/tests_adaptive_plus_integers.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ fn use_of_dynamic_double_yields_error() {
[
UseOfDynamicDouble(
Span {
lo: 246,
hi: 284,
lo: 226,
hi: 264,
},
),
]
Expand Down Expand Up @@ -145,8 +145,8 @@ fn use_of_dynamic_big_int_yields_errors() {
[
UseOfDynamicBigInt(
Span {
lo: 247,
hi: 285,
lo: 227,
hi: 265,
},
),
]
Expand Down Expand Up @@ -196,14 +196,14 @@ fn use_of_dynamic_udt_yields_errors() {
[
UseOfDynamicDouble(
Span {
lo: 283,
hi: 335,
lo: 253,
hi: 305,
},
),
UseOfDynamicUdt(
Span {
lo: 283,
hi: 335,
lo: 253,
hi: 305,
},
),
]
Expand All @@ -219,8 +219,8 @@ fn use_of_dynamic_function_yields_errors() {
[
UseOfDynamicArrowFunction(
Span {
lo: 142,
hi: 166,
lo: 132,
hi: 156,
},
),
]
Expand All @@ -236,8 +236,8 @@ fn use_of_dynamic_operation_yields_errors() {
[
UseOfDynamicArrowOperation(
Span {
lo: 142,
hi: 162,
lo: 132,
hi: 152,
},
),
]
Expand Down Expand Up @@ -326,26 +326,26 @@ fn call_to_dynamic_function_yields_errors() {
[
UseOfDynamicArrowFunction(
Span {
lo: 142,
hi: 166,
lo: 132,
hi: 156,
},
),
UseOfDynamicDouble(
Span {
lo: 180,
hi: 188,
lo: 170,
hi: 178,
},
),
UseOfDynamicArrowFunction(
Span {
lo: 180,
hi: 188,
lo: 170,
hi: 178,
},
),
CallToDynamicCallee(
Span {
lo: 180,
hi: 188,
lo: 170,
hi: 178,
},
),
]
Expand All @@ -361,20 +361,20 @@ fn call_to_dynamic_operation_yields_errors() {
[
UseOfDynamicArrowOperation(
Span {
lo: 142,
hi: 162,
lo: 132,
hi: 152,
},
),
UseOfDynamicArrowOperation(
Span {
lo: 176,
hi: 181,
lo: 166,
hi: 171,
},
),
CallToDynamicCallee(
Span {
lo: 176,
hi: 181,
lo: 166,
hi: 171,
},
),
]
Expand Down Expand Up @@ -410,8 +410,8 @@ fn use_of_dynamic_index_yields_errors() {
[
UseOfDynamicIndex(
Span {
lo: 319,
hi: 323,
lo: 299,
hi: 303,
},
),
]
Expand Down
Loading

0 comments on commit f2787df

Please sign in to comment.