--- gforth/prims2x.fs	2000/11/10 10:04:20	1.49
+++ gforth/prims2x.fs	2001/01/18 16:57:41	1.67
@@ -68,7 +68,8 @@ variable rawinput \ pointer to next char
 variable endrawinput \ pointer to the end of the input (the char after the last)
 variable cookedinput \ pointer to the next char to be parsed
 variable line \ line number of char pointed to by input
-1 line !
+variable line-start \ pointer to start of current line (for error messages)
+0 line !
 2variable filename \ filename of original input file
 0 0 filename 2!
 2variable f-comment
@@ -82,44 +83,71 @@ skipsynclines on
 : end ( addr -- addr u )
  cookedinput @ over - ;
 
+: quote ( -- )
+    [char] " emit ;
+
 variable output \ xt ( -- ) of output word
 
 : printprim ( -- )
  output @ execute ;
 
-\ stack types
-
 struct%
     cell% 2* field stack-pointer \ stackpointer name
     cell% 2* field stack-cast \ cast string for assignments to stack elements
+    cell%    field stack-in-index-xt \ ( in-size item -- in-index )
     cell%    field stack-in  \ number of stack items in effect in
     cell%    field stack-out \ number of stack items in effect out
 end-struct stack%
 
+struct%
+ cell% 2* field item-name   \ name, excluding stack prefixes
+ cell%    field item-stack  \ descriptor for the stack used, 0 is default
+ cell%    field item-type   \ descriptor for the item type
+ cell%    field item-offset \ offset in stack items, 0 for the deepest element
+ cell%	  field item-first  \ true if this is the first occurence of the item
+end-struct item%
+
+struct%
+    cell% 2* field type-c-name
+    cell%    field type-stack \ default stack
+    cell%    field type-size  \ size of type in stack items
+    cell%    field type-fetch \ xt of fetch code generator ( item -- )
+    cell%    field type-store \ xt of store code generator ( item -- )
+end-struct type%
+
+: stack-in-index ( in-size item -- in-index )
+    item-offset @ - 1- ;
+
+: inst-in-index ( in-size item -- in-index )
+    nip dup item-offset @ swap item-type @ type-size @ + 1- ;
+
 : make-stack ( addr-ptr u1 addr-cast u2 "stack-name" -- )
     create stack% %allot >r
     save-mem r@ stack-cast 2!
-    save-mem r> stack-pointer 2! ;
+    save-mem r@ stack-pointer 2! 
+    ['] stack-in-index r> stack-in-index-xt ! ;
 
 s" sp" save-mem s" (Cell)" make-stack data-stack 
 s" fp" save-mem s" "       make-stack fp-stack
+s" rp" save-mem s" (Cell)" make-stack return-stack
+s" IP" save-mem s" error don't use # on results" make-stack inst-stream
+' inst-in-index inst-stream stack-in-index-xt !
 \ !! initialize stack-in and stack-out
 
 \ stack items
 
-struct%
- cell% 2* field item-name   \ name, excluding stack prefixes
- cell%    field item-stack  \ descriptor for the stack used, 0 is default
- cell%    field item-type   \ descriptor for the item type
- cell%    field item-offset \ offset in stack items, 0 for the deepest element
-end-struct item%
-
 : init-item ( addr u addr1 -- )
     \ initialize item at addr1 with name addr u
     \ !! remove stack prefix
     dup item% %size erase
     item-name 2! ;
 
+: map-items { addr end xt -- }
+    \ perform xt for all items in array addr...end
+    end addr ?do
+	i xt execute
+    item% %size +loop ;
+
 \ various variables for storing stuff of one primitive
 
 2variable forth-name
@@ -155,184 +183,8 @@ variable items
 : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;
 
-\ the parser
-
-eof-char max-member \ the whole character set + EOF
-
-: getinput ( -- n )
- rawinput @ endrawinput @ =
- if
-   eof-char
- else
-   cookedinput @ c@
- endif ;
-
-:noname ( n -- )
- dup bl > if
-  emit space
- else
-  .
- endif ;
-print-token !
-
-: testchar? ( set -- f )
- getinput member? ;
-' testchar? test-vector !
-
-: checksyncline ( -- )
-    \ when input points to a newline, check if the next line is a
-    \ sync line.  If it is, perform the appropriate actions.
-    rawinput @ >r
-    s" #line " r@ over compare 0<> if
-	rdrop 1 line +! EXIT
-    endif
-    0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
-    dup c@ bl = if
-	char+ dup c@ [char] " <> abort" sync line syntax"
-	char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
-	char+
-    endif
-    dup c@ nl-char <> abort" sync line syntax"
-    skipsynclines @ if
-	dup char+ rawinput !
-	rawinput @ c@ cookedinput @ c!
-    endif
-    drop ;
-
-: ?nextchar ( f -- )
-    ?not? if
-	filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
-	getinput . cr
-	rawinput @ endrawinput @ over - 100 min type cr
-	abort
-    endif
-    rawinput @ endrawinput @ <> if
-	rawinput @ c@
-	1 chars rawinput +!
-	1 chars cookedinput +!
-	nl-char = if
-	    checksyncline
-	endif
-	rawinput @ c@ cookedinput @ c!
-    endif ;
-
-: charclass ( set "name" -- )
- ['] ?nextchar terminal ;
-
-: .. ( c1 c2 -- set )
- ( creates a set that includes the characters c, c1<=c<=c2 )
- empty copy-set
- swap 1+ rot do
-  i over add-member
- loop ;
-
-: ` ( -- terminal ) ( use: ` c )
- ( creates anonymous terminal for the character c )
- char singleton ['] ?nextchar make-terminal ;
-
-char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
-char 0 char 9 ..					charclass digit
-bl singleton tab-char over add-member			charclass white
-nl-char singleton eof-char over add-member complement	charclass nonl
-nl-char singleton eof-char over add-member
-    char : over add-member complement                   charclass nocolonnl
-bl 1+ maxchar .. char \ singleton complement intersection
-                                                        charclass nowhitebq
-bl 1+ maxchar ..                                        charclass nowhite
-char " singleton eof-char over add-member complement	charclass noquote
-nl-char singleton					charclass nl
-eof-char singleton					charclass eof
-
-
-(( letter (( letter || digit )) **
-)) <- c-name ( -- )
-
-(( nowhitebq nowhite ** ))
-<- name ( -- )
-
-Variable forth-flag
-Variable c-flag
-
-(( (( ` f || ` F )) {{ start }} nonl ** 
-   {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
-)) <- forth-comment ( -- )
-
-(( (( ` c || ` C )) {{ start }} nonl ** 
-   {{ end c-flag @ IF type cr ELSE 2drop THEN }}
-)) <- c-comment ( -- )
-
-(( ` - nonl ** {{ 
-	forth-flag @ IF ." [ELSE]" cr THEN
-	c-flag @ IF ." #else" cr THEN }}
-)) <- else-comment
-
-(( ` + {{ start }} nonl ** {{ end
-	dup
-	IF	c-flag @
-		IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
-		THEN
-		forth-flag @
-		IF  ." has? " type ."  [IF]"  cr THEN
-	ELSE	2drop
-	    c-flag @      IF  ." #endif"  cr THEN
-	    forth-flag @  IF  ." [THEN]"  cr THEN
-	THEN }}
-)) <- if-comment
-
-(( (( forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
-
-(( ` \ comment-body nl )) <- comment ( -- )
-
-(( {{ effect-in }} (( {{ start }} c-name {{ end 2 pick init-item item% %size + }} white ** )) ** {{ effect-in-end ! }}
-   ` - ` - white **
-   {{ effect-out }} (( {{ start }} c-name {{ end 2 pick init-item item% %size + }} white ** )) ** {{ effect-out-end ! }}
-)) <- stack-effect ( -- )
-
-(( {{ s" " doc 2! s" " forth-code 2! }}
-   (( {{ line @ name-line ! filename 2@ name-filename 2! }}
-      {{ start }} name {{ end 2dup forth-name 2! c-name 2! }}  white ++
-      ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **
-        {{ start }} name {{ end wordset 2! }} white **
-        (( {{ start }}  c-name {{ end c-name 2! }} )) ??  nl
-   ))
-   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " nl )) ??
-   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl )) ** {{ end c-code 2! skipsynclines on }}
-   (( ` :  nl
-      {{ start }} (( nonl ++  nl )) ++ {{ end forth-code 2! }}
-   )) ?? {{ printprim }}
-   (( nl || eof ))
-)) <- primitive ( -- )
-
-(( (( comment || primitive || nl )) ** eof ))
-parser primitives2something
-warnings @ [IF]
-.( parser generated ok ) cr
-[THEN]
-
-: primfilter ( file-id xt -- )
-\ fileid is for the input file, xt ( -- ) is for the output word
- output !
- here dup rawinput ! cookedinput !
- here unused rot read-file throw
- dup here + endrawinput !
- allot
- align
- checksyncline
-\ begin
-\     getinput dup eof-char = ?EXIT emit true ?nextchar
-\ again ;
- primitives2something ;
-
 \ types
 
-struct%
-    cell% 2* field type-c-name
-    cell%    field type-stack \ default stack
-    cell%    field type-size  \ size of type in stack items
-    cell%    field type-fetch \ xt of fetch code generator ( item -- )
-    cell%    field type-store \ xt of store code generator ( item -- )
-end-struct type%
-
 : stack-access ( n stack -- )
     \ print a stack access at index n of stack
     stack-pointer 2@ type
@@ -343,9 +195,10 @@ end-struct type%
 	drop ." TOS"
     endif ;
 
-: item-in-index ( item -- n )
+: item-in-index { item -- n }
     \ n is the index of item (in the in-effect)
-    >r r@ item-stack @ stack-in @ r> item-offset @ - 1- ;
+    item item-stack @ dup >r stack-in @ ( in-size r:stack )
+    item r> stack-in-index-xt @ execute ;
 
 : fetch-single ( item -- )
  \ fetch a single stack item from its stack
@@ -362,8 +215,8 @@ end-struct type%
  >r
  ." FETCH_DCELL("
  r@ item-name 2@ type ." , "
- r@ item-in-index r@ item-stack @ 2dup stack-access
- ." , "                      -1 under+ stack-access
+ r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
+ ." , "                      -1 under+ ." (Cell)" stack-access
  ." );" cr
  rdrop ;
 
@@ -416,21 +269,30 @@ end-struct type%
  ." );" cr
  rdrop ;
 
+: single ( -- xt1 xt2 n )
+    ['] fetch-single ['] store-single 1 ;
 
-: single-type ( -- xt1 xt2 n stack )
- ['] fetch-single ['] store-single 1 data-stack ;
-
-: double-type ( -- xt1 xt2 n stack )
- ['] fetch-double ['] store-double 2 data-stack ;
-
-: float-type ( -- xt1 xt2 n stack )
- ['] fetch-single ['] store-single 1 fp-stack ;
+: double ( -- xt1 xt2 n )
+    ['] fetch-double ['] store-double 2 ;
 
 : s, ( addr u -- )
 \ allocate a string
  here swap dup allot move ;
 
-: starts-with { addr u xt1 xt2 n stack -- } ( "prefix" -- )
+wordlist constant prefixes
+
+: declare ( addr "name" -- )
+\ remember that there is a stack item at addr called name
+ create , ;
+
+: !default ( w addr -- )
+    dup @ if
+	2drop \ leave nonzero alone
+    else
+	!
+    endif ;
+
+: create-type { addr u xt1 xt2 n stack -- } ( "prefix" -- )
     \ describes a type
     \ addr u specifies the C type name
     \ stack effect entries of the type start with prefix
@@ -442,69 +304,64 @@ end-struct type%
     stack r@ type-stack !
     rdrop ;
 
-wordlist constant types
-get-current
-types set-current
-
-s" Bool"	single-type starts-with f
-s" Char"	single-type starts-with c
-s" Cell"	single-type starts-with n
-s" Cell"	single-type starts-with w
-s" UCell"	single-type starts-with u
-s" DCell"	double-type starts-with d
-s" UDCell"	double-type starts-with ud
-s" Float"	float-type  starts-with r
-s" Cell *"	single-type starts-with a_
-s" Char *"	single-type starts-with c_
-s" Float *"	single-type starts-with f_
-s" DFloat *"	single-type starts-with df_
-s" SFloat *"	single-type starts-with sf_
-s" Xt"		single-type starts-with xt
-s" WID"		single-type starts-with wid
-s" struct F83Name *"	single-type starts-with f83name
-
-set-current
-
-: get-type ( addr1 u1 -- type-descr )
-\ get the type of the name in addr1 u1
-\ type-descr is a pointer to a type-descriptor
- 0 swap ?do
-   dup i types search-wordlist
-   if \ ok, we have the type ( addr1 xt )
-     execute nip
-     UNLOOP EXIT
-   endif
- -1 s+loop
- \ we did not find a type, abort
- true abort" unknown type prefix" ;
+: type-prefix ( xt1 xt2 n stack "prefix" -- )
+    create-type
+does> ( item -- )
+    \ initialize item
+    { item typ }
+    typ item item-type !
+    typ type-stack @ item item-stack !default
+    item item-name 2@ items @ search-wordlist 0= if \ new name
+	item item-name 2@ nextname item declare
+	item item-first on
+	\ typ type-c-name 2@ type space type  ." ;" cr
+    else
+	drop
+	item item-first off
+    endif ;
 
-: declare ( addr "name" -- )
-\ remember that there is a stack item at addr called name
- create , ;
+: execute-prefix ( item addr1 u1 -- )
+    \ execute the word ( item -- ) associated with the longest prefix
+    \ of addr1 u1
+    0 swap ?do
+	dup i prefixes search-wordlist
+	if \ ok, we have the type ( item addr1 xt )
+	    nip execute
+	    UNLOOP EXIT
+	endif
+	-1 s+loop
+    \ we did not find a type, abort
+    true abort" unknown prefix" ;
 
 : declaration ( item -- )
- dup item-name 2@ items @ search-wordlist
- if \ already declared ( item xt )
-     execute @ 2dup item-type @ swap item-type !
-     item-stack @ swap item-stack ! \ !! does not generalize to stack prefixes
- else ( addr )
-   dup item-name 2@ nextname dup declare ( addr )
-   dup >r item-name 2@ 2dup get-type ( addr1 u type-descr )
-   dup type-stack @ r@ item-stack ! \ !! only if item-stack @ 0=
-   dup r> item-type ! ( addr1 u type-descr )
-   type-c-name 2@ type space type ." ;" cr
- endif ;
+    dup item-name 2@ execute-prefix ;
 
 : declaration-list ( addr1 addr2 -- )
- swap ?do
-  i declaration
- item% %size +loop ;
+    ['] declaration map-items ;
 
 : declarations ( -- )
  wordlist dup items ! set-current
  effect-in effect-in-end @ declaration-list
  effect-out effect-out-end @ declaration-list ;
 
+: print-declaration { item -- }
+    item item-first @ if
+	item item-type @ type-c-name 2@ type space
+	item item-name 2@ type ." ;" cr
+    endif ;
+
+: print-declarations ( -- )
+    effect-in  effect-in-end  @ ['] print-declaration map-items
+    effect-out effect-out-end @ ['] print-declaration map-items ;
+    
+: stack-prefix ( stack "prefix" -- )
+    name tuck nextname create ( stack length ) 2,
+does> ( item -- )
+    2@ { item stack prefix-length }
+    item item-name 2@ prefix-length /string item item-name 2!
+    stack item item-stack !
+    item declaration ;
+
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset
@@ -515,20 +372,21 @@ set-current
     item item-stack @ xt execute dup @ >r +!
     r> item item-offset ! ;
 
-: compute-list ( addr1 addr2 xt -- )
-    { xt }
-    swap u+do
-	i xt compute-offset
-    item% %size +loop ;
+: compute-offset-in ( addr1 addr2 -- )
+    ['] stack-in compute-offset ;
+
+: compute-offset-out ( addr1 addr2 -- )
+    ['] stack-out compute-offset ;
 
 : clear-stack { -- }
     dup stack-in off stack-out off ;
 
-
 : compute-offsets ( -- )
-    data-stack clear-stack  fp-stack clear-stack
-    effect-in  effect-in-end  @ ['] stack-in  compute-list
-    effect-out effect-out-end @ ['] stack-out compute-list ;
+    data-stack clear-stack  fp-stack clear-stack return-stack clear-stack
+    inst-stream clear-stack
+    effect-in  effect-in-end  @ ['] compute-offset-in  map-items
+    effect-out effect-out-end @ ['] compute-offset-out map-items
+    inst-stream stack-out @ 0<> abort" # can only be on the input side" ;
 
 : flush-a-tos { stack -- }
     stack stack-out @ 0<> stack stack-in @ 0= and
@@ -538,8 +396,9 @@ set-current
     endif ;
 
 : flush-tos ( -- )
-    data-stack flush-a-tos
-    fp-stack   flush-a-tos ;
+    data-stack   flush-a-tos
+    fp-stack     flush-a-tos
+    return-stack flush-a-tos ;
 
 : fill-a-tos { stack -- }
     stack stack-out @ 0= stack stack-in @ 0<> and
@@ -549,16 +408,16 @@ set-current
     endif ;
 
 : fill-tos ( -- )
-    fp-stack   fill-a-tos
-    data-stack fill-a-tos ;
+    \ !! inst-stream for prefetching?
+    fp-stack     fill-a-tos
+    data-stack   fill-a-tos
+    return-stack fill-a-tos ;
 
 : fetch ( addr -- )
  dup item-type @ type-fetch @ execute ;
 
 : fetches ( -- )
- effect-in-end @ effect-in ?do
-   i fetch
- item% %size +loop ; 
+    effect-in effect-in-end @ ['] fetch map-items ;
 
 : stack-pointer-update { stack -- }
     \ stack grow downwards
@@ -567,9 +426,16 @@ set-current
 	stack stack-pointer 2@ type ."  += " 0 .r ." ;" cr
     endif ;
 
+: inst-pointer-update ( -- )
+    inst-stream stack-in @ ?dup-if
+	." INC_IP(" 0 .r ." );" cr
+    endif ;
+
 : stack-pointer-updates ( -- )
-    data-stack stack-pointer-update
-    fp-stack   stack-pointer-update ;
+    inst-pointer-update
+    data-stack   stack-pointer-update
+    fp-stack     stack-pointer-update
+    return-stack stack-pointer-update ;
 
 : store ( item -- )
 \ f is true if the item should be stored
@@ -577,34 +443,117 @@ set-current
  dup item-type @ type-store @ execute ;
 
 : stores ( -- )
- effect-out-end @ effect-out ?do
-   i store
- item% %size +loop ; 
+    effect-out effect-out-end @ ['] store map-items ;
+
+: output-c-tail ( -- )
+    \ the final part of the generated C code
+    ." NEXT_P1;" cr
+    stores
+    fill-tos
+    ." NEXT_P2;" cr ;
 
+: type-c ( c-addr u -- )
+    \ like TYPE, but replaces "TAIL;" with tail code
+    begin ( c-addr1 u1 )
+	2dup s" TAIL;" search
+    while ( c-addr1 u1 c-addr3 u3 )
+	2dup 2>r drop nip over - type
+	output-c-tail
+	2r> 5 /string
+	\ !! resync #line missing
+    repeat
+    2drop type ;
+
+: print-type-prefix ( type -- )
+    body> >head .name ;
+
+: print-debug-arg { item -- }
+    ." fputs(" quote space item item-name 2@ type ." =" quote ." , vm_out); "
+    ." printarg_" item item-type @ print-type-prefix
+    ." (" item item-name 2@ type ." );" cr ;
+    
+: print-debug-args ( -- )
+    ." #ifdef VM_DEBUG" cr
+    ." if (vm_debug) {" cr
+    effect-in effect-in-end @ ['] print-debug-arg map-items
+    ." fputc('\n', vm_out);" cr
+    ." }" cr
+    ." #endif" cr ;
+    
 : output-c ( -- ) 
  ." I_" c-name 2@ type ." :	/* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr
  ." /* " doc 2@ type ."  */" cr
- ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr \ debugging
+ ." NAME(" quote forth-name 2@ type quote ." )" cr \ debugging
  ." {" cr
  ." DEF_CA" cr
  declarations
  compute-offsets \ for everything else
+ print-declarations
  ." NEXT_P0;" cr
  flush-tos
  fetches
+ print-debug-args
  stack-pointer-updates
  ." {" cr
- ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
- c-code 2@ type
+ ." #line " c-line @ . quote c-filename 2@ type quote cr
+ c-code 2@ type-c
  ." }" cr
- ." NEXT_P1;" cr
- stores
- fill-tos
- ." NEXT_P2;" cr
+ output-c-tail
  ." }" cr
  cr
 ;
 
+: disasm-arg { item -- }
+    item item-stack @ inst-stream = if
+	."   fputc(' ', vm_out); "
+	." printarg_" item item-type @ print-type-prefix
+	." ((" item item-type @ type-c-name 2@ type ." )"
+	." ip[" item item-offset @ 1+ 0 .r ." ]);" cr
+    endif ;
+
+: disasm-args ( -- )
+    effect-in effect-in-end @ ['] disasm-arg map-items ;
+
+: output-disasm ( -- )
+    \ generate code for disassembling VM instructions
+    ." if (ip[0] == prim[" function-number @ 0 .r ." ]) {" cr
+    ."   fputs(" quote forth-name 2@ type quote ." , vm_out);" cr
+    ." /* " declarations ." */" cr
+    compute-offsets
+    disasm-args
+    ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
+    ." } else "
+    1 function-number +! ;
+
+: gen-arg-parm { item -- }
+    item item-stack @ inst-stream = if
+	." , " item item-type @ type-c-name 2@ type space
+	item item-name 2@ type
+    endif ;
+
+: gen-args-parm ( -- )
+    effect-in effect-in-end @ ['] gen-arg-parm map-items ;
+
+: gen-arg-gen { item -- }
+    item item-stack @ inst-stream = if
+	."   genarg_" item item-type @ print-type-prefix
+        ." (ctp, " item item-name 2@ type ." );" cr
+    endif ;
+
+: gen-args-gen ( -- )
+    effect-in effect-in-end @ ['] gen-arg-gen map-items ;
+
+: output-gen ( -- )
+    \ generate C code for generating VM instructions
+    ." /* " declarations ." */" cr
+    compute-offsets
+    ." void gen_" c-name 2@ type ." (Inst **ctp" gen-args-parm ." )" cr
+    ." {" cr
+    ."   gen_inst(ctp, vm_prim[" function-number @ 0 .r ." ]);" cr
+    gen-args-gen
+    ." }" cr
+    1 function-number +! ;
+
 : stack-used? { stack -- f }
     stack stack-in @ stack stack-out @ or 0<> ;
 
@@ -622,19 +571,22 @@ set-current
     ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type
     ."  ( " stack-string 2@ type ."  ) */" cr
     ." /* " doc 2@ type ."  */" cr
-    ." NAME(" [char] " emit forth-name 2@ type [char] " emit ." )" cr
+    ." NAME(" quote forth-name 2@ type quote ." )" cr
     \ debugging
     ." {" cr
     declarations
     compute-offsets \ for everything else
-    data-stack stack-used? IF ." Cell *sp=SP;" cr THEN
-    fp-stack   stack-used? IF ." Cell *fp=*FP;" cr THEN
+    print-declarations
+    inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN
+    data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
+    fp-stack     stack-used? IF ." Cell *fp=*FP;" cr THEN
+    return-stack stack-used? IF ." Cell *rp=*RP;" cr THEN
     flush-tos
     fetches
     stack-pointer-updates
     fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr
-    ." #line " c-line @ . [char] " emit c-filename 2@ type [char] " emit cr
+    ." #line " c-line @ . quote c-filename 2@ type quote cr
     c-code 2@ type
     ." }" cr
     stores
@@ -691,9 +643,201 @@ set-current
     set-current ;
 [THEN]
 
+
+\ the parser
+
+eof-char max-member \ the whole character set + EOF
+
+: getinput ( -- n )
+ rawinput @ endrawinput @ =
+ if
+   eof-char
+ else
+   cookedinput @ c@
+ endif ;
+
+:noname ( n -- )
+ dup bl > if
+  emit space
+ else
+  .
+ endif ;
+print-token !
+
+: testchar? ( set -- f )
+ getinput member? ;
+' testchar? test-vector !
+
+: checksyncline ( -- )
+    \ when input points to a newline, check if the next line is a
+    \ sync line.  If it is, perform the appropriate actions.
+    rawinput @ >r
+    s" #line " r@ over compare 0<> if
+	rdrop 1 line +! EXIT
+    endif
+    0. r> 6 chars + 20 >number drop >r drop line ! r> ( c-addr )
+    dup c@ bl = if
+	char+ dup c@ [char] " <> abort" sync line syntax"
+	char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
+	char+
+    endif
+    dup c@ nl-char <> abort" sync line syntax"
+    skipsynclines @ if
+	dup char+ rawinput !
+	rawinput @ c@ cookedinput @ c!
+    endif
+    drop ;
+
+: print-error-line ( -- )
+    \ print the current line and position
+    line-start @ endrawinput @ over - 2dup nl-char scan drop nip ( start end )
+    over - type cr
+    line-start @ rawinput @ over - typewhite ." ^" cr ;
+    
+: ?nextchar ( f -- )
+    ?not? if
+	outfile-id >r try
+	    stderr to outfile-id
+	    filename 2@ type ." :" line @ 0 .r ." : syntax error, wrong char:"
+	    getinput . cr
+	    print-error-line
+	    0
+	recover endtry
+	r> to outfile-id throw
+	abort
+    endif
+    rawinput @ endrawinput @ <> if
+	rawinput @ c@
+	1 chars rawinput +!
+	1 chars cookedinput +!
+	nl-char = if
+	    checksyncline
+	    rawinput @ line-start !
+	endif
+	rawinput @ c@ cookedinput @ c!
+    endif ;
+
+: charclass ( set "name" -- )
+ ['] ?nextchar terminal ;
+
+: .. ( c1 c2 -- set )
+ ( creates a set that includes the characters c, c1<=c<=c2 )
+ empty copy-set
+ swap 1+ rot do
+  i over add-member
+ loop ;
+
+: ` ( -- terminal ) ( use: ` c )
+ ( creates anonymous terminal for the character c )
+ char singleton ['] ?nextchar make-terminal ;
+
+char a char z ..  char A char Z ..  union char _ singleton union  charclass letter
+char 0 char 9 ..					charclass digit
+bl singleton tab-char over add-member			charclass white
+nl-char singleton eof-char over add-member complement	charclass nonl
+nl-char singleton eof-char over add-member
+    char : over add-member complement                   charclass nocolonnl
+bl 1+ maxchar .. char \ singleton complement intersection
+                                                        charclass nowhitebq
+bl 1+ maxchar ..                                        charclass nowhite
+char " singleton eof-char over add-member complement	charclass noquote
+nl-char singleton					charclass nl
+eof-char singleton					charclass eof
+
+
+(( letter (( letter || digit )) **
+)) <- c-ident ( -- )
+
+(( ` # ?? (( letter || digit || ` : )) **
+)) <- stack-ident ( -- )
+
+(( nowhitebq nowhite ** ))
+<- forth-ident ( -- )
+
+Variable forth-flag
+Variable c-flag
+
+(( (( ` e || ` E )) {{ start }} nonl ** 
+   {{ end evaluate }}
+)) <- eval-comment ( ... -- ... )
+
+(( (( ` f || ` F )) {{ start }} nonl ** 
+   {{ end forth-flag @ IF type cr ELSE 2drop THEN }}
+)) <- forth-comment ( -- )
+
+(( (( ` c || ` C )) {{ start }} nonl ** 
+   {{ end c-flag @ IF type cr ELSE 2drop THEN }}
+)) <- c-comment ( -- )
+
+(( ` - nonl ** {{ 
+	forth-flag @ IF ." [ELSE]" cr THEN
+	c-flag @ IF ." #else" cr THEN }}
+)) <- else-comment
+
+(( ` + {{ start }} nonl ** {{ end
+	dup
+	IF	c-flag @
+		IF    ." #ifdef HAS_" bounds ?DO  I c@ toupper emit  LOOP cr
+		THEN
+		forth-flag @
+		IF  ." has? " type ."  [IF]"  cr THEN
+	ELSE	2drop
+	    c-flag @      IF  ." #endif"  cr THEN
+	    forth-flag @  IF  ." [THEN]"  cr THEN
+	THEN }}
+)) <- if-comment
+
+(( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
+
+(( ` \ comment-body nl )) <- comment ( -- )
+
+(( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
+<- stack-items
+
+(( {{ effect-in }}  stack-items {{ effect-in-end ! }}
+   ` - ` - white **
+   {{ effect-out }} stack-items {{ effect-out-end ! }}
+)) <- stack-effect ( -- )
+
+(( {{ s" " doc 2! s" " forth-code 2! s" " wordset 2! }}
+   (( {{ line @ name-line ! filename 2@ name-filename 2! }}
+      {{ start }} forth-ident {{ end 2dup forth-name 2! c-name 2! }}  white ++
+      ` ( white ** {{ start }} stack-effect {{ end stack-string 2! }} ` ) white **
+        (( {{ start }} forth-ident {{ end wordset 2! }} white **
+	   (( {{ start }}  c-ident {{ end c-name 2! }} )) ??
+	)) ??  nl
+   ))
+   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- doc 2! }} ` " white ** nl )) ??
+   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end c-code 2! skipsynclines on }}
+   (( ` :  white ** nl
+      {{ start }} (( nonl ++  nl white ** )) ++ {{ end forth-code 2! }}
+   )) ?? {{ printprim }}
+   (( nl || eof ))
+)) <- primitive ( -- )
+
+(( (( comment || primitive || nl white ** )) ** eof ))
+parser primitives2something
+warnings @ [IF]
+.( parser generated ok ) cr
+[THEN]
+
+: primfilter ( file-id xt -- )
+\ fileid is for the input file, xt ( -- ) is for the output word
+ output !
+ here dup rawinput ! dup line-start ! cookedinput !
+ here unused rot read-file throw
+ dup here + endrawinput !
+ allot
+ align
+ checksyncline
+\ begin
+\     getinput dup eof-char = ?EXIT emit true ?nextchar
+\ again ;
+ primitives2something ;
+
 : process-file ( addr u xt -- )
     >r
-    2dup filename 2!
+    save-mem 2dup filename 2!
     0 function-number !
     r/o open-file abort" cannot open file"
     warnings @ if