--- gforth/libcc.fs	2007/04/25 22:11:29	1.12
+++ gforth/libcc.fs	2007/05/28 12:07:30	1.14
@@ -99,6 +99,11 @@ struct
     \  counted string: c-name
 end-struct cff%
 
+variable c-source-file-id \ contains the source file id of the current batch
+0 c-source-file-id !
+variable lib-handle-addr \ points to the library handle of the current batch.
+                         \ the library handle is 0 if the current
+                         \ batch is not yet compiled.
 
 : .nb ( n -- )
     0 .r ;
@@ -158,19 +163,22 @@ end-struct c-prefix%
 variable c-prefix-lines 0 c-prefix-lines !
 variable c-prefix-lines-end c-prefix-lines c-prefix-lines-end !
 
+: print-c-prefix-line ( node -- )
+    dup c-prefix-chars swap c-prefix-count @ type cr ;
+
+: print-c-prefix-lines ( -- )
+    c-prefix-lines @ ['] print-c-prefix-line list-map ;
+
 : save-c-prefix-line ( c-addr u -- )
+    c-source-file-id @ ?dup-if
+	>r 2dup r> write-line throw
+    then
     align here 0 , c-prefix-lines-end list-append ( c-addr u )
     longstring, ;
 
 : \c ( "rest-of-line" -- )
     -1 parse save-c-prefix-line ;
 
-: print-c-prefix-line ( node -- )
-    dup c-prefix-chars swap c-prefix-count @ type cr ;
-
-: print-c-prefix-lines ( -- )
-    c-prefix-lines @ ['] print-c-prefix-line list-map ;
-
 \c #include "engine/libcc.h"
 
 \ Types (for parsing)
@@ -333,7 +341,7 @@ create gen-wrapped-types
 : gen-wrapper-function ( addr -- )
     \ addr points to the return type index of a c-function descriptor
     dup { descriptor }
-    c@+ { ret } count 2dup { d: pars } chars + count { d: c-name }
+    count { ret } count 2dup { d: pars } chars + count { d: c-name }
     ." void " descriptor wrapper-function-name 2dup type drop free throw
     .\" (void)\n"
     .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "
@@ -346,12 +354,6 @@ create gen-wrapped-types
     endif
     .\" }\n" ;
 
-variable c-source-file-id \ contains the source file id of the current batch
-0 c-source-file-id !
-variable lib-handle-addr \ points to the library handle of the current batch.
-                         \ the library handle is 0 if the current
-                         \ batch is not yet compiled.
-
 : init-c-source-file ( -- )
     c-source-file-id @ 0= if
 	s" xxx.c" w/o create-file throw dup c-source-file-id !
@@ -413,35 +415,3 @@ s" Library not found" exception constant
     create parse-name open-lib dup 0= err-nolib and throw ,
   does> ( -- lib )
     @ ;
-
-\ test
-
-\ test all parameter and return types
-
-\ cr .( #include "engine/libcc.h")
-\ cr .( #include <unistd.h>)
-\ cr ." typedef void (* func)(int);
-\ cr ." int test1(int,char*,long,double,void (*)(int));"
-\ cr ." Cell *test2(void);"
-\ cr ." int test3(void);"
-\ cr ." float test4(void);"
-\ cr ." func test5(void);"
-\ cr ." void test6(void);"
-\ cr
-
-\ c-function dlseek lseek n d n -- d
-\ c-function n test1 n a d r func -- n
-\ c-function a test2 -- a
-\ c-function d test3 -- d
-\ c-function r test4 -- r
-\ c-function func test5 -- func
-\ c-function void test6 -- void
-
-\c #include <string.h>
-\c #include <stdlib.h>
-
-c-function strlen strlen a -- n
-c-function labs labs n -- n
-
-cr s\" fooo\0" 2dup dump drop .s strlen cr .s drop cr 
--5 labs .s drop cr