• branch=trunk inherited from [dc67bca1f3]
• sym-trunk inherited from [dc67bca1f3]

Modified autopsy.rx from [7a43bcf096b6e795] to [36f0643ab5237c2f].

@@ -110,17 +110,17 @@
   : rows @ch 2 - ;
   : cols @cw 1 - ;
   : handle
     cols [ '- putc ] times cr
     getc
-      [ 'i = ] [ drop x --        ] when
-      [ 'k = ] [ drop x ++        ] when
-      [ 'j = ] [ drop rows -x     ] when
-      [ 'l = ] [ drop rows +x     ] when
-      [ '? = ] [ drop help        ] when
-      [ '1 = ] [ drop goToAddress ] when
-      [ 'z = ] [ drop more? off   ] when
+      [ 'i = ] [ x --        ] whend
+      [ 'k = ] [ x ++        ] whend
+      [ 'j = ] [ rows -x     ] whend
+      [ 'l = ] [ rows +x     ] whend
+      [ '? = ] [ help        ] whend
+      [ '1 = ] [ goToAddress ] whend
+      [ 'z = ] [ more? off   ] whend
     drop ;
   : browse     (  - )
     [ clear @x rows &decompile times drop handle @more? ] while ;
   : getAddress ( "- )
     getToken dup find [ nip @d->xt ] [ drop toNumber ] if ;
@@ -207,32 +207,32 @@
 
   : output  port[ 1 = [ putc ] ifTrue 0 ]port ;
   2 register: output
 
   : files
-    [ -1 = ] [ drop [ >image ] dip ^files'open ] when
-    [ -2 = ] [ drop ^files'read   ] when
-    [ -3 = ] [ drop ^files'write  ] when
-    [ -4 = ] [ drop ^files'close  ] when
-    [ -5 = ] [ drop ^files'pos    ] when
-    [ -6 = ] [ drop ^files'seek   ] when
-    [ -7 = ] [ drop ^files'size   ] when
-    [ -8 = ] [ drop >image ^files'delete     ] when
-    [  1 = ] [ drop "retroImage" saveImage 0 ] when
-    [  2 = ] [ drop >image :include 0    ] when
+    [ -1 = ] [ [ >image ] dip ^files'open ] whend
+    [ -2 = ] [ ^files'read   ] whend
+    [ -3 = ] [ ^files'write  ] whend
+    [ -4 = ] [ ^files'close  ] whend
+    [ -5 = ] [ ^files'pos    ] whend
+    [ -6 = ] [ ^files'seek   ] whend
+    [ -7 = ] [ ^files'size   ] whend
+    [ -8 = ] [ >image ^files'delete     ] whend
+    [  1 = ] [ "retroImage" saveImage 0 ] whend
+    [  2 = ] [ >image :include 0    ] whend
     drop 0 ;
 
   : vm-files port[ files ]port ;
   4 register: vm-files
 
   : query
-    [  -1 = ] [ drop 32768                ] when
-    [  -5 = ] [ drop depth                ] when
-    [  -6 = ] [ drop size                 ] when
-    [  -8 = ] [ drop time                 ] when
-    [  -9 = ] [ drop 32768 !ip 0          ] when
-    [ -10 = ] [ drop &>image bi@ getEnv 0 ] when
+    [  -1 = ] [ 32768                ] whend
+    [  -5 = ] [ depth                ] whend
+    [  -6 = ] [ size                 ] whend
+    [  -8 = ] [ time                 ] whend
+    [  -9 = ] [ 32768 !ip 0          ] whend
+    [ -10 = ] [ &>image bi@ getEnv 0 ] whend
   drop 0 ( default ) ;
 
   : vm-info port[ query ]port ;
   5 register: vm-info