diff options
| -rw-r--r-- | trace.arc.t | 86 | ||||
| -rw-r--r-- | trace.mu | 52 |
2 files changed, 138 insertions, 0 deletions
diff --git a/trace.arc.t b/trace.arc.t index 1ae0ed39..2614e722 100644 --- a/trace.arc.t +++ b/trace.arc.t @@ -395,3 +395,89 @@ schedule: done with routine") (prn "F - process-key: expanding a line continues to print lines after it")) (reset) +(new-trace "process-key-skip-expanded") +(add-code:readfile "trace.mu") +(add-code + '((function! main [ + (default-space:space-address <- new space:literal 30:literal/capacity) + (x:string-address <- new +"schedule: main +run: main 0: (((1 integer)) <- ((copy)) ((1 literal))) +run: main 0: 1 => ((1 integer)) +mem: ((1 integer)): 1 <= 1 +run: main 1: (((2 integer)) <- ((copy)) ((3 literal))) +run: main 1: 3 => ((2 integer)) +mem: ((2 integer)): 2 <= 3 +run: main 2: (((3 integer)) <- ((add)) ((1 integer)) ((2 integer))) +mem: ((1 integer)) => 1 +mem: ((2 integer)) => 3 +run: main 2: 4 => ((3 integer)) +mem: ((3 integer)): 3 <= 4 +schedule: done with routine") + (s:stream-address <- init-stream x:string-address) + (1:instruction-trace-address-array-address/raw <- parse-traces s:stream-address) + (len:integer <- length 1:instruction-trace-address-array-address/raw/deref) + (2:terminal-address/raw <- init-fake-terminal 70:literal 15:literal) + ; position the cursor away from top of screen + (cursor-down 2:terminal-address/raw) + (cursor-down 2:terminal-address/raw) + (3:space-address/raw <- screen-state 1:instruction-trace-address-array-address/raw) + ; draw trace + (print-traces-collapsed 3:space-address/raw/screen-state 2:terminal-address/raw 1:instruction-trace-address-array-address/raw) + ; expand penultimate line, then move one line down and draw cursor + (s:string-address <- new "kk\nj") + (k:keyboard-address <- init-keyboard s:string-address) + (process-key 3:space-address/raw/screen-state k:keyboard-address 2:terminal-address/raw 1:instruction-trace-address-array-address/raw) + (process-key 3:space-address/raw/screen-state k:keyboard-address 2:terminal-address/raw 1:instruction-trace-address-array-address/raw) + (process-key 3:space-address/raw/screen-state k:keyboard-address 2:terminal-address/raw 1:instruction-trace-address-array-address/raw) + (process-key 3:space-address/raw/screen-state k:keyboard-address 2:terminal-address/raw 1:instruction-trace-address-array-address/raw) + (replace-character 2:terminal-address/raw ((#\* literal))) + (4:string-address/raw <- get 2:terminal-address/raw/deref data:offset) + ]))) +;? (set dump-trace*) ;? 1 +(run 'main) +(each routine completed-routines* + (awhen rep.routine!error + (prn "error - " it))) +; cursor should be at next top-level 'run' line +(when (~screen-contains memory*.4 70 + (+ " " + " " + "+ main/ 0 : (((1 integer)) <- ((copy)) ((1 literal))) " + "+ main/ 0 : 1 => ((1 integer)) " + "+ main/ 1 : (((2 integer)) <- ((copy)) ((3 literal))) " + "+ main/ 1 : 3 => ((2 integer)) " + "- main/ 2 : (((3 integer)) <- ((add)) ((1 integer)) ((2 integer))) " + " mem : ((1 integer)) => 1 " + " mem : ((2 integer)) => 3 " + "* main/ 2 : 4 => ((3 integer)) ")) + (prn "F - process-key: navigation moves between top-level lines only")) +(run-code main2 + (default-space:space-address <- new space:literal 30:literal/capacity) + ; reset previous cursor + (replace-character 2:terminal-address/raw ((#\+ literal))) + ; move cursor back up one line + (s:string-address <- new "k") + (k:keyboard-address <- init-keyboard s:string-address) + (process-key 3:space-address/raw/screen-state k:keyboard-address 2:terminal-address/raw 1:instruction-trace-address-array-address/raw) + ; show cursor + (replace-character 2:terminal-address/raw ((#\* literal))) + ) +(each routine completed-routines* + (awhen rep.routine!error + (prn "error - " it))) +; cursor should be back at the top of the expanded line +(when (~screen-contains memory*.4 70 + (+ " " + " " + "+ main/ 0 : (((1 integer)) <- ((copy)) ((1 literal))) " + "+ main/ 0 : 1 => ((1 integer)) " + "+ main/ 1 : (((2 integer)) <- ((copy)) ((3 literal))) " + "+ main/ 1 : 3 => ((2 integer)) " + "* main/ 2 : (((3 integer)) <- ((add)) ((1 integer)) ((2 integer))) " + " mem : ((1 integer)) => 1 " + " mem : ((2 integer)) => 3 " + "+ main/ 2 : 4 => ((3 integer)) ")) + (prn "F - process-key: navigation moves between top-level lines only")) + +(reset) diff --git a/trace.mu b/trace.mu index 1b28804c..f3f37673 100644 --- a/trace.mu +++ b/trace.mu @@ -210,6 +210,16 @@ (add-line screen-state:space-address screen:terminal-address) ]) +(function instruction-trace-num-children [ + (default-space:space-address <- new space:literal 30:literal) + (traces:instruction-trace-address-array-address <- next-input) + (index:integer <- next-input) + (tr:instruction-trace-address <- index traces:instruction-trace-address-array-address/deref index:integer) + (tr-children:trace-address-array-address <- get tr:instruction-trace-address/deref children:offset) + (n:integer <- length tr-children:instruction-trace-address-array-address/deref) + (reply n:integer) +]) + ;; data structure (function screen-state [ (default-space:space-address <- new space:literal 30:literal/capacity) @@ -219,6 +229,7 @@ (cursor-row:integer <- copy 0:literal) (max-rows:integer <- copy 0:literal) ; area of the screen we're responsible for (height:integer <- copy 0:literal) ; part of it that currently has text + (expanded-row:integer <- copy -1:literal) (reply default-space:space-address) ]) @@ -226,6 +237,25 @@ (default-space:space-address <- new space:literal 30:literal/capacity) (0:space-address/names:screen-state <- next-input) (screen:terminal-address <- next-input) + ; if at expanded, skip past nested lines + { begin + (no-expanded?:boolean <- less-than expanded-row:integer/space:1 0:literal) + (break-if no-expanded?:boolean) + (at-expanded?:boolean <- equal cursor-row:integer/space:1 expanded-row:integer/space:1) + (break-unless at-expanded?:boolean) + (n:integer <- instruction-trace-num-children traces:instruction-trace-address-array-address/space:1 expanded-row:integer/space:1) + (n:integer <- add n:integer 1:literal) + (i:integer <- copy 0:literal) + { begin + (done?:boolean <- greater-or-equal i:integer n:integer) + (break-if done?:boolean) + (cursor-row:integer/space:1 <- add cursor-row:integer/space:1 1:literal) + (cursor-down screen:terminal-address) + (i:integer <- add i:integer 1:literal) + (loop) + } + (reply) + } ; if not at bottom, move cursor down { begin (at-bottom?:boolean <- greater-or-equal cursor-row:integer/space:1 height:integer/space:1) @@ -239,6 +269,27 @@ (default-space:space-address <- new space:literal 30:literal/capacity) (0:space-address/names:screen-state <- next-input) (screen:terminal-address <- next-input) + ; if at expanded, skip past nested lines + { begin + (no-expanded?:boolean <- less-than expanded-row:integer/space:1 0:literal) + (break-if no-expanded?:boolean) + (n:integer <- instruction-trace-num-children traces:instruction-trace-address-array-address/space:1 expanded-row:integer/space:1) + (n:integer <- add n:integer 1:literal) + (cursor-row-below-expanded:integer <- add expanded-row:integer/space:1 n:integer) + (just-below-expanded?:boolean <- equal cursor-row:integer/space:1 cursor-row-below-expanded:integer) + (break-unless just-below-expanded?:boolean) + (i:integer <- copy 0:literal) + { begin + (done?:boolean <- greater-or-equal i:integer n:integer) + (break-if done?:boolean) + (cursor-row:integer/space:1 <- subtract cursor-row:integer/space:1 1:literal) + (cursor-up screen:terminal-address) + (i:integer <- add i:integer 1:literal) + (loop) + } + (reply) + } + ; if not at top, move cursor up { begin (at-top?:boolean <- lesser-or-equal cursor-row:integer/space:1 0:literal) (break-if at-top?:boolean) @@ -359,6 +410,7 @@ (original-row:integer <- copy cursor-row:integer/space:1) (tr:instruction-trace-address <- index traces:instruction-trace-address-array-address/space:1/deref cursor-row:integer/space:1) ; assumes cursor row is a valid index into traces, ie no expanded rows (print-instruction-trace screen:terminal-address tr:instruction-trace-address 0:space-address/screen-state) + (expanded-row:integer/space:1 <- copy original-row:integer) (next-row:integer <- add original-row:integer 1:literal) (print-traces-collapsed-from 0:space-address/screen-state screen:terminal-address next-row:integer) (back-to 0:space-address/screen-state screen:terminal-address original-row:integer) |