Skip to content

Commit f755c3f

Browse files
KristofferCKristofferC
authored
fix mixup between f and fr (#103)
1 parent 4c368d8 commit f755c3f

File tree

4 files changed

+47
-47
lines changed

4 files changed

+47
-47
lines changed

‎src/commands.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function execute_command(state::DebuggerState, ::Union{Val{:f}, Val{:fr}}, cmd)
102102
return false
103103
end
104104

105-
if subcmds[1] == "f"
105+
if subcmds[1] == "fr"
106106
print_frame(Base.pipe_writer(state.terminal), new_level, state.frame)
107107
return false
108108
else

‎test/stepping.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ f1(x) = x
214214
frame = @make_frame f2(1)
215215
state = dummy_state(frame)
216216
execute_command(state, Val{:s}(), "s")
217-
execute_command(state, Val{:fr}(), "fr 2")
217+
execute_command(state, Val{:fr}(), "f 2")
218218
@test execute_command(state, Val{:s}(), "s") == false
219219
@test execute_command(state, Val{:n}(), "n") == false
220220
@test execute_command(state, Val{:so}(), "so") == false

‎test/ui.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ end
6969
run_terminal_test(@make_frame(my_gcd(10, 20)),
7070
["n\n","`", "my_gc\t\n", "a\n", UP_ARROW, UP_ARROW, UP_ARROW, CTRL_C,
7171
"w add a\n", "w add sin(a)\n", "w add b\n", "w\n", "w rm 1\n", "w\n",
72-
"s\n", "f 1\n", "f 2\n", "fr 2\n", "fr 1\n",
72+
"s\n", "fr 1\n", "fr 2\n", "f 2\n", "f 1\n",
7373
"bt\n", "st\n", "c\n", "c\n"],
7474
"ui/history_gcd.multiout")
7575

‎test/ui/history_gcd.multiout

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@
965965
| 407 rem(x::T, y::T) where {T<:Real} = no_op_err("rem", T)
966966
|
967967
|About to run: (===)(20, 0)
968-
|1|debug> f 1
968+
|1|debug> fr 1
969969
|[1] ==(x, y) at promotion.jl:403
970970
| | x::Int64 = 20
971971
| | y::Int64 = 0
@@ -1020,7 +1020,7 @@
10201020
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
10211021
|
10221022
|AAAAAAAAAAAAAAAAAAAAAAAAAA
1023-
|CCCCCCCCCAAA
1023+
|CCCCCCCCCAAAA
10241024
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
10251025
|AAAAAAAAAAAAAAAAA
10261026
|AAAAAAAAAAAAAAAA
@@ -1075,12 +1075,12 @@
10751075
| 407 rem(x::T, y::T) where {T<:Real} = no_op_err("rem", T)
10761076
|
10771077
|About to run: (===)(20, 0)
1078-
|1|debug> f 1
1078+
|1|debug> fr 1
10791079
|[1] ==(x, y) at promotion.jl:403
10801080
| | x::Int64 = 20
10811081
| | y::Int64 = 0
10821082
| | T::DataType = Int64
1083-
|1|debug> f 2
1083+
|1|debug> fr 2
10841084
|[2] ==(x, y) at promotion.jl:403
10851085
| | x::Int64 = 20
10861086
| | y::Int64 = 0
@@ -1135,12 +1135,12 @@
11351135
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
11361136
|
11371137
|AAAAAAAAAAAAAAAAAAAAAAAAAA
1138-
|CCCCCCCCCAAA
1138+
|CCCCCCCCCAAAA
11391139
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
11401140
|AAAAAAAAAAAAAAAAA
11411141
|AAAAAAAAAAAAAAAA
11421142
|AAAAAAAAAAAAAAAAAAAAAAA
1143-
|CCCCCCCCCAAA
1143+
|CCCCCCCCCAAAA
11441144
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
11451145
|AAAAAAAAAAAAAAAAA
11461146
|AAAAAAAAAAAAAAAA
@@ -1195,17 +1195,17 @@
11951195
| 407 rem(x::T, y::T) where {T<:Real} = no_op_err("rem", T)
11961196
|
11971197
|About to run: (===)(20, 0)
1198-
|1|debug> f 1
1198+
|1|debug> fr 1
11991199
|[1] ==(x, y) at promotion.jl:403
12001200
| | x::Int64 = 20
12011201
| | y::Int64 = 0
12021202
| | T::DataType = Int64
1203-
|1|debug> f 2
1203+
|1|debug> fr 2
12041204
|[2] ==(x, y) at promotion.jl:403
12051205
| | x::Int64 = 20
12061206
| | y::Int64 = 0
12071207
| | T::DataType = Int64
1208-
|1|debug> fr 2
1208+
|1|debug> f 2
12091209
|In my_gcd(a, b) at ui.jl:5
12101210
| 5 a == 0 && return abs(b)
12111211
|> 6 b == 0 && return abs(a)
@@ -1265,17 +1265,17 @@
12651265
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
12661266
|
12671267
|AAAAAAAAAAAAAAAAAAAAAAAAAA
1268-
|CCCCCCCCCAAA
1268+
|CCCCCCCCCAAAA
12691269
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
12701270
|AAAAAAAAAAAAAAAAA
12711271
|AAAAAAAAAAAAAAAA
12721272
|AAAAAAAAAAAAAAAAAAAAAAA
1273-
|CCCCCCCCCAAA
1273+
|CCCCCCCCCAAAA
12741274
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
12751275
|AAAAAAAAAAAAAAAAA
12761276
|AAAAAAAAAAAAAAAA
12771277
|AAAAAAAAAAAAAAAAAAAAAAA
1278-
|CCCCCCCCCAAAA
1278+
|CCCCCCCCCAAA
12791279
|AAAAAAAAAAAAAAAAAAAAAAAAAA
12801280
|AAAAAAAAAAAAAAAAAAAAAAAAAAAA
12811281
|BBBBBAAAAAAAAAAAAAAAAAAAAAAA
@@ -1335,17 +1335,17 @@
13351335
| 407 rem(x::T, y::T) where {T<:Real} = no_op_err("rem", T)
13361336
|
13371337
|About to run: (===)(20, 0)
1338-
|1|debug> f 1
1338+
|1|debug> fr 1
13391339
|[1] ==(x, y) at promotion.jl:403
13401340
| | x::Int64 = 20
13411341
| | y::Int64 = 0
13421342
| | T::DataType = Int64
1343-
|1|debug> f 2
1343+
|1|debug> fr 2
13441344
|[2] ==(x, y) at promotion.jl:403
13451345
| | x::Int64 = 20
13461346
| | y::Int64 = 0
13471347
| | T::DataType = Int64
1348-
|1|debug> fr 2
1348+
|1|debug> f 2
13491349
|In my_gcd(a, b) at ui.jl:5
13501350
| 5 a == 0 && return abs(b)
13511351
|> 6 b == 0 && return abs(a)
@@ -1355,7 +1355,7 @@
13551355
| 10 u = unsigned(abs(a >> za))
13561356
|
13571357
|About to run: (==)(20, 0)
1358-
|2|debug> fr 1
1358+
|2|debug> f 1
13591359
|In ==(x, y) at promotion.jl:403
13601360
|>403 (==)(x::T, y::T) where {T<:Number} = x === y
13611361
| 404 (< )(x::T, y::T) where {T<:Real} = no_op_err("<" , T)
@@ -1414,17 +1414,17 @@
14141414
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
14151415
|
14161416
|AAAAAAAAAAAAAAAAAAAAAAAAAA
1417-
|CCCCCCCCCAAA
1417+
|CCCCCCCCCAAAA
14181418
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
14191419
|AAAAAAAAAAAAAAAAA
14201420
|AAAAAAAAAAAAAAAA
14211421
|AAAAAAAAAAAAAAAAAAAAAAA
1422-
|CCCCCCCCCAAA
1422+
|CCCCCCCCCAAAA
14231423
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
14241424
|AAAAAAAAAAAAAAAAA
14251425
|AAAAAAAAAAAAAAAA
14261426
|AAAAAAAAAAAAAAAAAAAAAAA
1427-
|CCCCCCCCCAAAA
1427+
|CCCCCCCCCAAA
14281428
|AAAAAAAAAAAAAAAAAAAAAAAAAA
14291429
|AAAAAAAAAAAAAAAAAAAAAAAAAAAA
14301430
|BBBBBAAAAAAAAAAAAAAAAAAAAAAA
@@ -1434,7 +1434,7 @@
14341434
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
14351435
|
14361436
|AAAAAAAAAAAAAAAAAAAAAAAAA
1437-
|CCCCCCCCCAAAA
1437+
|CCCCCCCCCAAA
14381438
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
14391439
|BBBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
14401440
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -1493,17 +1493,17 @@
14931493
| 407 rem(x::T, y::T) where {T<:Real} = no_op_err("rem", T)
14941494
|
14951495
|About to run: (===)(20, 0)
1496-
|1|debug> f 1
1496+
|1|debug> fr 1
14971497
|[1] ==(x, y) at promotion.jl:403
14981498
| | x::Int64 = 20
14991499
| | y::Int64 = 0
15001500
| | T::DataType = Int64
1501-
|1|debug> f 2
1501+
|1|debug> fr 2
15021502
|[2] ==(x, y) at promotion.jl:403
15031503
| | x::Int64 = 20
15041504
| | y::Int64 = 0
15051505
| | T::DataType = Int64
1506-
|1|debug> fr 2
1506+
|1|debug> f 2
15071507
|In my_gcd(a, b) at ui.jl:5
15081508
| 5 a == 0 && return abs(b)
15091509
|> 6 b == 0 && return abs(a)
@@ -1513,7 +1513,7 @@
15131513
| 10 u = unsigned(abs(a >> za))
15141514
|
15151515
|About to run: (==)(20, 0)
1516-
|2|debug> fr 1
1516+
|2|debug> f 1
15171517
|In ==(x, y) at promotion.jl:403
15181518
|>403 (==)(x::T, y::T) where {T<:Number} = x === y
15191519
| 404 (< )(x::T, y::T) where {T<:Real} = no_op_err("<" , T)
@@ -1581,17 +1581,17 @@
15811581
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
15821582
|
15831583
|AAAAAAAAAAAAAAAAAAAAAAAAAA
1584-
|CCCCCCCCCAAA
1584+
|CCCCCCCCCAAAA
15851585
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
15861586
|AAAAAAAAAAAAAAAAA
15871587
|AAAAAAAAAAAAAAAA
15881588
|AAAAAAAAAAAAAAAAAAAAAAA
1589-
|CCCCCCCCCAAA
1589+
|CCCCCCCCCAAAA
15901590
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
15911591
|AAAAAAAAAAAAAAAAA
15921592
|AAAAAAAAAAAAAAAA
15931593
|AAAAAAAAAAAAAAAAAAAAAAA
1594-
|CCCCCCCCCAAAA
1594+
|CCCCCCCCCAAA
15951595
|AAAAAAAAAAAAAAAAAAAAAAAAAA
15961596
|AAAAAAAAAAAAAAAAAAAAAAAAAAAA
15971597
|BBBBBAAAAAAAAAAAAAAAAAAAAAAA
@@ -1601,7 +1601,7 @@
16011601
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
16021602
|
16031603
|AAAAAAAAAAAAAAAAAAAAAAAAA
1604-
|CCCCCCCCCAAAA
1604+
|CCCCCCCCCAAA
16051605
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
16061606
|BBBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
16071607
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -1669,17 +1669,17 @@
16691669
| 407 rem(x::T, y::T) where {T<:Real} = no_op_err("rem", T)
16701670
|
16711671
|About to run: (===)(20, 0)
1672-
|1|debug> f 1
1672+
|1|debug> fr 1
16731673
|[1] ==(x, y) at promotion.jl:403
16741674
| | x::Int64 = 20
16751675
| | y::Int64 = 0
16761676
| | T::DataType = Int64
1677-
|1|debug> f 2
1677+
|1|debug> fr 2
16781678
|[2] ==(x, y) at promotion.jl:403
16791679
| | x::Int64 = 20
16801680
| | y::Int64 = 0
16811681
| | T::DataType = Int64
1682-
|1|debug> fr 2
1682+
|1|debug> f 2
16831683
|In my_gcd(a, b) at ui.jl:5
16841684
| 5 a == 0 && return abs(b)
16851685
|> 6 b == 0 && return abs(a)
@@ -1689,7 +1689,7 @@
16891689
| 10 u = unsigned(abs(a >> za))
16901690
|
16911691
|About to run: (==)(20, 0)
1692-
|2|debug> fr 1
1692+
|2|debug> f 1
16931693
|In ==(x, y) at promotion.jl:403
16941694
|>403 (==)(x::T, y::T) where {T<:Number} = x === y
16951695
| 404 (< )(x::T, y::T) where {T<:Real} = no_op_err("<" , T)
@@ -1766,17 +1766,17 @@
17661766
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
17671767
|
17681768
|AAAAAAAAAAAAAAAAAAAAAAAAAA
1769-
|CCCCCCCCCAAA
1769+
|CCCCCCCCCAAAA
17701770
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
17711771
|AAAAAAAAAAAAAAAAA
17721772
|AAAAAAAAAAAAAAAA
17731773
|AAAAAAAAAAAAAAAAAAAAAAA
1774-
|CCCCCCCCCAAA
1774+
|CCCCCCCCCAAAA
17751775
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
17761776
|AAAAAAAAAAAAAAAAA
17771777
|AAAAAAAAAAAAAAAA
17781778
|AAAAAAAAAAAAAAAAAAAAAAA
1779-
|CCCCCCCCCAAAA
1779+
|CCCCCCCCCAAA
17801780
|AAAAAAAAAAAAAAAAAAAAAAAAAA
17811781
|AAAAAAAAAAAAAAAAAAAAAAAAAAAA
17821782
|BBBBBAAAAAAAAAAAAAAAAAAAAAAA
@@ -1786,7 +1786,7 @@
17861786
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
17871787
|
17881788
|AAAAAAAAAAAAAAAAAAAAAAAAA
1789-
|CCCCCCCCCAAAA
1789+
|CCCCCCCCCAAA
17901790
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
17911791
|BBBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
17921792
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -1863,17 +1863,17 @@
18631863
| 407 rem(x::T, y::T) where {T<:Real} = no_op_err("rem", T)
18641864
|
18651865
|About to run: (===)(20, 0)
1866-
|1|debug> f 1
1866+
|1|debug> fr 1
18671867
|[1] ==(x, y) at promotion.jl:403
18681868
| | x::Int64 = 20
18691869
| | y::Int64 = 0
18701870
| | T::DataType = Int64
1871-
|1|debug> f 2
1871+
|1|debug> fr 2
18721872
|[2] ==(x, y) at promotion.jl:403
18731873
| | x::Int64 = 20
18741874
| | y::Int64 = 0
18751875
| | T::DataType = Int64
1876-
|1|debug> fr 2
1876+
|1|debug> f 2
18771877
|In my_gcd(a, b) at ui.jl:5
18781878
| 5 a == 0 && return abs(b)
18791879
|> 6 b == 0 && return abs(a)
@@ -1883,7 +1883,7 @@
18831883
| 10 u = unsigned(abs(a >> za))
18841884
|
18851885
|About to run: (==)(20, 0)
1886-
|2|debug> fr 1
1886+
|2|debug> f 1
18871887
|In ==(x, y) at promotion.jl:403
18881888
|>403 (==)(x::T, y::T) where {T<:Number} = x === y
18891889
| 404 (< )(x::T, y::T) where {T<:Real} = no_op_err("<" , T)
@@ -1975,17 +1975,17 @@
19751975
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
19761976
|
19771977
|AAAAAAAAAAAAAAAAAAAAAAAAAA
1978-
|CCCCCCCCCAAA
1978+
|CCCCCCCCCAAAA
19791979
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
19801980
|AAAAAAAAAAAAAAAAA
19811981
|AAAAAAAAAAAAAAAA
19821982
|AAAAAAAAAAAAAAAAAAAAAAA
1983-
|CCCCCCCCCAAA
1983+
|CCCCCCCCCAAAA
19841984
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
19851985
|AAAAAAAAAAAAAAAAA
19861986
|AAAAAAAAAAAAAAAA
19871987
|AAAAAAAAAAAAAAAAAAAAAAA
1988-
|CCCCCCCCCAAAA
1988+
|CCCCCCCCCAAA
19891989
|AAAAAAAAAAAAAAAAAAAAAAAAAA
19901990
|AAAAAAAAAAAAAAAAAAAAAAAAAAAA
19911991
|BBBBBAAAAAAAAAAAAAAAAAAAAAAA
@@ -1995,7 +1995,7 @@
19951995
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
19961996
|
19971997
|AAAAAAAAAAAAAAAAAAAAAAAAA
1998-
|CCCCCCCCCAAAA
1998+
|CCCCCCCCCAAA
19991999
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
20002000
|BBBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
20012001
|AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

0 commit comments

Comments
 (0)