--- gforth/prims2x.fs	2001/01/21 20:36:31	1.71
+++ gforth/prims2x.fs	2001/02/27 21:17:10	1.86
@@ -40,6 +40,17 @@
 \ add the store optimization for doubles
 \ regarding problem 1 above: It would be better (for over) to implement
 \ 	the alternative
+\ store optimization for combined instructions.
+\ eliminate stack-cast (no longer used)
+
+\ Design Uglyness:
+
+\ - global state (values, variables) in connection with combined instructions.
+
+\ - index computation is different for instruction-stream and the
+\ stacks; there are two mechanisms for dealing with that
+\ (stack-in-index-xt and a test for stack==instruction-stream); there
+\ should be only one.
 
 warnings off
 
@@ -50,6 +61,7 @@ warnings off
 include ./search.fs			
 include ./extend.fs
 [THEN]
+include ./stuff.fs
 
 [IFUNDEF] environment?
 include ./environ.fs
@@ -79,7 +91,22 @@ variable line-start \ pointer to start o
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on 
 
-variable next-stack-number 0 next-stack-number !
+: th ( addr1 n -- addr2 )
+    cells + ;
+
+: holds ( addr u -- )
+    \ like HOLD, but for a string
+    tuck + swap 0 +do
+	1- dup c@ hold
+    loop
+    drop ;
+
+: insert-wordlist { c-addr u wordlist xt -- }
+    \ adds name "addr u" to wordlist using defining word xt
+    \ xt may cause additional stack effects
+    get-current >r wordlist set-current
+    c-addr u nextname xt execute
+    r> set-current ;
 
 : start ( -- addr )
  cookedinput @ ;
@@ -108,14 +135,13 @@ variable next-stack-number 0 next-stack-
 : quote ( -- )
     [char] " emit ;
 
-variable output \ xt ( -- ) of output word
-
-: printprim ( -- )
- output @ execute ;
+variable output          \ xt ( -- ) of output word for simple primitives
+variable output-combined \ xt ( -- ) of output word for combined primitives
 
 struct%
     cell%    field stack-number \ the number of this stack
     cell% 2* field stack-pointer \ stackpointer name
+    cell%    field stack-type \ name for default type of stack items
     cell% 2* field stack-cast \ cast string for assignments to stack elements
     cell%    field stack-in-index-xt \ ( in-size item -- in-index )
 end-struct stack%
@@ -136,26 +162,24 @@ struct%
     cell%    field type-store \ xt of store code generator ( item -- )
 end-struct type%
 
+variable next-stack-number 0 next-stack-number !
+create stacks max-stacks cells allot \ array of stacks
+
 : 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" -- )
+: make-stack ( addr-ptr u1 type addr-cast u2 "stack-name" -- )
     create stack% %allot >r
+    r@ stacks next-stack-number @ th !
     next-stack-number @ r@ stack-number !  1 next-stack-number +!
     save-mem r@ stack-cast 2!
+    r@ stack-type !
     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
 
 : init-item ( addr u addr1 -- )
@@ -170,6 +194,11 @@ s" IP" save-mem s" error don't use # on
 	i xt execute
     item% %size +loop ;
 
+\ types
+
+: print-type-prefix ( type -- )
+    body> >head name>string type ;
+
 \ various variables for storing stuff of one primitive
 
 struct%
@@ -180,6 +209,8 @@ struct%
     cell% 2* field prim-c-code
     cell% 2* field prim-forth-code
     cell% 2* field prim-stack-string
+    cell%    field prim-num            \ ordinal number
+    cell%    field prim-items-wordlist \ unique items
     item% max-effect * field prim-effect-in
     item% max-effect * field prim-effect-out
     cell%    field prim-effect-in-end
@@ -193,15 +224,26 @@ end-struct prim%
     s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!
     p ;
 
-0 value prim
+0 value prim     \ in combined prims either combined or a part
+0 value combined \ in combined prims the combined prim
+variable in-part \ true if processing a part
+ in-part off
+
+1000 constant max-combined
+create combined-prims max-combined cells allot
+variable num-combined
+
+table constant combinations
+  \ the keys are the sequences of pointers to primitives
+
+create current-depth max-stacks cells allot
+create max-depth     max-stacks cells allot
+create min-depth     max-stacks cells allot
 
 wordlist constant primitives
 
 : create-prim ( prim -- )
-    get-current >r
-    primitives set-current
-    dup prim-name 2@ nextname constant
-    r> set-current ;
+    dup prim-name 2@ primitives ['] constant insert-wordlist ;
 
 : stack-in ( stack -- addr )
     \ address of number of stack items in effect in
@@ -219,11 +261,6 @@ variable name-line
 2variable last-name-filename
 Variable function-number 0 function-number !
 
-\ for several reasons stack items of a word are stored in a wordlist
-\ since neither forget nor marker are implemented yet, we make a new
-\ wordlist for every word and store it in the variable items
-variable items
-
 \ a few more set ops
 
 : bit-equivalent ( w1 w2 -- w3 )
@@ -232,10 +269,9 @@ variable items
 : complement ( set1 -- set2 )
  empty ['] bit-equivalent binary-set-operation ;
 
-\ types
+\ stack access stuff
 
-: stack-access ( n stack -- )
-    \ print a stack access at index n of stack
+: normal-stack-access ( n stack -- )
     stack-pointer 2@ type
     dup
     if
@@ -244,25 +280,55 @@ variable items
 	drop ." TOS"
     endif ;
 
+\ forward declaration for inst-stream (breaks cycle in definitions)
+defer inst-stream-f ( -- stack )
+
+: part-stack-access { n stack -- }
+    \ print _<stack><x>, x=inst-stream? n : maxdepth-currentdepth-n-1
+    ." _" stack stack-pointer 2@ type
+    stack stack-number @ { stack# }
+    current-depth stack# th @ n + { access-depth }
+    stack inst-stream-f = if
+	access-depth
+    else
+	combined prim-stacks-in stack# th @
+	assert( dup max-depth stack# th @ = )
+	access-depth - 1-
+    endif
+    0 .r ;
+
+: stack-access ( n stack -- )
+    \ print a stack access at index n of stack
+    in-part @ if
+	part-stack-access
+    else
+	normal-stack-access
+    endif ;
+
 : item-in-index { item -- n }
     \ n is the index of item (in the in-effect)
     item item-stack @ dup >r stack-in @ ( in-size r:stack )
     item r> stack-in-index-xt @ execute ;
 
+: item-stack-type-name ( item -- addr u )
+    item-stack @ stack-type @ type-c-name 2@ ;
+
 : fetch-single ( item -- )
  \ fetch a single stack item from its stack
  >r
  r@ item-name 2@ type
- ."  = (" 
- r@ item-type @ type-c-name 2@ type ." ) "
+ ."  = vm_" r@ item-stack-type-name type
+ ." 2" r@ item-type @ print-type-prefix ." ("
  r@ item-in-index r@ item-stack @ stack-access
- ." ;" cr
+ ." );" cr
  rdrop ; 
 
 : fetch-double ( item -- )
  \ fetch a double stack item from its stack
  >r
- ." FETCH_DCELL("
+ ." vm_two"
+ r@ item-stack-type-name type ." 2"
+ r@ item-type @ print-type-prefix ." ("
  r@ item-name 2@ type ." , "
  r@ item-in-index r@ item-stack @ 2dup ." (Cell)" stack-access
  ." , "                      -1 under+ ." (Cell)" stack-access
@@ -272,8 +338,10 @@ variable items
 : same-as-in? ( item -- f )
  \ f is true iff the offset and stack of item is the same as on input
  >r
- r@ item-name 2@ items @ search-wordlist 0=
- abort" bug"
+ r@ item-first @ if
+     rdrop false exit
+ endif
+ r@ item-name 2@ prim prim-items-wordlist @ search-wordlist 0= abort" bug"
  execute @
  dup r@ =
  if \ item first appeared in output
@@ -290,9 +358,10 @@ variable items
 
 : really-store-single ( item -- )
  >r
- r@ item-out-index r@ item-stack @ stack-access ."  = "
- r@ item-stack @ stack-cast 2@ type
- r@ item-name 2@ type ." ;"
+ r@ item-out-index r@ item-stack @ stack-access ."  = vm_"
+ r@ item-type @ print-type-prefix ." 2"
+ r@ item-stack-type-name type ." ("
+ r@ item-name 2@ type ." );"
  rdrop ;
 
 : store-single ( item -- )
@@ -312,7 +381,10 @@ variable items
 : store-double ( item -- )
 \ !! store optimization is not performed, because it is not yet needed
  >r
- ." STORE_DCELL(" r@ item-name 2@ type ." , "
+ ." vm_"
+ r@ item-type @ print-type-prefix ." 2two"
+ r@ item-stack-type-name type ." ("
+ r@ item-name 2@ type ." , "
  r@ item-out-index r@ item-stack @ 2dup stack-access
  ." , "                       -1 under+ stack-access
  ." );" cr
@@ -360,7 +432,7 @@ does> ( 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@ prim prim-items-wordlist @ search-wordlist 0= if
 	item item-name 2@ nextname item declare
 	item item-first on
 	\ typ type-c-name 2@ type space type  ." ;" cr
@@ -380,7 +452,7 @@ does> ( item -- )
 	endif
 	-1 s+loop
     \ we did not find a type, abort
-    true abort" unknown prefix" ;
+    false s" unknown prefix" ?print-error ;
 
 : declaration ( item -- )
     dup item-name 2@ execute-prefix ;
@@ -389,7 +461,7 @@ does> ( item -- )
     ['] declaration map-items ;
 
 : declarations ( -- )
- wordlist dup items ! set-current
+ wordlist dup prim prim-items-wordlist ! set-current
  prim prim-effect-in prim prim-effect-in-end @ declaration-list
  prim prim-effect-out prim prim-effect-out-end @ declaration-list ;
 
@@ -411,6 +483,19 @@ does> ( item -- )
     stack item item-stack !
     item declaration ;
 
+\ types pointed to by stacks for use in combined prims
+\ !! output-c-combined shouldn't use these names!
+s" Cell"  single 0 create-type w
+s" Float" single 0 create-type r
+
+s" sp" save-mem w s" (Cell)" make-stack data-stack 
+s" fp" save-mem r s" "       make-stack fp-stack
+s" rp" save-mem w s" (Cell)" make-stack return-stack
+s" IP" save-mem w s" error don't use # on results" make-stack inst-stream
+' inst-in-index inst-stream stack-in-index-xt !
+' inst-stream <is> inst-stream-f
+\ !! initialize stack-in and stack-out
+
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset
@@ -435,7 +520,13 @@ does> ( item -- )
     inst-stream clear-stack
     prim prim-effect-in  prim prim-effect-in-end  @ ['] compute-offset-in  map-items
     prim prim-effect-out prim prim-effect-out-end @ ['] compute-offset-out map-items
-    inst-stream stack-out @ 0<> abort" # can only be on the input side" ;
+    inst-stream stack-out @ 0= s" # can only be on the input side" ?print-error ;
+
+: process-simple ( -- )
+    prim prim { W^ key } key cell
+    combinations ['] constant insert-wordlist
+    declarations compute-offsets
+    output @ execute ;
 
 : flush-a-tos { stack -- }
     stack stack-out @ 0<> stack stack-in @ 0= and
@@ -463,7 +554,7 @@ does> ( item -- )
     return-stack fill-a-tos ;
 
 : fetch ( addr -- )
- dup item-type @ type-fetch @ execute ;
+    dup item-type @ type-fetch @ execute ;
 
 : fetches ( -- )
     prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
@@ -494,28 +585,33 @@ does> ( item -- )
 : stores ( -- )
     prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ;
 
+: output-super-end ( -- )
+    prim prim-c-code 2@ s" SET_IP" search if
+	." SUPER_END;" cr
+    endif
+    2drop ;
+
 : output-c-tail ( -- )
     \ the final part of the generated C code
+    output-super-end
     ." NEXT_P1;" cr
     stores
     fill-tos
-    ." NEXT_P2;" cr ;
+    ." NEXT_P2;" ;
 
-: type-c ( c-addr u -- )
-    \ like TYPE, but replaces "TAIL;" with tail code
+: type-c-code ( c-addr u xt -- )
+    \ like TYPE, but replaces "TAIL;" with tail code produced by xt
+    { xt }
     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
+	xt execute
 	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
@@ -528,9 +624,12 @@ does> ( item -- )
     ." fputc('\n', vm_out);" cr
     ." }" cr
     ." #endif" cr ;
+
+: print-entry ( -- )
+    ." I_" prim prim-c-name 2@ type ." :" ;
     
 : output-c ( -- ) 
- ." I_" prim prim-c-name 2@ type ." :	/* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
+ print-entry ."  /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
  ." /* " prim prim-doc 2@ type ."  */" cr
  ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
  ." {" cr
@@ -543,7 +642,7 @@ does> ( item -- )
  stack-pointer-updates
  ." {" cr
  ." #line " c-line @ . quote c-filename 2@ type quote cr
- prim prim-c-code 2@ type-c
+ prim prim-c-code 2@ ['] output-c-tail type-c-code
  ." }" cr
  output-c-tail
  ." }" cr
@@ -569,6 +668,17 @@ does> ( item -- )
     ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
     ." } else " ;
 
+: output-profile ( -- )
+    \ generate code for postprocessing the VM block profile stuff
+    ." if (*ip == VM_INST(" function-number @ 0 .r ." )) {" cr
+    ."   add_inst(b, " quote  prim prim-name 2@ type quote ." );" cr
+    ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
+    prim prim-c-code 2@  s" SET_IP"    search nip nip
+    prim prim-c-code 2@  s" SUPER_END" search nip nip or if
+	."   return;" cr
+    endif
+    ." } else " cr ;
+
 : gen-arg-parm { item -- }
     item item-stack @ inst-stream = if
 	." , " item item-type @ type-c-name 2@ type space
@@ -666,14 +776,12 @@ does> ( item -- )
 
 [IFDEF] documentation
 : register-doc ( -- )
-    get-current documentation set-current
-    prim prim-name 2@ nextname create
+    prim prim-name 2@ documentation ['] create insert-wordlist
     prim prim-name 2@ 2,
     prim prim-stack-string 2@ condition-stack-effect 2,
     prim prim-wordset 2@ 2,
     prim prim-c-name 2@ condition-pronounciation 2,
-    prim prim-doc 2@ 2,
-    set-current ;
+    prim prim-doc 2@ 2, ;
 [THEN]
 
 
@@ -743,50 +851,168 @@ does> ( item -- )
 \  spTOS = (Cell)_x_sp0;
 \  NEXT_P2;
 
-1000 constant max-combined
-create combined-prims max-combined cells allot
-variable num-combined
-
-create current-depth max-stacks cells allot
-create max-depth     max-stacks cells allot
-
 : init-combined ( -- )
+    prim to combined
     0 num-combined !
     current-depth max-stacks cells erase
-    max-depth     max-stacks cells erase ;
+    max-depth     max-stacks cells erase
+    min-depth     max-stacks cells erase
+    prim prim-effect-in  prim prim-effect-in-end  !
+    prim prim-effect-out prim prim-effect-out-end ! ;
 
 : max! ( n addr -- )
     tuck @ max swap ! ;
 
+: min! ( n addr -- )
+    tuck @ min swap ! ;
+
 : add-depths { p -- }
     \ combine stack effect of p with *-depths
     max-stacks 0 ?do
-	current-depth i cells + @
-	p prim-stacks-in  i cells + @ +
-	dup max-depth i cells + max!
-	p prim-stacks-out i cells + @ -
-	current-depth i cells + !
+	current-depth i th @
+	p prim-stacks-in  i th @ +
+	dup max-depth i th max!
+	p prim-stacks-out i th @ -
+	dup min-depth i th min!
+	current-depth i th !
     loop ;
 
 : add-prim ( addr u -- )
     \ add primitive given by "addr u" to combined-prims
     primitives search-wordlist s" unknown primitive" ?print-error
     execute { p }
-    p combined-prims num-combined @ cells + !
+    p combined-prims num-combined @ th !
     1 num-combined +!
     p add-depths ;
 
 : compute-effects { q -- }
     \ compute the stack effects of q from the depths
     max-stacks 0 ?do
-	max-depth i cells + @ dup
-	q prim-stacks-in i cells + !
-	current-depth i cells + @ -
-	q prim-stacks-out i cells + !
+	max-depth i th @ dup
+	q prim-stacks-in i th !
+	current-depth i th @ -
+	q prim-stacks-out i th !
+    loop ;
+
+: make-effect-items { stack# items effect-endp -- }
+    \ effect-endp points to a pointer to the end of the current item-array
+    \ and has to be updated
+    stacks stack# th @ { stack }
+    items 0 +do
+	effect-endp @ { item }
+	i 0 <# #s stack stack-pointer 2@ holds [char] _ hold #> save-mem
+	item item-name 2!
+	stack item item-stack !
+	stack stack-type @ item item-type !
+	i item item-offset !
+	item item-first on
+	item% %size effect-endp +!
+    loop ;
+
+: init-effects { q -- }
+    \ initialize effects field for FETCHES and STORES
+    max-stacks 0 ?do
+	i q prim-stacks-in  i th @ q prim-effect-in-end  make-effect-items
+	i q prim-stacks-out i th @ q prim-effect-out-end make-effect-items
     loop ;
 
 : process-combined ( -- )
-    prim compute-effects ;
+    combined combined-prims num-combined @ cells
+    combinations ['] constant insert-wordlist
+    combined-prims num-combined @ 1- th ( last-part )
+    @ prim-c-code 2@ prim prim-c-code 2! \ used by output-super-end
+    prim compute-effects
+    prim init-effects
+    output-combined perform ;
+
+\ C output
+
+: print-item { n stack -- }
+    \ print nth stack item name
+    stack stack-type @ type-c-name 2@ type space
+    ." _" stack stack-pointer 2@ type n 0 .r ;
+
+: print-declarations-combined ( -- )
+    max-stacks 0 ?do
+	max-depth i th @ min-depth i th @ - 0 +do
+	    i stacks j th @ print-item ." ;" cr
+	loop
+    loop ;
+
+: part-fetches ( -- )
+    fetches ;
+
+: part-output-c-tail ( -- )
+    stores ;
+
+: output-combined-tail ( -- )
+    part-output-c-tail
+    prim >r combined to prim
+    in-part @ >r in-part off
+    output-c-tail
+    r> in-part ! r> to prim ;
+
+: output-part ( p -- )
+    to prim
+    ." /* " prim prim-name 2@ type ."  ( " prim prim-stack-string 2@ type ." ) */" cr
+    ." NAME(" quote prim prim-name 2@ type quote ." )" cr \ debugging
+    ." {" cr
+    print-declarations
+    part-fetches
+    print-debug-args
+    prim add-depths \ !! right place?
+    ." {" cr
+    ." #line " c-line @ . quote c-filename 2@ type quote cr
+    prim prim-c-code 2@ ['] output-combined-tail type-c-code
+    ." }" cr
+    part-output-c-tail
+    ." }" cr ;
+
+: output-parts ( -- )
+    prim >r in-part on
+    current-depth max-stacks cells erase
+    num-combined @ 0 +do
+	combined-prims i th @ output-part
+    loop
+    in-part off
+    r> to prim ;
+
+: output-c-combined ( -- )
+    print-entry cr
+    \ debugging messages just in parts
+    ." {" cr
+    ." DEF_CA" cr
+    print-declarations-combined
+    ." NEXT_P0;" cr
+    flush-tos
+    fetches
+    \ print-debug-args
+    stack-pointer-updates
+    output-parts
+    output-c-tail
+    ." }" cr
+    cr ;
+
+: output-forth-combined ( -- )
+;
+
+
+\ peephole optimization rules
+
+\ in order for this to work as intended, shorter combinations for each
+\ length must be present, and the longer combinations must follow
+\ shorter ones (this restriction may go away in the future).
+  
+: output-peephole ( -- )
+    combined-prims num-combined @ 1- cells combinations search-wordlist
+    s" the prefix for this combination must be defined earlier" ?print-error
+    ." {"
+    execute prim-num @ 5 .r ." ,"
+    combined-prims num-combined @ 1- th @ prim-num @ 5 .r ." ,"
+    combined prim-num @ 5 .r ." }, /* "
+    combined prim-c-name 2@ type ."  */"
+    cr ;
+
 
 \ the parser
 
@@ -821,11 +1047,11 @@ print-token !
     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 c@ [char] " <> 0= s" sync line syntax" ?print-error
 	char+ dup 100 [char] " scan drop swap 2dup - save-mem filename 2!
 	char+
     endif
-    dup c@ nl-char <> abort" sync line syntax"
+    dup c@ nl-char <> 0= s" sync line syntax" ?print-error
     skipsynclines @ if
 	dup char+ rawinput !
 	rawinput @ c@ cookedinput @ c!
@@ -871,7 +1097,7 @@ bl 1+ maxchar ..
 char " singleton eof-char over add-member complement	charclass noquote
 nl-char singleton					charclass nl
 eof-char singleton					charclass eof
-
+nl-char singleton eof-char over add-member		charclass nleof
 
 (( letter (( letter || digit )) **
 )) <- c-ident ( -- )
@@ -917,7 +1143,7 @@ Variable c-flag
 
 (( (( eval-comment || forth-comment || c-comment || else-comment || if-comment )) ?? nonl ** )) <- comment-body
 
-(( ` \ comment-body nl )) <- comment ( -- )
+(( ` \ comment-body nleof )) <- comment ( -- )
 
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
 <- stack-items
@@ -931,24 +1157,25 @@ Variable c-flag
    ` ( white ** {{ start }} stack-effect {{ end prim prim-stack-string 2! }} ` ) white **
    (( {{ start }} forth-ident {{ end prim prim-wordset 2! }} white **
       (( {{ start }}  c-ident {{ end prim prim-c-name 2! }} )) ??
-   )) ??  nl
-   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nl )) ??
-   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nl white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
-   (( ` :  white ** nl
-      {{ start }} (( nonl ++  nl white ** )) ++ {{ end prim prim-forth-code 2! }}
-   )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}
-   (( nl || eof ))
+   )) ??  nleof
+   (( ` " ` "  {{ start }} (( noquote ++ ` " )) ++ {{ end 1- prim prim-doc 2! }} ` " white ** nleof )) ??
+   {{ skipsynclines off line @ c-line ! filename 2@ c-filename 2! start }} (( nocolonnl nonl **  nleof white ** )) ** {{ end prim prim-c-code 2! skipsynclines on }}
+   (( ` :  white ** nleof
+      {{ start }} (( nonl ++  nleof white ** )) ++ {{ end prim prim-forth-code 2! }}
+   )) ?? {{ process-simple }}
+   nleof
 )) <- simple-primitive ( -- )
 
 (( {{ init-combined }}
    ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
-   (( nl || eof )) {{ process-combined }}
+   nleof {{ process-combined }}
 )) <- combined-primitive
 
-(( {{ make-prim to prim
+(( {{ make-prim to prim 0 to combined
       line @ name-line ! filename 2@ name-filename 2!
+      function-number @ prim prim-num !
       start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
-   (( simple-primitive || combined-primitive ))
+   (( simple-primitive || combined-primitive )) {{ 1 function-number +! }}
 )) <- primitive ( -- )
 
 (( (( comment || primitive || nl white ** )) ** eof ))
@@ -964,14 +1191,14 @@ warnings @ [IF]
     checksyncline
     primitives2something ;    
 
-: process-file ( addr u xt -- )
-    output !
+: process-file ( addr u xt-simple x-combined -- )
+    output-combined ! output !
     save-mem 2dup filename 2!
     slurp-file
     warnings @ if
 	." ------------ CUT HERE -------------" cr  endif
     primfilter ;
 
-: process      ( xt -- )
-    bl word count rot
-    process-file ;
+\  : process      ( xt -- )
+\      bl word count rot
+\      process-file ;