Author: wmb Date: Mon Mar 19 21:05:21 2012 New Revision: 2899 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2899
Log: Eliminated the last vestiges of the long-obsolete p" format.
Modified: cpu/arm/mmp2/fw.bth cpu/arm/olpc/prefw.fth cpu/x86/pc/lxdevel/fw.bth cpu/x86/pc/neptune/fw.bth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/fw.bth forth/kernel/kernel.fth forth/lib/decomp.fth forth/lib/editcmd.fth ofw/core/ofwcore.fth
Modified: cpu/arm/mmp2/fw.bth ============================================================================== --- cpu/arm/mmp2/fw.bth Mon Mar 19 20:46:09 2012 (r2898) +++ cpu/arm/mmp2/fw.bth Mon Mar 19 21:05:21 2012 (r2899) @@ -478,13 +478,6 @@ quit ;
-\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix -also hidden also keys-forth definitions -warning @ warning off -: esc-o key lastchar ! [""] esc-[ do-command ; -warning ! -previous previous definitions - tag-file @ fclose tag-file off
.( --- Saving fw.dic ...)
Modified: cpu/arm/olpc/prefw.fth ============================================================================== --- cpu/arm/olpc/prefw.fth Mon Mar 19 20:46:09 2012 (r2898) +++ cpu/arm/olpc/prefw.fth Mon Mar 19 21:05:21 2012 (r2899) @@ -218,13 +218,6 @@ [then] devalias nfs net//obp-tftp:last//nfs
-\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix -also hidden also keys-forth definitions -warning @ warning off -: esc-o key lastchar ! [""] esc-[ do-command ; -warning ! -previous previous definitions - \ GUI false value gui-safeboot?
Modified: cpu/x86/pc/lxdevel/fw.bth ============================================================================== --- cpu/x86/pc/lxdevel/fw.bth Mon Mar 19 20:46:09 2012 (r2898) +++ cpu/x86/pc/lxdevel/fw.bth Mon Mar 19 21:05:21 2012 (r2899) @@ -488,13 +488,6 @@ " begin-select /display 3 my-space 4 + config-w! unselect" evaluate ;
-\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix -also hidden also keys-forth definitions -warning @ warning off -: esc-o key lastchar ! [""] esc-[ do-command ; -warning ! -previous previous definitions - .( --- Saving fw.dic ...) " fw.dic" $save-forth cr
Modified: cpu/x86/pc/neptune/fw.bth ============================================================================== --- cpu/x86/pc/neptune/fw.bth Mon Mar 19 20:46:09 2012 (r2898) +++ cpu/x86/pc/neptune/fw.bth Mon Mar 19 21:05:21 2012 (r2899) @@ -438,13 +438,6 @@ quit ;
-\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix -also hidden also keys-forth definitions -warning @ warning off -: esc-o key lastchar ! [""] esc-[ do-command ; -warning ! -previous previous definitions - tag-file @ fclose tag-file off
.( --- Saving fw.dic ...)
Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Mon Mar 19 20:46:09 2012 (r2898) +++ cpu/x86/pc/olpc/fw.bth Mon Mar 19 21:05:21 2012 (r2899) @@ -659,13 +659,6 @@
fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth \ Mass storage speed test
-\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix -also hidden also keys-forth definitions -warning @ warning off -: esc-o key lastchar ! [""] esc-[ do-command ; -warning ! -previous previous definitions - tag-file @ fclose tag-file off
.( --- Saving fw.dic ...)
Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Mon Mar 19 20:46:09 2012 (r2898) +++ cpu/x86/pc/olpc/via/fw.bth Mon Mar 19 21:05:21 2012 (r2899) @@ -756,13 +756,6 @@
fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth \ Mass storage speed test
-\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix -also hidden also keys-forth definitions -warning @ warning off -: esc-o key lastchar ! [""] esc-[ do-command ; -warning ! -previous previous definitions - tag-file @ fclose tag-file off
.( --- Saving fw.dic ...)
Modified: forth/kernel/kernel.fth ============================================================================== --- forth/kernel/kernel.fth Mon Mar 19 20:46:09 2012 (r2898) +++ forth/kernel/kernel.fth Mon Mar 19 21:05:21 2012 (r2899) @@ -367,35 +367,10 @@ get-escaped-string compile-string ; immediate
-: [""] \ word (s Compile-time: -- ) - (s Run-time: -- pstr ) - compile (p") safe-parse-word ", -; immediate - -\ Obsolete -: ["] \ string" (s -- str ) - compile (p") ," -; immediate - : \ \ rest-of-line (s -- ) \ skips rest of line -1 parse 2drop ; immediate
-: compile-pstring ( adr len -- ) - state @ if - compile (p") ", - else - switch-string "temp npack - then -; -: "" \ name ( -- pstr ) - safe-parse-word compile-pstring -; immediate - -: p" \ string" ( -- pstr ) - get-escaped-string compile-pstring -; immediate - : c" \ string" ( -- pstr ) ascii " parse compile-pstring ; immediate @@ -636,7 +611,6 @@ if skipstr $abort else skipstr 2drop then ; : ?throw ( flag throw-code -- ) swap if throw else drop then ; -: (p") (s -- str-addr ) skipstr ( addr len ) drop 1- ;
nuser 'lastacf \ acf of latest definition : lastacf ( -- acf ) 'lastacf token@ ;
Modified: forth/lib/decomp.fth ============================================================================== --- forth/lib/decomp.fth Mon Mar 19 20:46:09 2012 (r2898) +++ forth/lib/decomp.fth Mon Mar 19 21:05:21 2012 (r2899) @@ -351,7 +351,7 @@ ( 14 ) [compile] exit ( 15 ) [compile] (wlit) ( 16 ) [compile] (') ( 17 ) [compile] (of) ( 18 ) [compile] (endof) ( 19 ) [compile] (endcase) - ( 20 ) [compile] (p") ( 21 ) [compile] (is) + ( 20 ) [compile] dummy ( 21 ) [compile] (is) ( 22 ) [compile] (dlit) ( 23 ) [compile] (llit) ( 24 ) [compile] (n") ( 25 ) [compile] isdefer ( 26 ) [compile] isuser ( 27 ) [compile] isvalue @@ -372,7 +372,7 @@ ( 14 ) .unnest ( 15 ) .wlit ( 16 ) .(') ( 17 ) .of ( 18 ) .endof ( 19 ) .endcase - ( 20 ) .string ( 21 ) .is + ( 20 ) dummy ( 21 ) .is ( 22 ) .dlit ( 23 ) .llit ( 24 ) .nstring ( 25 ) .is ( 26 ) .is ( 27 ) .is
Modified: forth/lib/editcmd.fth ============================================================================== --- forth/lib/editcmd.fth Mon Mar 19 20:46:09 2012 (r2898) +++ forth/lib/editcmd.fth Mon Mar 19 21:05:21 2012 (r2899) @@ -40,8 +40,8 @@
nuser lastchar \ most-recently-typed character nuser beforechar \ next most-recently-typed character -: do-command ( prefix-string -- ) - name-buf "copy +: do-command ( prefix$ -- ) + name-buf place name-buf lastchar @ add-char-to-name name-buf count keys token@ search-wordlist ( false | cfa true ) if catch drop else not-found then @@ -67,7 +67,7 @@ lastchar @ dup bl h# 7e between swap h# a0 h# fe between or - if lastchar @ printable-char else nullstring do-command then + if lastchar @ printable-char else " " do-command then redisplay finished @ until close-display @@ -182,8 +182,9 @@ : ^x finished on ; \ XXX for testing on systems where ^C is magic : ^y yank ;
-: ^{ key lastchar ! [""] esc- do-command ; -: esc-o only forth also definitions beep beep beep ; +: ^{ key lastchar ! " esc-" do-command ; + +: esc-v only forth also definitions beep beep beep ; \ Reset search order : esc-h erase-previous-word ; : esc-d erase-next-word ; : esc-f forward-word ; @@ -195,7 +196,8 @@ : esc-del erase-next-word ;
\ ANSI cursor keys -: esc-[ key lastchar ! [""] esc-[ do-command ; +: esc-[ key lastchar ! " esc-[" do-command ; +: esc-o key lastchar ! " esc-[" do-command ; \ TeraTerm uses esc-o as the arrow prefix : esc-[A previous-line ; : esc-[B next-line ; : esc-[C forward-character ;
Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Mon Mar 19 20:46:09 2012 (r2898) +++ ofw/core/ofwcore.fth Mon Mar 19 21:05:21 2012 (r2899) @@ -2370,7 +2370,7 @@ ; : (open-node) ( -- ) "open" (apply-method) 0= if ( okay? ) - close-chain p" open failed" throw ( ) + close-chain true abort" open failed" ( ) then ; : open-node ( -- ) recursive