5485 - promote SubX to top-level

1 files changed, 76 insertions, 1 deletions

diff --git a/vimrc.vim b/vimrc.vim
index c63a8941..80ec5a5f 100644
--- a/vimrc.vim
+++ b/vimrc.vim
@@ -17,10 +17,14 @@ function! HighlightTangledFile()
   highlight traceAbsent ctermfg=darkred
   syntax match tangleScenarioSetup /^\s*% .*/ | highlight link tangleScenarioSetup SpecialChar
   highlight Special ctermfg=160
+
+  syntax match subxString %"[^"]*"% | highlight link subxString Constant
+  " match globals but not registers like 'EAX'
+  syntax match subxGlobal %\<[A-Z][a-z0-9_-]*\>% | highlight link subxGlobal SpecialChar
 endfunction
 augroup LocalVimrc
   autocmd BufRead,BufNewFile *.cc call HighlightTangledFile()
-  autocmd BufRead,BufNewFile *.mu set ft=mu
+  autocmd BufRead,BufNewFile *.subx set ft=subx
 augroup END
 
 " Scenarios considered:
@@ -29,3 +33,74 @@ augroup END
 "   starting vim or opening a buffer without a file name (ok to do nothing)
 "   opening a second file in a new or existing window (shouldn't mess up existing highlighting)
 "   reloading an existing file (shouldn't mess up existing highlighting)
+
+" assumes CWD is subx/
+command! -nargs=1 E call EditSubx("edit", <f-args>)
+if exists("&splitvertical")
+  command! -nargs=1 S call EditSubx("vert split", <f-args>)
+  command! -nargs=1 H call EditSubx("hor split", <f-args>)
+else
+  command! -nargs=1 S call EditSubx("vert split", <f-args>)
+  command! -nargs=1 H call EditSubx("split", <f-args>)
+endif
+
+function! EditSubx(cmd, arg)
+  exec "silent! " . a:cmd . " " . SubxPath(a:arg)
+endfunction
+
+function! SubxPath(arg)
+  if a:arg =~ "^ex"
+    return "examples/" . a:arg . ".subx"
+  else
+    return "apps/" . a:arg . ".subx"
+  endif
+endfunction
+
+" we often want to crib lines of machine code from other files
+function! GrepSubX(regex)
+  " https://github.com/mtth/scratch.vim
+  Scratch!
+  silent exec "r !grep -h '".a:regex."' *.subx */*.subx"
+endfunction
+command! -nargs=1 G call GrepSubX(<q-args>)
+
+if exists("&splitvertical")
+  command! -nargs=0 P hor split opcodes
+else
+  command! -nargs=0 P split opcodes
+endif
+
+" useful for inspecting just the control flow in a trace
+" see https://github.com/akkartik/mu/blob/master/subx/Readme.md#a-few-hints-for-debugging
+" the '-a' is because traces can sometimes contain unprintable characters that bother grep
+command! -nargs=0 L exec "%!grep -a label |grep -v clear-stream:loop"
+
+" run test cursor around cursor
+"   if test fails, open trace in split window
+"   if test passes, just show output and wait for <CR>
+"   don't move cursor in original window
+" this solution is unfortunate, but seems forced:
+"   can't put initial cursor movement inside function because we rely on <C-r><C-w> to grab word at cursor
+"   can't put final cursor movement out of function because that disables the wait for <CR> prompt; function must be final operation of map
+"   can't avoid the function because that disables the wait for <CR> prompt
+" known issue:
+"   cursor on '#' causes error
+noremap <Leader>t {j0:call RunTestMoveCursor("<C-r><C-w>")<CR>
+function RunTestMoveCursor(arg)
+  exec "!run_one_test.sh ".expand("%")." ".a:arg
+  exec "normal \<C-o>"
+endfunction
+function RunTestMoveCursorAndMaybeOpenTrace(arg)
+  exec "!run_one_test.sh ".expand("%")." ".a:arg
+  exec "normal \<C-o>"
+  if v:shell_error
+    noautocmd vertical split last_run
+  endif
+endfunction
+
+set switchbuf=useopen
+if exists("&splitvertical")
+  command! -nargs=0 T badd last_run | sbuffer last_run
+else
+  command! -nargs=0 T badd last_run | vert sbuffer last_run
+endif