diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2021-05-19 01:15:35 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2021-05-19 01:15:35 -0700 |
| commit | 3fc03a98e529c17b91eff44f6317e91b3923cce3 (patch) | |
| tree | 6429f11fa728e3d69151d5bce6ba1aef5212994d /shell/trace.mu | |
| parent | 91b7b0be73b88c38e11e21501e813a6b7a048f45 (diff) | |
| download | mu-3fc03a98e529c17b91eff44f6317e91b3923cce3.tar.gz | |
shell: start traces at depth 1 rather than 0
We're going to carve out depth 0 for errors.
Diffstat (limited to 'shell/trace.mu')
| -rw-r--r-- | shell/trace.mu | 116 |
1 files changed, 59 insertions, 57 deletions
diff --git a/shell/trace.mu b/shell/trace.mu index dfe82638..ddf66fa2 100644 --- a/shell/trace.mu +++ b/shell/trace.mu @@ -36,6 +36,8 @@ fn initialize-trace _self: (addr trace), capacity: int, visible-capacity: int { var self/esi: (addr trace) <- copy _self compare self, 0 break-if-= + var dest/eax: (addr int) <- get self, curr-depth + copy-to *dest, 1 # 0 is the error depth var trace-ah/eax: (addr handle array trace-line) <- get self, data populate trace-ah, capacity var visible-ah/eax: (addr handle array trace-line) <- get self, visible @@ -1036,9 +1038,9 @@ fn test-expand-within-trace { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-expand-within-trace/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-expand-within-trace/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-expand-within-trace/expand-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-expand-within-trace/expand-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-expand-within-trace/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-expand-within-trace/expand-1/cursor" check-screen-row screen, 2/y, " ", "F - test-expand-within-trace/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-expand-within-trace/expand-2/cursor" @@ -1067,7 +1069,7 @@ fn test-trace-expand-skips-lower-depth { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-expand-skips-lower-depth/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-expand-skips-lower-depth/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-expand-skips-lower-depth/expand-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-expand-skips-lower-depth/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-expand-skips-lower-depth/expand-1/cursor" @@ -1100,12 +1102,12 @@ fn test-trace-expand-continues-past-lower-depth { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-expand-continues-past-lower-depth/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-expand-continues-past-lower-depth/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-expand-continues-past-lower-depth/expand-0/cursor" # TODO: might be too wasteful to show every place where lines are hidden check-screen-row screen, 1/y, "... ", "F - test-trace-expand-continues-past-lower-depth/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-expand-continues-past-lower-depth/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-expand-continues-past-lower-depth/expand-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-expand-continues-past-lower-depth/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-expand-continues-past-lower-depth/expand-2/cursor" } @@ -1138,11 +1140,11 @@ fn test-trace-expand-stops-at-higher-depth { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 8/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1.1 ", "F - test-trace-expand-stops-at-higher-depth/expand-0" + check-screen-row screen, 0/y, "1 line 1.1 ", "F - test-trace-expand-stops-at-higher-depth/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||||| ", "F - test-trace-expand-stops-at-higher-depth/expand-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-expand-stops-at-higher-depth/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-expand-stops-at-higher-depth/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 1.2 ", "F - test-trace-expand-stops-at-higher-depth/expand-2" + check-screen-row screen, 2/y, "1 line 1.2 ", "F - test-trace-expand-stops-at-higher-depth/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-expand-stops-at-higher-depth/expand-2/cursor" check-screen-row screen, 3/y, "... ", "F - test-trace-expand-stops-at-higher-depth/expand-3" check-background-color-in-screen-row screen, 7/bg=cursor, 3/y, " ", "F - test-trace-expand-stops-at-higher-depth/expand-3/cursor" @@ -1175,32 +1177,32 @@ fn test-trace-expand-twice { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-expand-twice/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-expand-twice/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-expand-twice/expand-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-expand-twice/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-expand-twice/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-expand-twice/expand-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-expand-twice/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-expand-twice/expand-2/cursor" # cursor down edit-trace t, 0x6a/j # hack: we need to render here to make this test pass; we're mixing state management with rendering var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-expand-twice/down-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-expand-twice/down-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-expand-twice/down-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-expand-twice/down-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, "||| ", "F - test-trace-expand-twice/down-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-expand-twice/down-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-expand-twice/down-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-expand-twice/down-2/cursor" # expand again edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-expand-twice/expand2-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-expand-twice/expand2-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-expand-twice/expand2-0/cursor" - check-screen-row screen, 1/y, "1 line 1.1 ", "F - test-trace-expand-twice/expand2-1" + check-screen-row screen, 1/y, "2 line 1.1 ", "F - test-trace-expand-twice/expand2-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, "|||||||||| ", "F - test-trace-expand-twice/expand2-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-expand-twice/expand2-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-expand-twice/expand2-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-expand-twice/expand2-2/cursor" } @@ -1227,22 +1229,22 @@ fn test-trace-refresh-cursor { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-refresh-cursor/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-refresh-cursor/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-refresh-cursor/expand-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-refresh-cursor/expand-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-refresh-cursor/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-refresh-cursor/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-refresh-cursor/expand-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-refresh-cursor/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-refresh-cursor/expand-2/cursor" # cursor down edit-trace t, 0x6a/j edit-trace t, 0x6a/j var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-refresh-cursor/down-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-refresh-cursor/down-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-refresh-cursor/down-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-refresh-cursor/down-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-refresh-cursor/down-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-refresh-cursor/down-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-refresh-cursor/down-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-refresh-cursor/down-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, "|||||||| ", "F - test-trace-refresh-cursor/down-2/cursor" # recreate trace clear-trace t @@ -1251,11 +1253,11 @@ fn test-trace-refresh-cursor { trace-text t, "l", "line 3" var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # cursor remains unchanged - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-refresh-cursor/refresh-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-refresh-cursor/refresh-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-refresh-cursor/refresh-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-refresh-cursor/refresh-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-refresh-cursor/refresh-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-refresh-cursor/refresh-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-refresh-cursor/refresh-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-refresh-cursor/refresh-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, "|||||||| ", "F - test-trace-refresh-cursor/refresh-2/cursor" } @@ -1282,22 +1284,22 @@ fn test-trace-preserve-cursor-on-refresh { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-preserve-cursor-on-refresh/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-preserve-cursor-on-refresh/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-preserve-cursor-on-refresh/expand-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-preserve-cursor-on-refresh/expand-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-preserve-cursor-on-refresh/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-preserve-cursor-on-refresh/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-preserve-cursor-on-refresh/expand-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-preserve-cursor-on-refresh/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-preserve-cursor-on-refresh/expand-2/cursor" # cursor down edit-trace t, 0x6a/j edit-trace t, 0x6a/j var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-preserve-cursor-on-refresh/down-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-preserve-cursor-on-refresh/down-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-preserve-cursor-on-refresh/down-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-preserve-cursor-on-refresh/down-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-preserve-cursor-on-refresh/down-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-preserve-cursor-on-refresh/down-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-preserve-cursor-on-refresh/down-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-preserve-cursor-on-refresh/down-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, "|||||||| ", "F - test-trace-preserve-cursor-on-refresh/down-2/cursor" # recreate trace with slightly different lines clear-trace t @@ -1306,11 +1308,11 @@ fn test-trace-preserve-cursor-on-refresh { trace-text t, "l", "line 3" # cursor line is unchanged var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # cursor remains unchanged - check-screen-row screen, 0/y, "0 line 4 ", "F - test-trace-preserve-cursor-on-refresh/refresh-0" + check-screen-row screen, 0/y, "1 line 4 ", "F - test-trace-preserve-cursor-on-refresh/refresh-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-preserve-cursor-on-refresh/refresh-0/cursor" - check-screen-row screen, 1/y, "0 line 5 ", "F - test-trace-preserve-cursor-on-refresh/refresh-1" + check-screen-row screen, 1/y, "1 line 5 ", "F - test-trace-preserve-cursor-on-refresh/refresh-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-preserve-cursor-on-refresh/refresh-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-preserve-cursor-on-refresh/refresh-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-preserve-cursor-on-refresh/refresh-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, "|||||||| ", "F - test-trace-preserve-cursor-on-refresh/refresh-2/cursor" } @@ -1337,22 +1339,22 @@ fn test-trace-keep-cursor-visible-on-refresh { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-keep-cursor-visible-on-refresh/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-keep-cursor-visible-on-refresh/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-keep-cursor-visible-on-refresh/expand-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-keep-cursor-visible-on-refresh/expand-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-keep-cursor-visible-on-refresh/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-keep-cursor-visible-on-refresh/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-keep-cursor-visible-on-refresh/expand-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-keep-cursor-visible-on-refresh/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-keep-cursor-visible-on-refresh/expand-2/cursor" # cursor down edit-trace t, 0x6a/j edit-trace t, 0x6a/j var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-keep-cursor-visible-on-refresh/down-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-keep-cursor-visible-on-refresh/down-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-keep-cursor-visible-on-refresh/down-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-keep-cursor-visible-on-refresh/down-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-keep-cursor-visible-on-refresh/down-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-keep-cursor-visible-on-refresh/down-1/cursor" - check-screen-row screen, 2/y, "0 line 3 ", "F - test-trace-keep-cursor-visible-on-refresh/down-2" + check-screen-row screen, 2/y, "1 line 3 ", "F - test-trace-keep-cursor-visible-on-refresh/down-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, "|||||||| ", "F - test-trace-keep-cursor-visible-on-refresh/down-2/cursor" # recreate trace with entirely different lines clear-trace t @@ -1396,11 +1398,11 @@ fn test-trace-collapse-at-top { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse-at-top/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse-at-top/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-collapse-at-top/expand-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-collapse-at-top/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-collapse-at-top/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-collapse-at-top/expand-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-collapse-at-top/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-collapse-at-top/expand-2/cursor" # collapse edit-trace t, 8/backspace @@ -1437,9 +1439,9 @@ fn test-trace-collapse { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-collapse/expand-0/cursor" - check-screen-row screen, 1/y, "0 line 2 ", "F - test-trace-collapse/expand-1" + check-screen-row screen, 1/y, "1 line 2 ", "F - test-trace-collapse/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-collapse/expand-1/cursor" # cursor down edit-trace t, 0x6a/j @@ -1481,11 +1483,11 @@ fn test-trace-collapse-skips-invisible-lines { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # two visible lines with an invisible line in between - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse-skips-invisible-lines/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse-skips-invisible-lines/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-collapse-skips-invisible-lines/expand-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-collapse-skips-invisible-lines/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-collapse-skips-invisible-lines/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-collapse-skips-invisible-lines/expand-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-collapse-skips-invisible-lines/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-collapse-skips-invisible-lines/expand-2/cursor" # cursor down to second visible line edit-trace t, 0x6a/j @@ -1531,11 +1533,11 @@ fn test-trace-collapse-two-levels { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # two visible lines with an invisible line in between - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse-two-levels/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse-two-levels/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-collapse-two-levels/expand-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-collapse-two-levels/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-collapse-two-levels/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-collapse-two-levels/expand-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-collapse-two-levels/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-collapse-two-levels/expand-2/cursor" # cursor down to ellipses edit-trace t, 0x6a/j @@ -1544,11 +1546,11 @@ fn test-trace-collapse-two-levels { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 4/ymax, 1/show-cursor # two visible lines with an invisible line in between - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse-two-levels/expand2-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse-two-levels/expand2-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-collapse-two-levels/expand2-0/cursor" - check-screen-row screen, 1/y, "1 line 1.1 ", "F - test-trace-collapse-two-levels/expand2-1" + check-screen-row screen, 1/y, "2 line 1.1 ", "F - test-trace-collapse-two-levels/expand2-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, "|||||||||| ", "F - test-trace-collapse-two-levels/expand2-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-collapse-two-levels/expand2-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-collapse-two-levels/expand2-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-collapse-two-levels/expand2-2/cursor" # cursor down to second visible line edit-trace t, 0x6a/j @@ -1596,11 +1598,11 @@ fn test-trace-collapse-nested-level { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 8/ymax, 1/show-cursor # two visible lines with an invisible line in between - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse-nested-level/expand-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse-nested-level/expand-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, "|||||||| ", "F - test-trace-collapse-nested-level/expand-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-collapse-nested-level/expand-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-collapse-nested-level/expand-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-collapse-nested-level/expand-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-collapse-nested-level/expand-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-collapse-nested-level/expand-2/cursor" check-screen-row screen, 3/y, "... ", "F - test-trace-collapse-nested-level/expand-3" check-background-color-in-screen-row screen, 7/bg=cursor, 3/y, " ", "F - test-trace-collapse-nested-level/expand-3/cursor" @@ -1615,15 +1617,15 @@ fn test-trace-collapse-nested-level { edit-trace t, 0xa/enter var y/ecx: int <- render-trace screen, t, 0/xmin, 0/ymin, 0x10/xmax, 8/ymax, 1/show-cursor # two visible lines with an invisible line in between - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse-nested-level/expand2-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse-nested-level/expand2-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-collapse-nested-level/expand2-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-collapse-nested-level/expand2-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-collapse-nested-level/expand2-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-collapse-nested-level/expand2-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-collapse-nested-level/expand2-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, " ", "F - test-trace-collapse-nested-level/expand2-2/cursor" - check-screen-row screen, 3/y, "1 line 2.1 ", "F - test-trace-collapse-nested-level/expand2-3" + check-screen-row screen, 3/y, "2 line 2.1 ", "F - test-trace-collapse-nested-level/expand2-3" check-background-color-in-screen-row screen, 7/bg=cursor, 3/y, "|||||||||| ", "F - test-trace-collapse-nested-level/expand2-3/cursor" - check-screen-row screen, 4/y, "1 line 2.2 ", "F - test-trace-collapse-nested-level/expand2-4" + check-screen-row screen, 4/y, "2 line 2.2 ", "F - test-trace-collapse-nested-level/expand2-4" check-background-color-in-screen-row screen, 7/bg=cursor, 4/y, " ", "F - test-trace-collapse-nested-level/expand2-4/cursor" # collapse edit-trace t, 8/backspace @@ -1633,11 +1635,11 @@ fn test-trace-collapse-nested-level { check-ints-equal y, 4, "F - test-trace-collapse-nested-level/post-0/y" var cursor-y/eax: (addr int) <- get t, cursor-y check-ints-equal *cursor-y, 2, "F - test-trace-collapse-nested-level/post-0/cursor-y" - check-screen-row screen, 0/y, "0 line 1 ", "F - test-trace-collapse-nested-level/post-0" + check-screen-row screen, 0/y, "1 line 1 ", "F - test-trace-collapse-nested-level/post-0" check-background-color-in-screen-row screen, 7/bg=cursor, 0/y, " ", "F - test-trace-collapse-nested-level/post-0/cursor" check-screen-row screen, 1/y, "... ", "F - test-trace-collapse-nested-level/post-1" check-background-color-in-screen-row screen, 7/bg=cursor, 1/y, " ", "F - test-trace-collapse-nested-level/post-1/cursor" - check-screen-row screen, 2/y, "0 line 2 ", "F - test-trace-collapse-nested-level/post-2" + check-screen-row screen, 2/y, "1 line 2 ", "F - test-trace-collapse-nested-level/post-2" check-background-color-in-screen-row screen, 7/bg=cursor, 2/y, "|||||||| ", "F - test-trace-collapse-nested-level/post-2/cursor" check-screen-row screen, 3/y, "... ", "F - test-trace-collapse-nested-level/post-3" check-background-color-in-screen-row screen, 7/bg=cursor, 3/y, " ", "F - test-trace-collapse-nested-level/post-3/cursor" |