--- gforth/Attic/kernal.fs	1995/02/15 14:50:07	1.30
+++ gforth/Attic/kernal.fs	1995/04/14 18:56:55	1.34
@@ -786,8 +786,16 @@ Avariable leave-sp  leave-stack 3 cells
 : ."       state @  IF    postpone (.") ,"  align
                     ELSE  [char] " parse type  THEN  ;  immediate
 : (        [char] ) parse 2drop ;                       immediate
-: \        blk @ IF  >in @ c/l / 1+ c/l * >in !  EXIT  THEN
-           source >in ! drop ;                          immediate
+: \ ( -- ) \ core-ext backslash
+    blk @
+    IF
+	>in @ c/l / 1+ c/l * >in !
+	EXIT
+    THEN
+    source >in ! drop ; immediate
+
+: \G ( -- ) \ new backslash
+    POSTPONE \ ; immediate
 
 \ error handling                                       22feb93py
 \ 'abort thrown out!                                   11may93jaw
@@ -918,10 +926,10 @@ Create ???  0 , 3 c, char ? c, char ? c,
 : Constant  (Constant) , ;
 : AConstant (Constant) A, ;
 
-: 2CONSTANT
-    create ( w1 w2 "name" -- )
+: 2Constant
+    Create ( w1 w2 "name" -- )
         2,
-    does> ( -- w1 w2 )
+    DOES> ( -- w1 w2 )
         2@ ;
     
 \ IS Defer What's Defers TO                            24feb93py
@@ -981,19 +989,20 @@ AVariable current
 \ object oriented search list                          17mar93py
 
 \ word list structure:
-\ struct
-\   1 cells: field find-method   \ xt: ( c_addr u wid -- name-id )
-\   1 cells: field reveal-method \ xt: ( -- )
-\   1 cells: field rehash-method \ xt: ( wid -- )
+
+struct
+  1 cells: field find-method   \ xt: ( c_addr u wid -- name-id )
+  1 cells: field reveal-method \ xt: ( -- )
+  1 cells: field rehash-method \ xt: ( wid -- )
 \   \ !! what else
-\ end-struct wordlist-map-struct
+end-struct wordlist-map-struct
 
-\ struct
-\   1 cells: field wordlist-id \ not the same as wid; representation depends on implementation
-\   1 cells: field wordlist-map \ pointer to a wordlist-map-struct
-\   1 cells: field wordlist-link \ link field to other wordlists
-\   1 cells: field wordlist-extend \ points to wordlist extensions (eg hash)
-\ end-struct wordlist-struct
+struct
+  1 cells: field wordlist-id \ not the same as wid; representation depends on implementation
+  1 cells: field wordlist-map \ pointer to a wordlist-map-struct
+  1 cells: field wordlist-link \ link field to other wordlists
+  1 cells: field wordlist-extend \ points to wordlist extensions (eg hash)
+end-struct wordlist-struct
 
 : f83find      ( addr len wordlist -- nfa / false )  @ (f83find) ;
 
@@ -1005,7 +1014,7 @@ AVariable lookup       G forth-wordlist
 G forth-wordlist current T !
 
 : (search-wordlist)  ( addr count wid -- nfa / false )
-  dup cell+ @ @ execute ;
+  dup wordlist-map @ find-method @ execute ;
 
 : search-wordlist  ( addr count wid -- 0 / xt +-1 )
     (search-wordlist) dup  IF  found  THEN ;
@@ -1039,9 +1048,9 @@ Variable warnings  G -1 warnings T !
  last? if
    name>string current @ check-shadow
  then
- current @ cell+ @ cell+ @ execute ;
+ current @ wordlist-map @ reveal-method @ execute ;
 
-: rehash  ( wid -- )  dup cell+ @ cell+ cell+ @ execute ;
+: rehash  ( wid -- )  dup wordlist-map @ rehash-method @ execute ;
 
 : '    ( "name" -- addr )  name sfind 0= if -&13 bounce then ;
 : [']  ( "name" -- addr )  ' postpone ALiteral ; immediate
@@ -1446,24 +1455,28 @@ Variable argc
     2drop
     here r> tuck - 2 cells / ;
 
-: do-option ( addr1 len1 addr2 len2 -- n )  2swap
-  2dup s" -e"        compare  0= >r
-  2dup s" -evaluate" compare  0= r> or
-  IF  2drop dup >r ['] evaluate catch
-      ?dup IF  dup >r DoError r> negate (bye)  THEN
-      r> >tib +!  2 EXIT  THEN
-  ." Unknown option: " type cr 2drop 1 ;
-
-: process-args ( -- )  >tib @ >r
+: do-option ( addr1 len1 addr2 len2 -- n )
+    2swap
+    2dup s" -e"         compare  0= >r
+    2dup s" --evaluate" compare  0= r> or
+    IF  2drop dup >r ['] evaluate catch
+	?dup IF  dup >r DoError r> negate (bye)  THEN
+	r> >tib +!  2 EXIT  THEN
+    ." Unknown option: " type cr 2drop 1 ;
+
+: process-args ( -- )
+    >tib @ >r
+    true to script?
     argc @ 1
     ?DO
 	I arg over c@ [char] - <>
 	IF
-	    true to script? included  false to script? 1
+	    included 1
 	ELSE
 	    I 1+ arg  do-option
 	THEN
     +LOOP
+    false to script?
     r> >tib ! ;
 
 Defer 'cold ' noop IS 'cold