From c17d397c24f854259e628d056349ad139e1b8346 Mon Sep 17 00:00:00 2001 From: Kristoffer Date: Tue, 22 Feb 2022 09:05:43 +0100 Subject: [PATCH] update the ui tests to 1.7 --- test/ui.jl | 4 +- test/ui/history_break_error.multiout | 8 +- test/ui/history_gcd.multiout | 116 +++++++++++++-------------- test/ui/history_noinfo.multiout | 88 ++++++++++---------- 4 files changed, 108 insertions(+), 108 deletions(-) diff --git a/test/ui.jl b/test/ui.jl index d5c0cba..6e126c5 100644 --- a/test/ui.jl +++ b/test/ui.jl @@ -101,13 +101,13 @@ end @testset "UI" begin - if Sys.isunix() && (v"1.6.0-A" <= VERSION < v"1.7.0-A") + if Sys.isunix() && (v"1.7.0-A" <= VERSION < v"1.8.0-A") Debugger._print_full_path[] = false using TerminalRegressionTests function run_terminal_test(frame, commands, validation) TerminalRegressionTests.automated_test(joinpath(@__DIR__, validation), commands) do emuterm - #TerminalRegressionTests.create_automated_test(joinpath(@__DIR__, validation), commands) do emuterm + # TerminalRegressionTests.create_automated_test(joinpath(@__DIR__, validation), commands) do emuterm repl = REPL.LineEditREPL(emuterm, true) repl.interface = REPL.setup_interface(repl) repl.specialdisplay = REPL.REPLDisplay(repl) diff --git a/test/ui/history_break_error.multiout b/test/ui/history_break_error.multiout index 2ae9468..e55a320 100644 --- a/test/ui/history_break_error.multiout +++ b/test/ui/history_break_error.multiout @@ -36,8 +36,8 @@ |AAAAAAAAAAAAAAAAAAA |DDDDDDDAAA |AAAAAAAAAAA -|AAAAAEEEEEEFEEAAAAAAE -|FFFFFGGGGEHHHHHHHHHHH +|AAAAAEEEEEEFAAAAAAAAE +|FFFFFGGGGAHHHHHHHHHHH | |AAAAAAAAAAAAAAAAAAAAAAAAAA |BBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA @@ -73,8 +73,8 @@ |AAAAAAAAAAAAAAAAAAA |DDDDDDDAAA |AAAAAAAAAAA -|AAAAAEEEEEEFEEAAAAAAE -|FFFFFGGGGEHHHHHHHHHHH +|AAAAAEEEEEEFAAAAAAAAE +|FFFFFGGGGAHHHHHHHHHHH | |AAAAAAAAAAAAAAAAAAAAAAAAAA |BBBBBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA diff --git a/test/ui/history_gcd.multiout b/test/ui/history_gcd.multiout index 5980918..2bf1d95 100644 --- a/test/ui/history_gcd.multiout +++ b/test/ui/history_gcd.multiout @@ -1087,8 +1087,8 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> @@ -1211,12 +1211,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -1345,12 +1345,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -1489,12 +1489,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -1657,12 +1657,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -1684,8 +1684,8 @@ | |About to run: (==)(20, 0) |2|debug> f 1 -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> @@ -1835,12 +1835,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -1862,12 +1862,12 @@ | |About to run: (==)(20, 0) |2|debug> f 1 -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> bt -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2031,12 +2031,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2058,12 +2058,12 @@ | |About to run: (==)(20, 0) |2|debug> f 1 -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> bt -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2072,8 +2072,8 @@ | | b::Int64 = 20 | | T::DataType = Int64 |1|debug> st -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> @@ -2237,12 +2237,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2264,12 +2264,12 @@ | |About to run: (==)(20, 0) |2|debug> f 1 -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> bt -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2278,8 +2278,8 @@ | | b::Int64 = 20 | | T::DataType = Int64 |1|debug> st -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> @@ -2443,12 +2443,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2470,12 +2470,12 @@ | |About to run: (==)(20, 0) |2|debug> f 1 -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> bt -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2484,8 +2484,8 @@ | | b::Int64 = 20 | | T::DataType = Int64 |1|debug> st -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> c @@ -2611,8 +2611,8 @@ |AAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -|FFFFFGGGGGGGGGGGG -|HHHHHGGGGGGGGGGGG +|FFFFFAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAA |AAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAA @@ -2677,12 +2677,12 @@ |2] b: 20 | |1|debug> s -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> fr 1 -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2704,12 +2704,12 @@ | |About to run: (==)(20, 0) |2|debug> f 1 -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> bt -|[1] ==(x, y) at promotion.jl:410 +|[1] ==(x, y) at promotion.jl:468 | | x::Int64 = 20 | | y::Int64 = 0 | | T::DataType = Int64 @@ -2718,8 +2718,8 @@ | | b::Int64 = 20 | | T::DataType = Int64 |1|debug> st -|In ==(x, y) at promotion.jl:410 -|>410 (==)(x::T, y::T) where {T<:Number} = x === y +|In ==(x, y) at promotion.jl:468 +|>468 (==)(x::T, y::T) where {T<:Number} = x === y | |About to run: (===)(20, 0) |1|debug> c @@ -2845,8 +2845,8 @@ |AAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -|FFFFFGGGGGGGGGGGG -|HHHHHGGGGGGGGGGGG +|FFFFFAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAA |AAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAA diff --git a/test/ui/history_noinfo.multiout b/test/ui/history_noinfo.multiout index 355c64a..c69ae1d 100644 --- a/test/ui/history_noinfo.multiout +++ b/test/ui/history_noinfo.multiout @@ -22,10 +22,10 @@ |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA | -|DDDDDDDDDDDDDDDDDDDDDDDDD -|EEEEEEEEE +|AAAAAAAAAAAAAAAAAAAAAAAAA +|DDDDDDDDD ++++++++++++++++++++++++++++++++++++++++++++++++++ |In my_gcd_noinfo(a, b) at nope.jl:1 | 3 │ Core.NewvarNode(:(u)) @@ -64,24 +64,24 @@ |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA | -|DDDDDDDDDDDDDDDDDDDDDDDDD -|EEEEEEEEEA +|AAAAAAAAAAAAAAAAAAAAAAAAA +|DDDDDDDDDA |AAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD -|FFFFFDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | |AAAAAAAAAAAAAAAAAAAAAAAAA -|EEEEEEEEE +|DDDDDDDDD ++++++++++++++++++++++++++++++++++++++++++++++++++ |In my_gcd_noinfo(a, b) at nope.jl:1 | 3 │ Core.NewvarNode(:(u)) @@ -120,24 +120,24 @@ |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA | -|DDDDDDDDDDDDDDDDDDDDDDDDD -|EEEEEEEEEA +|AAAAAAAAAAAAAAAAAAAAAAAAA +|DDDDDDDDDA |AAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD -|FFFFFDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | |AAAAAAAAAAAAAAAAAAAAAAAAA -|GGGGGGGGG +|EEEEEEEEE ++++++++++++++++++++++++++++++++++++++++++++++++++ |In my_gcd_noinfo(a, b) at nope.jl:1 | 3 │ Core.NewvarNode(:(u)) @@ -179,27 +179,27 @@ |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA | -|DDDDDDDDDDDDDDDDDDDDDDDDD -|EEEEEEEEEA +|AAAAAAAAAAAAAAAAAAAAAAAAA +|DDDDDDDDDA |AAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD -|FFFFFDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | |AAAAAAAAAAAAAAAAAAAAAAAAA -|GGGGGGGGGA +|EEEEEEEEEA |AA | -|GGGGGGGGG +|EEEEEEEEE ++++++++++++++++++++++++++++++++++++++++++++++++++ |In my_gcd_noinfo(a, b) at nope.jl:1 | 3 │ Core.NewvarNode(:(u)) @@ -241,27 +241,27 @@ |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA | -|DDDDDDDDDDDDDDDDDDDDDDDDD -|EEEEEEEEEA +|AAAAAAAAAAAAAAAAAAAAAAAAA +|DDDDDDDDDA |AAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD -|FFFFFDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | |AAAAAAAAAAAAAAAAAAAAAAAAA -|GGGGGGGGGA +|EEEEEEEEEA |AA | -|GGGGGGGGGA +|EEEEEEEEEA ++++++++++++++++++++++++++++++++++++++++++++++++++ |In my_gcd_noinfo(a, b) at nope.jl:1 | 3 │ Core.NewvarNode(:(u)) @@ -303,27 +303,27 @@ |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA | -|DDDDDDDDDDDDDDDDDDDDDDDDD -|EEEEEEEEEA +|AAAAAAAAAAAAAAAAAAAAAAAAA +|DDDDDDDDDA |AAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD -|FFFFFDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | |AAAAAAAAAAAAAAAAAAAAAAAAA -|GGGGGGGGGA +|EEEEEEEEEA |AA | -|EEEEEEEEEA +|DDDDDDDDDA ++++++++++++++++++++++++++++++++++++++++++++++++++ |In my_gcd_noinfo(a, b) at nope.jl:1 | 3 │ Core.NewvarNode(:(u)) @@ -367,26 +367,26 @@ |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA | -|DDDDDDDDDDDDDDDDDDDDDDDDD -|EEEEEEEEEA +|AAAAAAAAAAAAAAAAAAAAAAAAA +|DDDDDDDDDA |AAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAA -|CCCCCDDDDDDDDDDDDDDDDDD -|FFFFFDDDDDDDDDDDDDDDDD +|CCCCCAAAAAAAAAAAAAAAAAA +|BBBBBAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAA |AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA | |AAAAAAAAAAAAAAAAAAAAAAAAA -|GGGGGGGGGA +|EEEEEEEEEA |AA | -|EEEEEEEEEAAA +|DDDDDDDDDAAA | -|EEEEEEEEE \ No newline at end of file +|DDDDDDDDD \ No newline at end of file