Commit 2fd0725
committed
Remove IfElse.jl dependency; use Base.ifelse
IfElse.jl's `ifelse` is `const ifelse = Base.ifelse` on modern Julia (0.1.1),
so the dependency is redundant: Symbolics registers a symbolic method on
`Base.ifelse`, so `ifelse(sym_cond, a, b)` traces to a symbolic expression
without IfElse. Removing IfElse also unblocks the strict Downgrade lane, which
previously could resolve IfElse 0.1.0 (whose greedy `ifelse(args...) =
Core.ifelse(args...)` broke symbolic conditions).
- Replace `IfElse.ifelse(...)` call sites with bare `ifelse(...)`.
- Drop every `using IfElse` / `import IfElse` line.
- Remove IfElse from [deps] and [compat].
- In Blocks, the removed `import IfElse: ifelse` had brought `ifelse` into
scope so the `Parameter` overloads in sources.jl extended it. Replace with
`import Base: ifelse` so those overloads extend `Base.ifelse` instead of
creating a new `Blocks.ifelse` binding that would shadow the symbolic method.
- Drop the now-stale Downgrade.yml comment referencing the fntype regression.
Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com>1 parent 776d7c7 commit 2fd0725
12 files changed
Lines changed: 5 additions & 15 deletions
File tree
- .github/workflows
- src
- Blocks
- Electrical
- Digital
- Hydraulic/IsothermalCompressible
- Mechanical
- MultiBody2D
- Rotational
- TranslationalModelica
- TranslationalPosition
- Thermal
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
| 15 | + | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
| |||
20 | 19 | | |
21 | 20 | | |
22 | 21 | | |
23 | | - | |
24 | 22 | | |
25 | 23 | | |
26 | 24 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
87 | | - | |
| 87 | + | |
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
| 108 | + | |
109 | 109 | | |
110 | | - | |
| 110 | + | |
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| |||
Lines changed: 0 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | | - | |
16 | 14 | | |
17 | 15 | | |
18 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | 3 | | |
5 | 4 | | |
6 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
7 | 6 | | |
8 | 7 | | |
9 | 8 | | |
| |||
0 commit comments