--- gforth/prims2x.fs	2001/01/18 16:57:41	1.67
+++ gforth/prims2x.fs	2001/01/28 22:43:39	1.76
@@ -19,7 +19,8 @@
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 
-\ This is not very nice (hard limits, no checking, assumes 1 chars = 1)
+\ This is not very nice (hard limits, no checking, assumes 1 chars = 1).
+\ And it grew even worse when it aged.
 
 \ Optimizations:
 \ superfluous stores are removed. GCC removes the superfluous loads by itself
@@ -49,6 +50,7 @@ warnings off
 include ./search.fs			
 include ./extend.fs
 [THEN]
+include ./stuff.fs
 
 [IFUNDEF] environment?
 include ./environ.fs
@@ -58,7 +60,8 @@ include ./environ.fs
 
 include ./gray.fs
 
-100 constant max-effect \ number of things on one side of a stack effect
+32 constant max-effect \ number of things on one side of a stack effect
+4 constant max-stacks  \ the max. number of stacks (including inst-stream).
 255 constant maxchar
 maxchar 1+ constant eof-char
 #tab constant tab-char
@@ -77,26 +80,55 @@ variable line-start \ pointer to start o
 variable skipsynclines \ are sync lines ("#line ...") invisible to the parser?
 skipsynclines on 
 
+: th ( addr1 n -- addr2 )
+    cells + ;
+
+: holds ( addr u -- )
+    \ like HOLD, but for a string
+    tuck + swap 0 +do
+	1- dup c@ hold
+    loop
+    drop ;
+
 : start ( -- addr )
  cookedinput @ ;
 
 : end ( addr -- addr u )
  cookedinput @ over - ;
 
+: 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 ;
+
+: ?print-error { f addr u -- }
+    f ?not? if
+	outfile-id >r try
+	    stderr to outfile-id
+	    filename 2@ type ." :" line @ 0 .r ." : " addr u type cr
+	    print-error-line
+	    0
+	recover endtry
+	r> to outfile-id throw
+	abort
+    endif ;
+
 : quote ( -- )
     [char] " emit ;
 
-variable output \ xt ( -- ) of output word
+variable output          \ xt ( -- ) of output word for simple primitives
+variable output-combined \ xt ( -- ) of output word for combined primitives
 
 : printprim ( -- )
  output @ execute ;
 
 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 )
-    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%
@@ -115,25 +147,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 -- )
@@ -150,31 +181,54 @@ s" IP" save-mem s" error don't use # on
 
 \ various variables for storing stuff of one primitive
 
-2variable forth-name
-2variable wordset
-2variable c-name
-2variable doc
-2variable c-code
-2variable forth-code
-2variable stack-string
-create effect-in  max-effect item% %size * allot
-create effect-out max-effect item% %size * allot
-variable effect-in-end ( pointer )
-variable effect-out-end ( pointer )
+struct%
+    cell% 2* field prim-name
+    cell% 2* field prim-wordset
+    cell% 2* field prim-c-name
+    cell% 2* field prim-doc
+    cell% 2* field prim-c-code
+    cell% 2* field prim-forth-code
+    cell% 2* field prim-stack-string
+    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
+    cell%    field prim-effect-out-end
+    cell% max-stacks * field prim-stacks-in  \ number of in items per stack
+    cell% max-stacks * field prim-stacks-out \ number of out items per stack
+end-struct prim%
+
+: make-prim ( -- prim )
+    prim% %alloc { p }
+    s" " p prim-doc 2! s" " p prim-forth-code 2! s" " p prim-wordset 2!
+    p ;
+
+0 value prim
+
+wordlist constant primitives
+
+: create-prim ( prim -- )
+    get-current >r
+    primitives set-current
+    dup prim-name 2@ nextname constant
+    r> set-current ;
+
+: stack-in ( stack -- addr )
+    \ address of number of stack items in effect in
+    stack-number @ cells prim prim-stacks-in + ;
+
+: stack-out ( stack -- addr )
+    \ address of number of stack items in effect out
+    stack-number @ cells prim prim-stacks-out + ;
+
+\ global vars
 variable c-line
 2variable c-filename
 variable name-line
 2variable name-filename
 2variable last-name-filename
-
-variable primitive-number -10 primitive-number !
 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 )
@@ -223,8 +277,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
@@ -311,7 +367,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
@@ -340,9 +396,9 @@ does> ( item -- )
     ['] declaration map-items ;
 
 : declarations ( -- )
- wordlist dup items ! set-current
- effect-in effect-in-end @ declaration-list
- effect-out effect-out-end @ declaration-list ;
+ 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 ;
 
 : print-declaration { item -- }
     item item-first @ if
@@ -351,8 +407,8 @@ does> ( item -- )
     endif ;
 
 : print-declarations ( -- )
-    effect-in  effect-in-end  @ ['] print-declaration map-items
-    effect-out effect-out-end @ ['] print-declaration map-items ;
+    prim prim-effect-in  prim prim-effect-in-end  @ ['] print-declaration map-items
+    prim prim-effect-out prim prim-effect-out-end @ ['] print-declaration map-items ;
     
 : stack-prefix ( stack "prefix" -- )
     name tuck nextname create ( stack length ) 2,
@@ -362,6 +418,17 @@ does> ( item -- )
     stack item item-stack !
     item declaration ;
 
+\ types pointed to by stacks for use in combined prims
+s" Cell"  single 0 create-type cell-type
+s" Float" single 0 create-type float-type
+
+s" sp" save-mem cell-type  s" (Cell)" make-stack data-stack 
+s" fp" save-mem cell-type  s" "       make-stack fp-stack
+s" rp" save-mem float-type s" (Cell)" make-stack return-stack
+s" IP" save-mem cell-type  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
+
 \ offset computation
 \ the leftmost (i.e. deepest) item has offset 0
 \ the rightmost item has the highest offset
@@ -384,8 +451,8 @@ does> ( item -- )
 : compute-offsets ( -- )
     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
+    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" ;
 
 : flush-a-tos { stack -- }
@@ -414,10 +481,10 @@ does> ( item -- )
     return-stack fill-a-tos ;
 
 : fetch ( addr -- )
- dup item-type @ type-fetch @ execute ;
+    dup item-type @ type-fetch @ execute ;
 
 : fetches ( -- )
-    effect-in effect-in-end @ ['] fetch map-items ;
+    prim prim-effect-in prim prim-effect-in-end @ ['] fetch map-items ;
 
 : stack-pointer-update { stack -- }
     \ stack grow downwards
@@ -443,7 +510,7 @@ does> ( item -- )
  dup item-type @ type-store @ execute ;
 
 : stores ( -- )
-    effect-out effect-out-end @ ['] store map-items ;
+    prim prim-effect-out prim prim-effect-out-end @ ['] store map-items ;
 
 : output-c-tail ( -- )
     \ the final part of the generated C code
@@ -475,19 +542,20 @@ does> ( item -- )
 : print-debug-args ( -- )
     ." #ifdef VM_DEBUG" cr
     ." if (vm_debug) {" cr
-    effect-in effect-in-end @ ['] print-debug-arg map-items
+    prim prim-effect-in prim prim-effect-in-end @ ['] print-debug-arg map-items
     ." fputc('\n', vm_out);" cr
     ." }" cr
     ." #endif" cr ;
+
+: print-entry ( -- )
+    ." I_" prim prim-c-name 2@ type ." :" ;
     
 : output-c ( -- ) 
- ." I_" c-name 2@ type ." :	/* " forth-name 2@ type ."  ( " stack-string 2@ type ." ) */" cr
- ." /* " doc 2@ type ."  */" cr
- ." NAME(" quote forth-name 2@ type quote ." )" cr \ debugging
+ 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
  ." DEF_CA" cr
- declarations
- compute-offsets \ for everything else
  print-declarations
  ." NEXT_P0;" cr
  flush-tos
@@ -496,7 +564,7 @@ does> ( item -- )
  stack-pointer-updates
  ." {" cr
  ." #line " c-line @ . quote c-filename 2@ type quote cr
- c-code 2@ type-c
+ prim prim-c-code 2@ type-c
  ." }" cr
  output-c-tail
  ." }" cr
@@ -512,18 +580,15 @@ does> ( item -- )
     endif ;
 
 : disasm-args ( -- )
-    effect-in effect-in-end @ ['] disasm-arg map-items ;
+    prim prim-effect-in prim prim-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
+    ."   fputs(" quote prim prim-name 2@ type quote ." , vm_out);" cr
     disasm-args
     ."   ip += " inst-stream stack-in @ 1+ 0 .r ." ;" cr
-    ." } else "
-    1 function-number +! ;
+    ." } else " ;
 
 : gen-arg-parm { item -- }
     item item-stack @ inst-stream = if
@@ -532,7 +597,7 @@ does> ( item -- )
     endif ;
 
 : gen-args-parm ( -- )
-    effect-in effect-in-end @ ['] gen-arg-parm map-items ;
+    prim prim-effect-in prim prim-effect-in-end @ ['] gen-arg-parm map-items ;
 
 : gen-arg-gen { item -- }
     item item-stack @ inst-stream = if
@@ -541,41 +606,33 @@ does> ( item -- )
     endif ;
 
 : gen-args-gen ( -- )
-    effect-in effect-in-end @ ['] gen-arg-gen map-items ;
+    prim prim-effect-in prim prim-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
+    ." void gen_" prim prim-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 +! ;
+    ." }" cr ;
 
 : stack-used? { stack -- f }
     stack stack-in @ stack stack-out @ or 0<> ;
 
 : output-funclabel ( -- )
-  1 function-number +!
-  ." &I_" c-name 2@ type ." ," cr ;
+  ." &I_" prim prim-c-name 2@ type ." ," cr ;
 
 : output-forthname ( -- )
-  1 function-number +!
-  '" emit forth-name 2@ type '" emit ." ," cr ;
+  '" emit prim prim-name 2@ type '" emit ." ," cr ;
 
 : output-c-func ( -- )
 \ used for word libraries
-    1 function-number +!
-    ." Cell * I_" c-name 2@ type ." (Cell *SP, Cell **FP)      /* " forth-name 2@ type
-    ."  ( " stack-string 2@ type ."  ) */" cr
-    ." /* " doc 2@ type ."  */" cr
-    ." NAME(" quote forth-name 2@ type quote ." )" cr
+    ." Cell * I_" prim prim-c-name 2@ type ." (Cell *SP, Cell **FP)      /* " 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
-    declarations
-    compute-offsets \ for everything else
     print-declarations
     inst-stream  stack-used? IF ." Cell *ip=IP;" cr THEN
     data-stack   stack-used? IF ." Cell *sp=SP;" cr THEN
@@ -587,7 +644,7 @@ does> ( item -- )
     fp-stack   stack-used? IF ." *FP=fp;" cr THEN
     ." {" cr
     ." #line " c-line @ . quote c-filename 2@ type quote cr
-    c-code 2@ type
+    prim prim-c-code 2@ type
     ." }" cr
     stores
     fill-tos
@@ -596,22 +653,19 @@ does> ( item -- )
     cr ;
 
 : output-label ( -- )  
-    ." (Label)&&I_" c-name 2@ type ." ," cr
-    -1 primitive-number +! ;
+    ." (Label)&&I_" prim prim-c-name 2@ type ." ," cr ;
 
 : output-alias ( -- ) 
-    ( primitive-number @ . ." alias " ) ." Primitive " forth-name 2@ type cr
-    -1 primitive-number +! ;
+    ( primitive-number @ . ." alias " ) ." Primitive " prim prim-name 2@ type cr ;
 
 : output-forth ( -- )  
-    forth-code @ 0=
+    prim prim-forth-code @ 0=
     IF    	\ output-alias
 	\ this is bad for ec: an alias is compiled if tho word does not exist!
 	\ JAW
-    ELSE  ." : " forth-name 2@ type ."   ( "
-	stack-string 2@ type ." )" cr
-	forth-code 2@ type cr
-	-1 primitive-number +!
+    ELSE  ." : " prim prim-name 2@ type ."   ( "
+	prim prim-stack-string 2@ type ." )" cr
+	prim prim-forth-code 2@ type cr
     THEN ;
 
 : output-tag-file ( -- )
@@ -624,9 +678,9 @@ does> ( item -- )
 
 : output-tag ( -- )
     output-tag-file
-    forth-name 2@ 1+ type
+    prim prim-name 2@ 1+ type
     127 emit
-    space forth-name 2@ type space
+    space prim prim-name 2@ type space
     1 emit
     name-line @ 0 .r
     ." ,0" cr ;
@@ -634,16 +688,200 @@ does> ( item -- )
 [IFDEF] documentation
 : register-doc ( -- )
     get-current documentation set-current
-    forth-name 2@ nextname create
-    forth-name 2@ 2,
-    stack-string 2@ condition-stack-effect 2,
-    wordset 2@ 2,
-    c-name 2@ condition-pronounciation 2,
-    doc 2@ 2,
+    prim prim-name 2@ nextname create
+    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 ;
 [THEN]
 
 
+\ combining instructions
+
+\ The input should look like this:
+
+\ lit_+ = lit +
+
+\ The output should look like this:
+
+\  I_lit_+:
+\  {
+\  DEF_CA
+\  Cell _x_ip0;
+\  Cell _x_sp0;
+\  Cell _x_sp1;
+\  NEXT_P0;
+\  _x_ip0 = (Cell) IPTOS;
+\  _x_sp0 = (Cell) spTOS;
+\  INC_IP(1);
+\  /* sp += 0; */
+\  /* lit ( #w -- w ) */
+\  /*  */
+\  NAME("lit")
+\  {
+\  Cell w;
+\  w = (Cell) _x_ip0;
+\  #ifdef VM_DEBUG
+\  if (vm_debug) {
+\  fputs(" w=", vm_out); printarg_w (w);
+\  fputc('\n', vm_out);
+\  }
+\  #endif
+\  {
+\  #line 136 "./prim"
+\  }
+\  _x_sp1 = (Cell)w;
+\  }
+\  I_plus:	/* + ( n1 n2 -- n ) */
+\  /*  */
+\  NAME("+")
+\  {
+\  DEF_CA
+\  Cell n1;
+\  Cell n2;
+\  Cell n;
+\  NEXT_P0;
+\  n1 = (Cell) _x_sp0;
+\  n2 = (Cell) _x_sp1;
+\  #ifdef VM_DEBUG
+\  if (vm_debug) {
+\  fputs(" n1=", vm_out); printarg_n (n1);
+\  fputs(" n2=", vm_out); printarg_n (n2);
+\  fputc('\n', vm_out);
+\  }
+\  #endif
+\  {
+\  #line 516 "./prim"
+\  n = n1+n2;
+\  }
+\  NEXT_P1;
+\  _x_sp0 = (Cell)n;
+\  NEXT_P2;
+\  }
+\  NEXT_P1;
+\  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
+create min-depth     max-stacks cells allot
+
+: init-combined ( -- )
+    0 num-combined !
+    current-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 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 @ 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 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
+    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 ;
+    
+: output-parts ( -- )
+    prim >r
+    num-combined @ 0 +do
+	combined-prims i th @ to prim
+	output-c
+    loop
+    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 ( -- )
+    ;
+
 \ the parser
 
 eof-char max-member \ the whole character set + EOF
@@ -688,24 +926,8 @@ print-token !
     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
+    s" syntax error, wrong char" ?print-error
     rawinput @ endrawinput @ <> if
 	rawinput @ c@
 	1 chars rawinput +!
@@ -794,25 +1016,33 @@ Variable c-flag
 (( {{ start }} stack-ident {{ end 2 pick init-item item% %size + }} white ** )) **
 <- stack-items
 
-(( {{ effect-in }}  stack-items {{ effect-in-end ! }}
+(( {{ prim prim-effect-in }}  stack-items {{ prim prim-effect-in-end ! }}
    ` - ` - white **
-   {{ effect-out }} stack-items {{ effect-out-end ! }}
+   {{ prim prim-effect-out }} stack-items {{ prim prim-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 }}
+(( {{ prim create-prim }}
+   ` ( 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 forth-code 2! }}
-   )) ?? {{ printprim }}
+      {{ start }} (( nonl ++  nl white ** )) ++ {{ end prim prim-forth-code 2! }}
+   )) ?? {{  declarations compute-offsets printprim 1 function-number +! }}
    (( nl || eof ))
+)) <- simple-primitive ( -- )
+
+(( {{ init-combined }}
+   ` = (( white ++ {{ start }} forth-ident {{ end add-prim }} )) ++
+   (( nl || eof )) {{ process-combined }}
+)) <- combined-primitive
+
+(( {{ make-prim to prim
+      line @ name-line ! filename 2@ name-filename 2!
+      start }} forth-ident {{ end 2dup prim prim-name 2! prim prim-c-name 2! }}  white ++
+   (( simple-primitive || combined-primitive ))
 )) <- primitive ( -- )
 
 (( (( comment || primitive || nl white ** )) ** eof ))
@@ -821,29 +1051,21 @@ 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 ;
+: primfilter ( addr u -- )
+    \ process the string at addr u
+    over dup rawinput ! dup line-start ! cookedinput !
+    + endrawinput !
+    checksyncline
+    primitives2something ;    
 
-: process-file ( addr u xt -- )
-    >r
+: process-file ( addr u xt-simple x-combined -- )
+    output-combined ! output !
     save-mem 2dup filename 2!
-    0 function-number !
-    r/o open-file abort" cannot open file"
+    slurp-file
     warnings @ if
 	." ------------ CUT HERE -------------" cr  endif
-    r> primfilter ;
+    primfilter ;
 
-: process      ( xt -- )
-    bl word count rot
-    process-file ;
+\  : process      ( xt -- )
+\      bl word count rot
+\      process-file ;