diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcd76a8..80a3821 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,6 @@ jobs: uses: actions/checkout@v4 with: repository: kibi2/keyevent.nvim - ref: v0.1.1 path: .deps/keyevent.nvim - name: Setup Neovim diff --git a/tests/cases/basic/out-expected.txt b/tests/cases/basic/out-expected.txt index 349110b..26f12ae 100644 --- a/tests/cases/basic/out-expected.txt +++ b/tests/cases/basic/out-expected.txt @@ -3,58 +3,58 @@ --- CASE 6: : tan tan ta ta tan --- (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - repeat j (0 0 0) map repeat (1 1 3) j (150 0) j↻ - repeat j (0 0 0) map repeat (1 1 4) j (150 0) j↻ - normal j (0 1 0) map tap (1 1 0) j (300 0) j↻j - repeat j (0 1 0) map repeat (1 2 1) j (500 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 2) j (150 0) j↻j↻ - normal j (0 2 0) map tap (1 2 0) j (300 0) j↻j↻j - normal j (0 3 0) map tap (2 2 0) j (300 0) j↻j↻jj - normal j (0 4 0) map tap (3 2 0) j (300 0) j↻j↻jjj - repeat j (0 4 0) map repeat (3 3 1) j (500 0) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 2) j (150 0) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 3) j (150 0) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 4) j (150 0) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 5) j (150 1) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 6) j (150 1) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 7) j (150 1) j↻j↻jjj↻ + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + repeat j (0 0 0) map repeat j (1 1 3) (150 0) j↻ + repeat j (0 0 0) map repeat j (1 1 4) (150 0) j↻ + normal j (0 1 0) map tap j (1 1 0) (300 0) j↻j + repeat j (0 1 0) map repeat j (1 2 1) (500 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 2) (150 0) j↻j↻ + normal j (0 2 0) map tap j (1 2 0) (300 0) j↻j↻j + normal j (0 3 0) map tap j (2 2 0) (300 0) j↻j↻jj + normal j (0 4 0) map tap j (3 2 0) (300 0) j↻j↻jjj + repeat j (0 4 0) map repeat j (3 3 1) (500 0) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 2) (150 0) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 3) (150 0) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 4) (150 0) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 5) (150 1) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 6) (150 1) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 7) (150 1) j↻j↻jjj↻ hold_time = 500 + 150 * 6 = 1400 --- CASE 9: : tan tan ta ta tan (diff key) --- (v l s) src type (t h r) key (itv h) seq - normal h (0 0 0) map tap (1 1 0) h (300 0) x↻h - repeat h (0 0 0) map repeat (1 2 1) h (500 0) x↻h↻ - repeat h (0 0 0) map repeat (1 2 2) h (150 0) x↻h↻ - normal w (0 0 0) map tap (1 2 0) w (300 0) x↻h↻w - normal j (0 0 0) map tap (1 2 0) j (300 0) x↻h↻wej - repeat j (0 0 0) map repeat (1 3 1) j (500 0) x↻h↻wej↻ - repeat j (0 0 0) map repeat (1 3 2) j (150 0) x↻h↻wej↻ - normal k (0 0 0) map click (1 0 0) k (900 0) k + normal h (0 0 0) map tap h (1 1 0) (300 0) x↻h + repeat h (0 0 0) map repeat h (1 2 1) (500 0) x↻h↻ + repeat h (0 0 0) map repeat h (1 2 2) (150 0) x↻h↻ + normal w (0 0 0) map tap w (1 2 0) (300 0) x↻h↻w + normal j (0 0 0) map tap j (1 2 0) (300 0) x↻h↻wej + repeat j (0 0 0) map repeat j (1 3 1) (500 0) x↻h↻wej↻ + repeat j (0 0 0) map repeat j (1 3 2) (150 0) x↻h↻wej↻ + normal k (0 0 0) map click k (1 0 0) (900 0) k --- CASE 12: : tan tan ta ta tan (interval) --- (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (200 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (300 0) j↻ - repeat j (0 0 0) map repeat (1 1 3) j (300 0) j↻ - repeat j (0 0 0) map repeat (1 1 4) j (300 1) j↻ - normal j (0 1 0) map tap (1 1 0) j (100 0) j↻j - repeat j (0 1 0) map repeat (1 2 1) j (200 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 2) j (300 0) j↻j↻ - normal j (0 2 0) map tap (1 2 0) j (100 0) j↻j↻j - normal j (0 3 0) map tap (2 2 0) j (100 0) j↻j↻jj - normal j (0 4 0) map tap (3 2 0) j (100 0) j↻j↻jjj - repeat j (0 4 0) map repeat (3 3 1) j (200 0) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 2) j (300 0) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 3) j (300 0) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 4) j (300 1) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 5) j (300 1) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 6) j (300 1) j↻j↻jjj↻ - repeat 16j (0 4 0) map repeat (3 3 7) j (300 2) j↻j↻jjj↻ - normal j (0 0 0) map click (1 0 0) j (311 0) j + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (200 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (300 0) j↻ + repeat j (0 0 0) map repeat j (1 1 3) (300 0) j↻ + repeat j (0 0 0) map repeat j (1 1 4) (300 1) j↻ + normal j (0 1 0) map tap j (1 1 0) (100 0) j↻j + repeat j (0 1 0) map repeat j (1 2 1) (200 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 2) (300 0) j↻j↻ + normal j (0 2 0) map tap j (1 2 0) (100 0) j↻j↻j + normal j (0 3 0) map tap j (2 2 0) (100 0) j↻j↻jj + normal j (0 4 0) map tap j (3 2 0) (100 0) j↻j↻jjj + repeat j (0 4 0) map repeat j (3 3 1) (200 0) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 2) (300 0) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 3) (300 0) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 4) (300 1) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 5) (300 1) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 6) (300 1) j↻j↻jjj↻ + repeat 16j (0 4 0) map repeat j (3 3 7) (300 2) j↻j↻jjj↻ + normal j (0 0 0) map click j (1 0 0) (311 0) j === DISPLAY === diff --git a/tests/cases/basic/run1.lua b/tests/cases/basic/run1.lua index ee987ee..7b1c948 100644 --- a/tests/cases/basic/run1.lua +++ b/tests/cases/basic/run1.lua @@ -23,5 +23,5 @@ local tan_tan_ta_ta_tann = { } common_rush.run_sequence(tan_tan_ta_ta_tann) -local events = KeyEvent.get_evcents(2) +local events = KeyEvent.get_events(2) print("hold_time = 500 + 150 * 6 = ", KeyEvent.hold_time(events[1])) diff --git a/tests/cases/beginning/out-expected.txt b/tests/cases/beginning/out-expected.txt index 346e930..c8192a8 100644 --- a/tests/cases/beginning/out-expected.txt +++ b/tests/cases/beginning/out-expected.txt @@ -3,48 +3,48 @@ --- CASE 6: : count --- (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - repeat j (0 0 0) map repeat (1 1 3) j (150 0) j↻ - normal k (0 0 0) map click (1 0 0) k (900 0) k - normal k (0 1 0) map tap (2 0 0) k (300 0) kk - repeat k (0 1 0) map repeat (2 1 1) k (500 0) kk↻ - repeat 2k (0 1 0) map repeat (2 1 2) k (150 0) kk↻ - repeat 2k (0 1 0) map repeat (2 1 3) k (150 0) kk↻ - normal h (0 0 0) map click (1 0 0) h (900 0) h - normal h (0 1 0) map tap (2 0 0) h (300 0) hh - normal h (0 2 0) map tap (3 0 0) h (300 0) hhh - repeat h (0 2 0) map repeat (3 1 1) h (500 0) hhh↻ - repeat 4h (0 2 0) map repeat (3 1 2) h (150 0) hhh↻ - repeat 4h (0 2 0) map repeat (3 1 3) h (150 0) hhh↻ - normal h (0 3 0) map tap (1 1 0) h (300 0) hhh↻h - normal h (0 4 0) map tap (2 1 0) h (300 0) hhh↻hh - normal h (0 5 0) map tap (3 1 0) h (300 0) hhh↻hhh - normal l (0 0 0) map tap (1 1 0) l (300 0) hhh↻hhhl - normal l (0 1 0) map tap (2 1 0) l (300 0) hhh↻hhhll - normal l (0 2 0) map tap (3 1 0) l (300 0) hhh↻hhhlll - normal l (0 0 0) map tap (4 1 0) l (300 0) hh↻hhhllll - repeat l (0 0 0) map repeat (4 2 1) l (500 0) h↻hhhllll↻ - repeat l (0 0 0) map repeat (4 2 2) l (150 0) h↻hhhllll↻ - repeat l (0 0 0) map repeat (4 2 3) l (150 0) h↻hhhllll↻ - normal w (0 0 0) map click (1 0 0) w (900 0) w - normal w (0 1 0) map tap (2 0 0) w (300 0) ww - normal w (0 2 0) map tap (3 0 0) w (300 0) www - repeat w (0 2 0) map repeat (3 1 1) w (500 0) www↻ - repeat 4w (0 2 0) map repeat (3 1 2) w (150 0) www↻ - repeat 4w (0 2 0) map repeat (3 1 3) w (150 0) www↻ - normal b (0 0 0) map click (1 0 0) b (900 0) b - normal b (0 0 0) map click (1 0 0) b (900 0) b - normal b (0 1 0) map tap (2 0 0) b (300 0) bb - normal b (0 2 0) map tap (3 0 0) b (300 0) bbb - normal b (0 0 0) map tap (4 0 0) b (300 0) bbbb - normal b (0 0 0) map tap (5 0 0) b (300 0) bbbbb - normal b (0 0 0) map tap (6 0 0) b (300 0) bbbbbb - repeat b (0 0 0) map repeat (6 1 1) b (500 0) bbbbbb↻ - repeat b (0 0 0) map repeat (6 1 2) b (150 0) bbbbbb↻ - repeat b (0 0 0) map repeat (6 1 3) b (150 0) bbbbbb↻ - normal b (0 1 0) map tap (1 1 0) b (300 0) bbbbbb↻b + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + repeat j (0 0 0) map repeat j (1 1 3) (150 0) j↻ + normal k (0 0 0) map click k (1 0 0) (900 0) k + normal k (0 1 0) map tap k (2 0 0) (300 0) kk + repeat k (0 1 0) map repeat k (2 1 1) (500 0) kk↻ + repeat 2k (0 1 0) map repeat k (2 1 2) (150 0) kk↻ + repeat 2k (0 1 0) map repeat k (2 1 3) (150 0) kk↻ + normal h (0 0 0) map click h (1 0 0) (900 0) h + normal h (0 1 0) map tap h (2 0 0) (300 0) hh + normal h (0 2 0) map tap h (3 0 0) (300 0) hhh + repeat h (0 2 0) map repeat h (3 1 1) (500 0) hhh↻ + repeat 4h (0 2 0) map repeat h (3 1 2) (150 0) hhh↻ + repeat 4h (0 2 0) map repeat h (3 1 3) (150 0) hhh↻ + normal h (0 3 0) map tap h (1 1 0) (300 0) hhh↻h + normal h (0 4 0) map tap h (2 1 0) (300 0) hhh↻hh + normal h (0 5 0) map tap h (3 1 0) (300 0) hhh↻hhh + normal l (0 0 0) map tap l (1 1 0) (300 0) hhh↻hhhl + normal l (0 1 0) map tap l (2 1 0) (300 0) hhh↻hhhll + normal l (0 2 0) map tap l (3 1 0) (300 0) hhh↻hhhlll + normal l (0 0 0) map tap l (4 1 0) (300 0) hh↻hhhllll + repeat l (0 0 0) map repeat l (4 2 1) (500 0) h↻hhhllll↻ + repeat l (0 0 0) map repeat l (4 2 2) (150 0) h↻hhhllll↻ + repeat l (0 0 0) map repeat l (4 2 3) (150 0) h↻hhhllll↻ + normal w (0 0 0) map click w (1 0 0) (900 0) w + normal w (0 1 0) map tap w (2 0 0) (300 0) ww + normal w (0 2 0) map tap w (3 0 0) (300 0) www + repeat w (0 2 0) map repeat w (3 1 1) (500 0) www↻ + repeat 4w (0 2 0) map repeat w (3 1 2) (150 0) www↻ + repeat 4w (0 2 0) map repeat w (3 1 3) (150 0) www↻ + normal b (0 0 0) map click b (1 0 0) (900 0) b + normal b (0 0 0) map click b (1 0 0) (900 0) b + normal b (0 1 0) map tap b (2 0 0) (300 0) bb + normal b (0 2 0) map tap b (3 0 0) (300 0) bbb + normal b (0 0 0) map tap b (4 0 0) (300 0) bbbb + normal b (0 0 0) map tap b (5 0 0) (300 0) bbbbb + normal b (0 0 0) map tap b (6 0 0) (300 0) bbbbbb + repeat b (0 0 0) map repeat b (6 1 1) (500 0) bbbbbb↻ + repeat b (0 0 0) map repeat b (6 1 2) (150 0) bbbbbb↻ + repeat b (0 0 0) map repeat b (6 1 3) (150 0) bbbbbb↻ + normal b (0 1 0) map tap b (1 1 0) (300 0) bbbbbb↻b === DISPLAY === diff --git a/tests/cases/count/out-expected.txt b/tests/cases/count/out-expected.txt index 9b3092c..25b6e40 100644 --- a/tests/cases/count/out-expected.txt +++ b/tests/cases/count/out-expected.txt @@ -3,39 +3,39 @@ --- CASE 6: : count --- (v l s) src type (t h r) key (itv h) seq - normal j (3 0 0) map tap (1 0 0) j ( 0 0) 3j - repeat j (3 0 0) map repeat (1 1 1) j (500 0) 3j↻ - repeat 3j (3 0 0) map repeat (1 1 2) j (150 0) 3j↻ - repeat 3j (3 0 0) map repeat (1 1 3) j (150 0) 3j↻ - normal j (1 0 0) map tap (1 0 0) j ( 0 0) 1j - repeat j (1 0 0) map repeat (1 1 1) j (500 0) 1j↻ - repeat j (1 0 0) map repeat (1 1 2) j (150 0) 1j↻ - repeat j (1 0 0) map repeat (1 1 3) j (150 0) 1j↻ - normal j (1 1 0) map tap (1 1 0) j (300 0) 1j↻j - normal k (5 0 0) map tap (1 0 0) k ( 0 0) 5k - repeat k (5 0 0) map repeat (1 1 1) k (500 0) 5k↻ - repeat 5k (5 0 0) map repeat (1 1 2) k (150 0) 5k↻ - repeat 5k (5 0 0) map repeat (1 1 3) k (150 0) 5k↻ - normal k (5 1 0) map tap (1 1 0) k (300 0) 5k↻k - normal k (5 2 0) map tap (2 1 0) k (300 0) 5k↻kk - repeat k (5 2 0) map repeat (2 2 1) k (500 0) 5k↻kk↻ - repeat 20k (5 2 0) map repeat (2 2 2) k (150 0) 5k↻kk↻ - repeat 20k (5 2 0) map repeat (2 2 3) k (150 0) 5k↻kk↻ - normal k (5 3 0) map tap (1 2 0) k (300 0) 5k↻kk↻k - normal k (5 4 0) map tap (2 2 0) k (300 0) 5k↻kk↻kk - normal k (5 5 0) map tap (3 2 0) k (300 0) 5k↻kk↻kkk - normal k (0 0 0) map tap (4 2 0) k (300 0) 5k↻kk↻kkkk - repeat k (0 0 0) map repeat (4 3 1) k (500 0) k↻kk↻kkkk↻ - repeat k (0 0 0) map repeat (4 3 2) k (150 0) k↻kk↻kkkk↻ - repeat k (0 0 0) map repeat (4 3 3) k (150 0) k↻kk↻kkkk↻ - normal k (6 0 0) map tap (1 3 0) k ( 0 0) kk↻kkkk↻6k - repeat k (6 0 0) map repeat (1 4 1) k (500 0) k↻kkkk↻6k↻ - repeat 6k (6 0 0) map repeat (1 4 2) k (150 0) k↻kkkk↻6k↻ - repeat 6k (6 0 0) map repeat (1 4 3) k (150 0) k↻kkkk↻6k↻ - normal k (3 0 0) map tap (1 4 0) k ( 0 0) kkkk↻6k↻3k - repeat k (3 0 0) map repeat (1 5 1) k (500 0) kkk↻6k↻3k↻ - repeat 3k (3 0 0) map repeat (1 5 2) k (150 0) kkk↻6k↻3k↻ - repeat 3k (3 0 0) map repeat (1 5 3) k (150 0) kkk↻6k↻3k↻ + normal j (3 0 0) map tap j (1 0 0) ( 0 0) 3j + repeat j (3 0 0) map repeat j (1 1 1) (500 0) 3j↻ + repeat 3j (3 0 0) map repeat j (1 1 2) (150 0) 3j↻ + repeat 3j (3 0 0) map repeat j (1 1 3) (150 0) 3j↻ + normal j (1 0 0) map tap j (1 0 0) ( 0 0) 1j + repeat j (1 0 0) map repeat j (1 1 1) (500 0) 1j↻ + repeat j (1 0 0) map repeat j (1 1 2) (150 0) 1j↻ + repeat j (1 0 0) map repeat j (1 1 3) (150 0) 1j↻ + normal j (1 1 0) map tap j (1 1 0) (300 0) 1j↻j + normal k (5 0 0) map tap k (1 0 0) ( 0 0) 5k + repeat k (5 0 0) map repeat k (1 1 1) (500 0) 5k↻ + repeat 5k (5 0 0) map repeat k (1 1 2) (150 0) 5k↻ + repeat 5k (5 0 0) map repeat k (1 1 3) (150 0) 5k↻ + normal k (5 1 0) map tap k (1 1 0) (300 0) 5k↻k + normal k (5 2 0) map tap k (2 1 0) (300 0) 5k↻kk + repeat k (5 2 0) map repeat k (2 2 1) (500 0) 5k↻kk↻ + repeat 20k (5 2 0) map repeat k (2 2 2) (150 0) 5k↻kk↻ + repeat 20k (5 2 0) map repeat k (2 2 3) (150 0) 5k↻kk↻ + normal k (5 3 0) map tap k (1 2 0) (300 0) 5k↻kk↻k + normal k (5 4 0) map tap k (2 2 0) (300 0) 5k↻kk↻kk + normal k (5 5 0) map tap k (3 2 0) (300 0) 5k↻kk↻kkk + normal k (0 0 0) map tap k (4 2 0) (300 0) 5k↻kk↻kkkk + repeat k (0 0 0) map repeat k (4 3 1) (500 0) k↻kk↻kkkk↻ + repeat k (0 0 0) map repeat k (4 3 2) (150 0) k↻kk↻kkkk↻ + repeat k (0 0 0) map repeat k (4 3 3) (150 0) k↻kk↻kkkk↻ + normal k (6 0 0) map tap k (1 3 0) ( 0 0) kk↻kkkk↻6k + repeat k (6 0 0) map repeat k (1 4 1) (500 0) k↻kkkk↻6k↻ + repeat 6k (6 0 0) map repeat k (1 4 2) (150 0) k↻kkkk↻6k↻ + repeat 6k (6 0 0) map repeat k (1 4 3) (150 0) k↻kkkk↻6k↻ + normal k (3 0 0) map tap k (1 4 0) ( 0 0) kkkk↻6k↻3k + repeat k (3 0 0) map repeat k (1 5 1) (500 0) kkk↻6k↻3k↻ + repeat 3k (3 0 0) map repeat k (1 5 2) (150 0) kkk↻6k↻3k↻ + repeat 3k (3 0 0) map repeat k (1 5 3) (150 0) kkk↻6k↻3k↻ === DISPLAY === diff --git a/tests/cases/decrease/out-expected.txt b/tests/cases/decrease/out-expected.txt index b532dea..1c640dd 100644 --- a/tests/cases/decrease/out-expected.txt +++ b/tests/cases/decrease/out-expected.txt @@ -3,42 +3,42 @@ --- CASE 6: : count --- (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - normal j (0 1 0) map tap (2 0 0) j (300 0) jj - repeat j (0 1 0) map repeat (2 1 1) j (500 0) jj↻ - repeat 2j (0 1 0) map repeat (2 1 2) j (150 0) jj↻ - repeat 2j (0 1 0) map repeat (2 1 3) j (150 0) jj↻ - normal j (0 2 0) map tap (1 1 0) j (300 0) jj↻j - repeat j (0 2 0) map repeat (1 2 1) j (500 0) jj↻j↻ - repeat 4j (0 2 0) map repeat (1 2 2) j (150 0) jj↻j↻ - repeat 4j (0 2 0) map repeat (1 2 3) j (150 0) jj↻j↻ - normal k (0 -2 0) map tap (1 2 0) k (300 0) jj↻j↻k - repeat k (0 -2 0) map repeat (1 3 1) k (500 0) jj↻j↻k↻ - repeat 2j (0 -2 0) map repeat (1 3 2) k (150 0) jj↻j↻k↻ - repeat 2j (0 -2 0) map repeat (1 3 3) k (150 0) jj↻j↻k↻ - normal k (0 -1 0) map tap (1 3 0) k (300 0) jj↻j↻k↻k - repeat k (0 -1 0) map repeat (1 4 1) k (500 0) jj↻j↻k↻k↻ - repeat j (0 -1 0) map repeat (1 4 2) k (150 0) jj↻j↻k↻k↻ - repeat j (0 -1 0) map repeat (1 4 3) k (150 0) jj↻j↻k↻k↻ - normal k (0 0 0) map tap (1 4 0) k (300 0) jj↻j↻k↻k↻k - repeat k (0 0 0) map repeat (1 5 1) k (500 0) j↻j↻k↻k↻k↻ - repeat k (0 0 0) map repeat (1 5 2) k (150 0) j↻j↻k↻k↻k↻ - repeat k (0 0 0) map repeat (1 5 3) k (150 0) j↻j↻k↻k↻k↻ - normal k (0 1 0) map tap (1 5 0) k (300 0) ↻j↻k↻k↻k↻k - normal k (0 2 0) map tap (2 5 0) k (300 0) j↻k↻k↻k↻kk - repeat k (0 2 0) map repeat (2 6 1) k (500 0) ↻k↻k↻k↻kk↻ - repeat 4k (0 2 0) map repeat (2 6 2) k (150 0) ↻k↻k↻k↻kk↻ - repeat 4k (0 2 0) map repeat (2 6 3) k (150 0) ↻k↻k↻k↻kk↻ - normal j (0 -2 0) map tap (1 6 0) j (300 0) k↻k↻k↻kk↻j - repeat j (0 -2 0) map repeat (1 7 1) j (500 0) ↻k↻k↻kk↻j↻ - repeat 2k (0 -2 0) map repeat (1 7 2) j (150 0) ↻k↻k↻kk↻j↻ - repeat 2k (0 -2 0) map repeat (1 7 3) j (150 0) ↻k↻k↻kk↻j↻ - normal j (0 -1 0) map tap (1 7 0) j (300 0) k↻k↻kk↻j↻j - normal j (0 0 0) map tap (2 7 0) j (300 0) ↻k↻kk↻j↻jj - normal j (0 1 0) map tap (3 7 0) j (300 0) k↻kk↻j↻jjj - repeat j (0 1 0) map repeat (3 8 1) j (500 0) ↻kk↻j↻jjj↻ - repeat 2j (0 1 0) map repeat (3 8 2) j (150 0) ↻kk↻j↻jjj↻ - repeat 2j (0 1 0) map repeat (3 8 3) j (150 0) ↻kk↻j↻jjj↻ + normal j (0 0 0) map click j (1 0 0) (900 0) j + normal j (0 1 0) map tap j (2 0 0) (300 0) jj + repeat j (0 1 0) map repeat j (2 1 1) (500 0) jj↻ + repeat 2j (0 1 0) map repeat j (2 1 2) (150 0) jj↻ + repeat 2j (0 1 0) map repeat j (2 1 3) (150 0) jj↻ + normal j (0 2 0) map tap j (1 1 0) (300 0) jj↻j + repeat j (0 2 0) map repeat j (1 2 1) (500 0) jj↻j↻ + repeat 4j (0 2 0) map repeat j (1 2 2) (150 0) jj↻j↻ + repeat 4j (0 2 0) map repeat j (1 2 3) (150 0) jj↻j↻ + normal k (0 -2 0) map tap k (1 2 0) (300 0) jj↻j↻k + repeat k (0 -2 0) map repeat k (1 3 1) (500 0) jj↻j↻k↻ + repeat 2j (0 -2 0) map repeat k (1 3 2) (150 0) jj↻j↻k↻ + repeat 2j (0 -2 0) map repeat k (1 3 3) (150 0) jj↻j↻k↻ + normal k (0 -1 0) map tap k (1 3 0) (300 0) jj↻j↻k↻k + repeat k (0 -1 0) map repeat k (1 4 1) (500 0) jj↻j↻k↻k↻ + repeat j (0 -1 0) map repeat k (1 4 2) (150 0) jj↻j↻k↻k↻ + repeat j (0 -1 0) map repeat k (1 4 3) (150 0) jj↻j↻k↻k↻ + normal k (0 0 0) map tap k (1 4 0) (300 0) jj↻j↻k↻k↻k + repeat k (0 0 0) map repeat k (1 5 1) (500 0) j↻j↻k↻k↻k↻ + repeat k (0 0 0) map repeat k (1 5 2) (150 0) j↻j↻k↻k↻k↻ + repeat k (0 0 0) map repeat k (1 5 3) (150 0) j↻j↻k↻k↻k↻ + normal k (0 1 0) map tap k (1 5 0) (300 0) ↻j↻k↻k↻k↻k + normal k (0 2 0) map tap k (2 5 0) (300 0) j↻k↻k↻k↻kk + repeat k (0 2 0) map repeat k (2 6 1) (500 0) ↻k↻k↻k↻kk↻ + repeat 4k (0 2 0) map repeat k (2 6 2) (150 0) ↻k↻k↻k↻kk↻ + repeat 4k (0 2 0) map repeat k (2 6 3) (150 0) ↻k↻k↻k↻kk↻ + normal j (0 -2 0) map tap j (1 6 0) (300 0) k↻k↻k↻kk↻j + repeat j (0 -2 0) map repeat j (1 7 1) (500 0) ↻k↻k↻kk↻j↻ + repeat 2k (0 -2 0) map repeat j (1 7 2) (150 0) ↻k↻k↻kk↻j↻ + repeat 2k (0 -2 0) map repeat j (1 7 3) (150 0) ↻k↻k↻kk↻j↻ + normal j (0 -1 0) map tap j (1 7 0) (300 0) k↻k↻kk↻j↻j + normal j (0 0 0) map tap j (2 7 0) (300 0) ↻k↻kk↻j↻jj + normal j (0 1 0) map tap j (3 7 0) (300 0) k↻kk↻j↻jjj + repeat j (0 1 0) map repeat j (3 8 1) (500 0) ↻kk↻j↻jjj↻ + repeat 2j (0 1 0) map repeat j (3 8 2) (150 0) ↻kk↻j↻jjj↻ + repeat 2j (0 1 0) map repeat j (3 8 3) (150 0) ↻kk↻j↻jjj↻ === DISPLAY === diff --git a/tests/cases/increase/out-expected.txt b/tests/cases/increase/out-expected.txt index 2b3165e..7446c1c 100644 --- a/tests/cases/increase/out-expected.txt +++ b/tests/cases/increase/out-expected.txt @@ -3,32 +3,32 @@ --- CASE 6: : count --- (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - repeat j (0 0 0) map repeat (1 1 3) j (150 0) j↻ - normal j (0 1 0) map tap (1 1 0) j (300 0) j↻j - repeat j (0 1 0) map repeat (1 2 1) j (500 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 2) j (150 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 3) j (150 0) j↻j↻ - normal j (0 2 0) map tap (1 2 0) j (300 0) j↻j↻j - normal j (0 3 0) map tap (2 2 0) j (300 0) j↻j↻jj - repeat j (0 3 0) map repeat (2 3 1) j (500 0) j↻j↻jj↻ - repeat 8j (0 3 0) map repeat (2 3 2) j (150 0) j↻j↻jj↻ - repeat 8j (0 3 0) map repeat (2 3 3) j (150 0) j↻j↻jj↻ - normal j (0 4 0) map tap (1 3 0) j (300 0) j↻j↻jj↻j - normal j (0 5 0) map tap (2 3 0) j (300 0) j↻j↻jj↻jj - normal j (0 6 0) map tap (3 3 0) j (300 0) j↻j↻jj↻jjj - repeat j (0 6 0) map repeat (3 4 1) j (500 0) ↻j↻jj↻jjj↻ - repeat 64j (0 6 0) map repeat (3 4 2) j (150 0) ↻j↻jj↻jjj↻ - repeat 64j (0 6 0) map repeat (3 4 3) j (150 0) ↻j↻jj↻jjj↻ - normal j (0 7 0) map tap (1 4 0) j (300 0) j↻jj↻jjj↻j - normal j (0 8 0) map tap (2 4 0) j (300 0) ↻jj↻jjj↻jj - normal j (0 9 0) map tap (3 4 0) j (300 0) jj↻jjj↻jjj - normal j (0 0 0) map tap (4 4 0) j (300 0) j↻jjj↻jjjj - repeat j (0 0 0) map repeat (4 5 1) j (500 0) ↻jjj↻jjjj↻ - repeat j (0 0 0) map repeat (4 5 2) j (150 0) ↻jjj↻jjjj↻ - repeat j (0 0 0) map repeat (4 5 3) j (150 0) ↻jjj↻jjjj↻ + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + repeat j (0 0 0) map repeat j (1 1 3) (150 0) j↻ + normal j (0 1 0) map tap j (1 1 0) (300 0) j↻j + repeat j (0 1 0) map repeat j (1 2 1) (500 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 2) (150 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 3) (150 0) j↻j↻ + normal j (0 2 0) map tap j (1 2 0) (300 0) j↻j↻j + normal j (0 3 0) map tap j (2 2 0) (300 0) j↻j↻jj + repeat j (0 3 0) map repeat j (2 3 1) (500 0) j↻j↻jj↻ + repeat 8j (0 3 0) map repeat j (2 3 2) (150 0) j↻j↻jj↻ + repeat 8j (0 3 0) map repeat j (2 3 3) (150 0) j↻j↻jj↻ + normal j (0 4 0) map tap j (1 3 0) (300 0) j↻j↻jj↻j + normal j (0 5 0) map tap j (2 3 0) (300 0) j↻j↻jj↻jj + normal j (0 6 0) map tap j (3 3 0) (300 0) j↻j↻jj↻jjj + repeat j (0 6 0) map repeat j (3 4 1) (500 0) ↻j↻jj↻jjj↻ + repeat 64j (0 6 0) map repeat j (3 4 2) (150 0) ↻j↻jj↻jjj↻ + repeat 64j (0 6 0) map repeat j (3 4 3) (150 0) ↻j↻jj↻jjj↻ + normal j (0 7 0) map tap j (1 4 0) (300 0) j↻jj↻jjj↻j + normal j (0 8 0) map tap j (2 4 0) (300 0) ↻jj↻jjj↻jj + normal j (0 9 0) map tap j (3 4 0) (300 0) jj↻jjj↻jjj + normal j (0 0 0) map tap j (4 4 0) (300 0) j↻jjj↻jjjj + repeat j (0 0 0) map repeat j (4 5 1) (500 0) ↻jjj↻jjjj↻ + repeat j (0 0 0) map repeat j (4 5 2) (150 0) ↻jjj↻jjjj↻ + repeat j (0 0 0) map repeat j (4 5 3) (150 0) ↻jjj↻jjjj↻ === DISPLAY === diff --git a/tests/cases/meta/out-expected.txt b/tests/cases/meta/out-expected.txt index abf798e..48ff44c 100644 --- a/tests/cases/meta/out-expected.txt +++ b/tests/cases/meta/out-expected.txt @@ -3,23 +3,23 @@ --- CASE 6: : count --- (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map tap (1 0 0) j (300 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - repeat 2j (0 1 0) map repeat (1 1 3) C-j (150 0) j↻ - repeat 2j (0 1 0) map repeat (1 1 4) C-j (150 0) j↻ - repeat 2j (0 1 0) map repeat (1 1 5) j (150 1) j↻ - repeat 4j (0 2 0) map repeat (1 1 6) C-j (150 1) j↻ - repeat 4j (0 2 0) map repeat (1 1 7) j (150 1) j↻ - repeat 2j (0 1 0) map repeat (1 1 8) A-j (150 1) j↻ - repeat 2j (0 1 0) map repeat (1 1 9) j (150 1) j↻ - repeat j (0 0 0) map repeat (1 1 10) A-j (150 1) j↻ - repeat j (0 0 0) map repeat (1 1 11) A-j (150 2) j↻ - repeat j (0 0 0) map repeat (1 1 12) j (150 2) j↻ - repeat k (0 -1 0) map repeat (1 1 13) A-j (150 2) j↻ - repeat k (0 -1 0) map repeat (1 1 14) j (150 2) j↻ - repeat 2k (0 -2 0) map repeat (1 1 15) A-j (150 2) j↻ - repeat 2k (0 -2 0) map repeat (1 1 16) j (150 2) j↻ + normal j (0 0 0) map tap j (1 0 0) (300 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + repeat 2j (0 1 0) map repeat 2-j (1 1 3) (150 0) j↻ + repeat 2j (0 1 0) map repeat 2-j (1 1 4) (150 0) j↻ + repeat 2j (0 1 0) map repeat j (1 1 5) (150 1) j↻ + repeat 4j (0 2 0) map repeat 2-j (1 1 6) (150 1) j↻ + repeat 4j (0 2 0) map repeat j (1 1 7) (150 1) j↻ + repeat 2j (0 1 0) map repeat 4-j (1 1 8) (150 1) j↻ + repeat 2j (0 1 0) map repeat j (1 1 9) (150 1) j↻ + repeat j (0 0 0) map repeat 4-j (1 1 10) (150 1) j↻ + repeat j (0 0 0) map repeat 4-j (1 1 11) (150 2) j↻ + repeat j (0 0 0) map repeat j (1 1 12) (150 2) j↻ + repeat k (0 -1 0) map repeat 4-j (1 1 13) (150 2) j↻ + repeat k (0 -1 0) map repeat j (1 1 14) (150 2) j↻ + repeat 2k (0 -2 0) map repeat 4-j (1 1 15) (150 2) j↻ + repeat 2k (0 -2 0) map repeat j (1 1 16) (150 2) j↻ === DISPLAY === diff --git a/tests/cases/ng_case/out-expected.txt b/tests/cases/ng_case/out-expected.txt index dc187f1..05ff2a1 100644 --- a/tests/cases/ng_case/out-expected.txt +++ b/tests/cases/ng_case/out-expected.txt @@ -5,137 +5,137 @@ (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - normal j (0 1 0) map tap (1 1 0) j (300 0) j↻j - repeat j (0 1 0) map repeat (1 2 1) j (500 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 2) j (150 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 3) j (150 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 4) j (150 0) j↻j↻ - normal j (0 2 0) map tap (1 2 0) j (300 0) j↻j↻j - repeat j (0 2 0) map repeat (1 3 1) j (500 0) j↻j↻j↻ - repeat 4j (0 2 0) map repeat (1 3 2) j (150 0) j↻j↻j↻ - repeat 4j (0 2 0) map repeat (1 3 3) j (150 0) j↻j↻j↻ + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + normal j (0 1 0) map tap j (1 1 0) (300 0) j↻j + repeat j (0 1 0) map repeat j (1 2 1) (500 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 2) (150 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 3) (150 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 4) (150 0) j↻j↻ + normal j (0 2 0) map tap j (1 2 0) (300 0) j↻j↻j + repeat j (0 2 0) map repeat j (1 3 1) (500 0) j↻j↻j↻ + repeat 4j (0 2 0) map repeat j (1 3 2) (150 0) j↻j↻j↻ + repeat 4j (0 2 0) map repeat j (1 3 3) (150 0) j↻j↻j↻ (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - repeat j (0 0 0) map repeat (1 1 3) j (150 0) j↻ - normal j (0 1 0) map 1-tap (1 1 0) j (500 0) j↻j - normal j (0 1 0) map 2-tap (2 1 0) j (150 0) j↻jj - repeat 2j (0 1 0) map 3-repeat (3 1 3) j (150 6) j↻jjj - repeat 2j (0 1 0) map 4-repeat (4 1 4) j (150 6) j↻jjjj - normal j (0 2 0) map tap (5 1 0) j (300 0) j↻jjjjj - repeat j (0 2 0) map repeat (5 2 1) j (500 0) j↻jjjjj↻ - repeat 4j (0 2 0) map repeat (5 2 2) j (150 0) j↻jjjjj↻ - repeat 4j (0 2 0) map repeat (5 2 3) j (150 0) j↻jjjjj↻ + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + repeat j (0 0 0) map repeat j (1 1 3) (150 0) j↻ + normal j (0 1 0) map 1-tap j (1 1 0) (500 0) j↻j + normal j (0 1 0) map 2-tap j (2 1 0) (150 0) j↻jj + repeat 2j (0 1 0) map 3-repeat j (3 1 3) (150 0) j↻jjj + repeat 2j (0 1 0) map 4-repeat j (4 1 4) (150 0) j↻jjjj + normal j (0 2 0) map tap j (5 1 0) (300 0) j↻jjjjj + repeat j (0 2 0) map repeat j (5 2 1) (500 0) j↻jjjjj↻ + repeat 4j (0 2 0) map repeat j (5 2 2) (150 0) j↻jjjjj↻ + repeat 4j (0 2 0) map repeat j (5 2 3) (150 0) j↻jjjjj↻ --- CASE 9: : repeat repeat -> repeat tap --- (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - normal j (0 1 0) map tap (1 1 0) j (300 0) j↻j - repeat j (0 1 0) map repeat (1 2 1) j (500 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 2) j (150 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 3) j (150 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 4) j (150 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 5) j (150 1) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 6) j (150 1) j↻j↻ - normal j (0 2 0) map tap (1 2 0) j (300 0) j↻j↻j - repeat j (0 2 0) map repeat (1 3 1) j (500 0) j↻j↻j↻ - repeat 4j (0 2 0) map repeat (1 3 2) j (150 0) j↻j↻j↻ - repeat 4j (0 2 0) map repeat (1 3 3) j (150 0) j↻j↻j↻ + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + normal j (0 1 0) map tap j (1 1 0) (300 0) j↻j + repeat j (0 1 0) map repeat j (1 2 1) (500 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 2) (150 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 3) (150 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 4) (150 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 5) (150 1) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 6) (150 1) j↻j↻ + normal j (0 2 0) map tap j (1 2 0) (300 0) j↻j↻j + repeat j (0 2 0) map repeat j (1 3 1) (500 0) j↻j↻j↻ + repeat 4j (0 2 0) map repeat j (1 3 2) (150 0) j↻j↻j↻ + repeat 4j (0 2 0) map repeat j (1 3 3) (150 0) j↻j↻j↻ (v l s) src type (t h r) key (itv h) seq - normal j (0 0 0) map click (1 0 0) j (900 0) j - repeat j (0 0 0) map repeat (1 1 1) j (500 0) j↻ - repeat j (0 0 0) map repeat (1 1 2) j (150 0) j↻ - normal j (0 1 0) map tap (1 1 0) j (300 0) j↻j - repeat j (0 1 0) map repeat (1 2 1) j (500 0) j↻j↻ - repeat 2j (0 1 0) map repeat (1 2 2) j (150 0) j↻j↻ - normal j (0 2 0) map tap (1 2 0) j (300 0) j↻j↻j - normal j (0 2 0) map 1-tap (2 2 0) j (150 0) j↻j↻jj - normal j (0 2 0) map 2-tap (3 2 0) j (150 0) j↻j↻jjj - repeat 2j (0 1 0) map 3-repeat (4 2 3) j (150 15) j↻j↻jjjj - normal j (0 2 0) map tap (5 2 0) j (300 0) j↻j↻jjjjj - repeat j (0 2 0) map repeat (5 3 1) j (500 0) j↻j↻jjjjj↻ - repeat 4j (0 2 0) map repeat (5 3 2) j (150 0) j↻j↻jjjjj↻ - repeat 4j (0 2 0) map repeat (5 3 3) j (150 0) j↻j↻jjjjj↻ + normal j (0 0 0) map click j (1 0 0) (900 0) j + repeat j (0 0 0) map repeat j (1 1 1) (500 0) j↻ + repeat j (0 0 0) map repeat j (1 1 2) (150 0) j↻ + normal j (0 1 0) map tap j (1 1 0) (300 0) j↻j + repeat j (0 1 0) map repeat j (1 2 1) (500 0) j↻j↻ + repeat 2j (0 1 0) map repeat j (1 2 2) (150 0) j↻j↻ + normal j (0 2 0) map tap j (1 2 0) (300 0) j↻j↻j + normal j (0 2 0) map 1-tap j (2 2 0) (150 0) j↻j↻jj + normal j (0 2 0) map 2-tap j (3 2 0) (150 0) j↻j↻jjj + repeat 2j (0 1 0) map 3-repeat j (4 2 3) (150 0) j↻j↻jjjj + normal j (0 2 0) map tap j (5 2 0) (300 0) j↻j↻jjjjj + repeat j (0 2 0) map repeat j (5 3 1) (500 0) j↻j↻jjjjj↻ + repeat 4j (0 2 0) map repeat j (5 3 2) (150 0) j↻j↻jjjjj↻ + repeat 4j (0 2 0) map repeat j (5 3 3) (150 0) j↻j↻jjjjj↻ --- CASE 12: : tap tap -> tap repeat --- (v l s) src type (t h r) key (itv h) seq - normal k (0 0 0) map click (1 0 0) k (900 0) k - repeat k (0 0 0) map repeat (1 1 1) k (500 0) k↻ - repeat k (0 0 0) map repeat (1 1 2) k (150 0) k↻ - normal k (0 1 0) map tap (1 1 0) k (300 0) k↻k - normal k (0 2 0) map tap (2 1 0) k (300 0) k↻kk - normal k (0 3 0) map tap (3 1 0) k (300 0) k↻kkk - normal k (0 0 0) map tap (4 1 0) k (300 0) k↻kkkk + normal k (0 0 0) map click k (1 0 0) (900 0) k + repeat k (0 0 0) map repeat k (1 1 1) (500 0) k↻ + repeat k (0 0 0) map repeat k (1 1 2) (150 0) k↻ + normal k (0 1 0) map tap k (1 1 0) (300 0) k↻k + normal k (0 2 0) map tap k (2 1 0) (300 0) k↻kk + normal k (0 3 0) map tap k (3 1 0) (300 0) k↻kkk + normal k (0 0 0) map tap k (4 1 0) (300 0) k↻kkkk (v l s) src type (t h r) key (itv h) seq - normal k (0 0 0) map click (1 0 0) k (900 0) k - repeat k (0 0 0) map repeat (1 1 1) k (500 0) k↻ - repeat k (0 0 0) map repeat (1 1 2) k (150 0) k↻ - normal k (0 1 0) map tap (1 1 0) k (300 0) k↻k - normal k (0 2 0) map tap (2 1 0) k (300 0) k↻kk - normal k (0 2 0) map 1-tap (3 1 0) k (150 0) k↻kkk - normal k (0 0 0) map tap (4 1 0) k (300 0) k↻kkkk + normal k (0 0 0) map click k (1 0 0) (900 0) k + repeat k (0 0 0) map repeat k (1 1 1) (500 0) k↻ + repeat k (0 0 0) map repeat k (1 1 2) (150 0) k↻ + normal k (0 1 0) map tap k (1 1 0) (300 0) k↻k + normal k (0 2 0) map tap k (2 1 0) (300 0) k↻kk + normal k (0 2 0) map 1-tap k (3 1 0) (150 0) k↻kkk + normal k (0 0 0) map tap k (4 1 0) (300 0) k↻kkkk --- CASE 15: : tap hold -> hold hold --- (v l s) src type (t h r) key (itv h) seq - normal k (0 0 0) map click (1 0 0) k (900 0) k - normal k (0 1 0) map tap (2 0 0) k (300 0) kk - normal k (0 2 0) map tap (3 0 0) k (300 0) kkk - repeat k (0 2 0) map repeat (3 1 1) k (500 0) kkk↻ - repeat 4k (0 2 0) map repeat (3 1 2) k (150 0) kkk↻ - normal k (0 3 0) map tap (1 1 0) k (300 0) kkk↻k - normal k (0 4 0) map tap (2 1 0) k (300 0) kkk↻kk - normal k (0 5 0) map tap (3 1 0) k (300 0) kkk↻kkk - normal k (0 0 0) map tap (4 1 0) k (300 0) kkk↻kkkk + normal k (0 0 0) map click k (1 0 0) (900 0) k + normal k (0 1 0) map tap k (2 0 0) (300 0) kk + normal k (0 2 0) map tap k (3 0 0) (300 0) kkk + repeat k (0 2 0) map repeat k (3 1 1) (500 0) kkk↻ + repeat 4k (0 2 0) map repeat k (3 1 2) (150 0) kkk↻ + normal k (0 3 0) map tap k (1 1 0) (300 0) kkk↻k + normal k (0 4 0) map tap k (2 1 0) (300 0) kkk↻kk + normal k (0 5 0) map tap k (3 1 0) (300 0) kkk↻kkk + normal k (0 0 0) map tap k (4 1 0) (300 0) kkk↻kkkk (v l s) src type (t h r) key (itv h) seq - normal k (0 0 0) map click (1 0 0) k (900 0) k - normal k (0 1 0) map tap (2 0 0) k (300 0) kk - repeat k (0 1 0) map repeat (2 1 1) k (500 0) kk↻ - repeat k (0 1 0) map 1-repeat (2 1 1) k (500 0) kk↻ - repeat 2k (0 1 0) map repeat (2 1 2) k (150 0) kk↻ - normal k (0 2 0) map tap (1 1 0) k (300 0) kk↻k - normal k (0 3 0) map tap (2 1 0) k (300 0) kk↻kk - normal k (0 4 0) map tap (3 1 0) k (300 0) kk↻kkk - normal k (0 0 0) map tap (4 1 0) k (300 0) kk↻kkkk + normal k (0 0 0) map click k (1 0 0) (900 0) k + normal k (0 1 0) map tap k (2 0 0) (300 0) kk + repeat k (0 1 0) map repeat k (2 1 1) (500 0) kk↻ + repeat k (0 1 0) map 1-repeat k (2 1 1) (500 0) kk↻ + repeat 2k (0 1 0) map repeat k (2 1 2) (150 0) kk↻ + normal k (0 2 0) map tap k (1 1 0) (300 0) kk↻k + normal k (0 3 0) map tap k (2 1 0) (300 0) kk↻kk + normal k (0 4 0) map tap k (3 1 0) (300 0) kk↻kkk + normal k (0 0 0) map tap k (4 1 0) (300 0) kk↻kkkk --- CASE 18: : hold repeat -> tap repeat --- (v l s) src type (t h r) key (itv h) seq - normal k (0 0 0) map click (1 0 0) k (900 0) k - normal k (0 1 0) map tap (2 0 0) k (300 0) kk - repeat k (0 1 0) map repeat (2 1 1) k (500 0) kk↻ - repeat 2k (0 1 0) map repeat (2 1 2) k (150 0) kk↻ - repeat 2k (0 1 0) map repeat (2 1 3) k (150 0) kk↻ - repeat 2k (0 1 0) map repeat (2 1 4) k (150 0) kk↻ + normal k (0 0 0) map click k (1 0 0) (900 0) k + normal k (0 1 0) map tap k (2 0 0) (300 0) kk + repeat k (0 1 0) map repeat k (2 1 1) (500 0) kk↻ + repeat 2k (0 1 0) map repeat k (2 1 2) (150 0) kk↻ + repeat 2k (0 1 0) map repeat k (2 1 3) (150 0) kk↻ + repeat 2k (0 1 0) map repeat k (2 1 4) (150 0) kk↻ (v l s) src type (t h r) key (itv h) seq - normal k (0 0 0) map click (1 0 0) k (900 0) k - normal k (0 1 0) map tap (2 0 0) k (300 0) kk - normal k (0 2 0) map tap (3 0 0) k (300 0) kkk - normal k (0 0 0) map 1-tap (4 0 0) k (150 0) kkkk - normal k (0 0 0) map 2-tap (5 0 0) k (150 0) kkkkk - repeat k (0 0 0) map 3-repeat (6 0 3) k (150 32) kkkkkk + normal k (0 0 0) map click k (1 0 0) (900 0) k + normal k (0 1 0) map tap k (2 0 0) (300 0) kk + normal k (0 2 0) map tap k (3 0 0) (300 0) kkk + normal k (0 0 0) map 1-tap k (4 0 0) (150 0) kkkk + normal k (0 0 0) map 2-tap k (5 0 0) (150 0) kkkkk + repeat k (0 0 0) map 3-repeat k (6 0 3) (150 0) kkkkkk === DISPLAY === diff --git a/tests/cases/share/out-expected.txt b/tests/cases/share/out-expected.txt index ac377c0..77f4fa4 100644 --- a/tests/cases/share/out-expected.txt +++ b/tests/cases/share/out-expected.txt @@ -3,26 +3,26 @@ --- CASE 6: : count --- (v l s) src type (t h r) key (itv h) seq - normal j (3 0 0) map tap (1 0 0) j ( 0 0) 3j - normal j (3 1 0) map tap (2 0 0) j (300 0) 3jj - repeat 3j (0 0 3) map repeat (2 1 1) j (500 0) 3jj↻ - repeat 3j (0 0 3) map repeat (2 1 2) j (150 0) 3jj↻ - repeat 3j (0 0 3) map repeat (2 1 3) j (150 0) 3jj↻ - normal 3k (0 0 3) map tap (1 1 0) k (300 0) 3jj↻k - normal h (0 0 3) map click (1 0 0) h (900 0) h - normal 3k (0 0 3) map click (1 0 0) k (900 0) k - normal 3k (0 1 3) map tap (2 0 0) k (300 0) kk - repeat 3k (0 1 3) map repeat (2 1 1) k (500 0) kk↻ - repeat 6k (0 1 3) map repeat (2 1 2) k (150 0) kk↻ - repeat 6k (0 1 3) map repeat (2 1 3) k (150 0) kk↻ - normal l (1 0 0) map tap (1 0 0) l ( 0 0) 1l - normal j (0 0 0) map click (1 0 0) j (900 0) j - normal w (13 0 0) map tap (1 0 0) w ( 0 0) j1w - normal w (13 1 0) map tap (2 0 0) w (300 0) j1ww - repeat 13w (0 0 13) map repeat (2 1 1) w (500 0) j1ww↻ - repeat 13w (0 0 13) map repeat (2 1 2) w (150 0) j1ww↻ - normal 13b (0 0 13) map tap (1 1 0) b (150 0) j1ww↻b - normal w (0 0 0) map tap (1 1 0) w (300 0) j1ww↻bw + normal j (3 0 0) map tap j (1 0 0) ( 0 0) 3j + normal j (3 1 0) map tap j (2 0 0) (300 0) 3jj + repeat 3j (0 0 3) map repeat j (2 1 1) (500 0) 3jj↻ + repeat 3j (0 0 3) map repeat j (2 1 2) (150 0) 3jj↻ + repeat 3j (0 0 3) map repeat j (2 1 3) (150 0) 3jj↻ + normal 3k (0 0 3) map tap k (1 1 0) (300 0) 3jj↻k + normal h (0 0 3) map click h (1 0 0) (900 0) h + normal 3k (0 0 3) map click k (1 0 0) (900 0) k + normal 3k (0 1 3) map tap k (2 0 0) (300 0) kk + repeat 3k (0 1 3) map repeat k (2 1 1) (500 0) kk↻ + repeat 6k (0 1 3) map repeat k (2 1 2) (150 0) kk↻ + repeat 6k (0 1 3) map repeat k (2 1 3) (150 0) kk↻ + normal l (1 0 0) map tap l (1 0 0) ( 0 0) 1l + normal j (0 0 0) map click j (1 0 0) (900 0) j + normal w (13 0 0) map tap w (1 0 0) ( 0 0) j1w + normal w (13 1 0) map tap w (2 0 0) (300 0) j1ww + repeat 13w (0 0 13) map repeat w (2 1 1) (500 0) j1ww↻ + repeat 13w (0 0 13) map repeat w (2 1 2) (150 0) j1ww↻ + normal 13b (0 0 13) map tap b (1 1 0) (150 0) j1ww↻b + normal w (0 0 0) map tap w (1 1 0) (300 0) j1ww↻bw === DISPLAY ===