Commit 4b0add2
committed
Replace narrow_for_display workaround with _FmtRange subclass
nab-resolver's error reporter renders constraints via two code paths:
_narrow_positive (which calls narrow_for_display) and direct interpolation
of Incompatibility.constraint_range in the CONSTRAINT-cause path. The
previous narrow_for_display approach only covered the first path, leaving
CONSTRAINT-cause lines with raw (-inf, X) sentinel notation.
_FmtRange overrides __str__ to produce operator-prefixed output and
overrides all Range operators to preserve the subclass through
composition. _constraint_to_range now returns _FmtRange, so every range
we construct formats itself at every render site. narrow_for_display
becomes a one-line fallback that wraps any library-internal Range the
resolver might surface directly.1 parent 8996fef commit 4b0add2
3 files changed
Lines changed: 14 additions & 21 deletions
File tree
- testing/baselines
- tests.builtin-spicy-version-error
- tests.unsatisfied-version-tag-dependency
- zeekpkg
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
74 | 75 | | |
75 | 76 | | |
76 | 77 | | |
77 | | - | |
| 78 | + | |
78 | 79 | | |
79 | 80 | | |
80 | | - | |
81 | | - | |
| 81 | + | |
| 82 | + | |
82 | 83 | | |
83 | 84 | | |
84 | 85 | | |
85 | 86 | | |
86 | 87 | | |
87 | | - | |
| 88 | + | |
88 | 89 | | |
89 | | - | |
| 90 | + | |
90 | 91 | | |
91 | | - | |
| 92 | + | |
92 | 93 | | |
93 | | - | |
| 94 | + | |
94 | 95 | | |
95 | | - | |
| 96 | + | |
96 | 97 | | |
97 | 98 | | |
98 | 99 | | |
| |||
349 | 350 | | |
350 | 351 | | |
351 | 352 | | |
352 | | - | |
353 | | - | |
354 | | - | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
| 353 | + | |
361 | 354 | | |
362 | 355 | | |
363 | 356 | | |
| |||
0 commit comments