--- gforth/libcc.fs	2008/06/17 18:46:04	1.35
+++ gforth/libcc.fs	2008/07/27 10:34:06	1.51
@@ -1,6 +1,6 @@
 \ libcc.fs	foreign function interface implemented using a C compiler
 
-\ Copyright (C) 2006,2007 Free Software Foundation, Inc.
+\ Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -136,8 +136,6 @@
 
 require struct.fs
 
-    \ counted-string
-    
 \ c-function-ft word body:
 struct
     cell% field cff-cfr \ xt of c-function-rt word
@@ -155,10 +153,14 @@ variable c-source-file-id \ contains the
 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.
+  here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works
 2variable lib-filename   \ filename without extension
 2variable lib-modulename \ basename of the file without extension
+2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
+0 value libcc-path       \ pointer to path of library directories
 
-: delete-file 2drop 0 ;
+defer replace-rpath ( c-addr1 u1 -- c-addr2 u2 )
+' noop is replace-rpath
 
 : .nb ( n -- )
     0 .r ;
@@ -282,6 +284,7 @@ const+ d \ double
 const+ r \ float
 const+ func \ C function pointer
 const+ void
+const+ file \ C file pointer
 drop
 
 set-current
@@ -298,7 +301,7 @@ set-current
     parse-libcc-type dup 0< -32 and throw swap c! ;
 
 : type-letter ( n -- c )
-    chars s" nadrfv" drop + c@ ;
+    chars s" nadrfvF" drop + c@ ;
 
 \ count-stacks
 
@@ -327,6 +330,7 @@ create count-stacks-types
 ' count-stacks-r ,
 ' count-stacks-func ,
 ' count-stacks-void ,
+' count-stacks-a ,
 
 : count-stacks ( pars -- fp-change sp-change )
     \ pars is an addr u pair
@@ -354,6 +358,9 @@ create count-stacks-types
 : gen-par-void ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     -32 throw ;
 
+: gen-par-file ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
+    ." (FILE *)(" gen-par-n ." )" ;
+
 create gen-par-types
 ' gen-par-n ,
 ' gen-par-a ,
@@ -361,6 +368,7 @@ create gen-par-types
 ' gen-par-r ,
 ' gen-par-func ,
 ' gen-par-void ,
+' gen-par-file ,
 
 : gen-par ( fp-depth1 sp-depth1 partype -- fp-depth2 sp-depth2 )
     cells gen-par-types + @ execute ;
@@ -405,6 +413,7 @@ create gen-wrapped-types
 ' gen-wrapped-r ,
 ' gen-wrapped-func ,
 ' gen-wrapped-void ,
+' gen-wrapped-a ,
 
 : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )
     cells gen-wrapped-types + @ execute ;
@@ -440,39 +449,106 @@ create gen-wrapped-types
     endif
     .\" }\n" ;
 
-: tempdir ( -- c-addr u )
-    s" TMPDIR" getenv dup 0= if
-        2drop s" /tmp"
-    then ;
+: scan-back { c-addr u1 c -- c-addr u2 }
+    \ the last occurence of c in c-addr u1 is at u2-1; if it does not
+    \ occur, u2=0.
+    c-addr 1- c-addr u1 + 1- u-do
+	i c@ c = if
+	    c-addr i over - 1+ unloop exit endif
+    1 -loop
+    c-addr 0 ;
+
+: dirname ( c-addr1 u1 -- c-addr2 u2 )
+    \ directory name of the file name c-addr1 u1, including the final "/".
+    '/ scan-back ;
+
+: basename ( c-addr1 u1 -- c-addr2 u2 )
+    \ file name without directory component
+    2dup dirname nip /string ;
 
 : gen-filename ( x -- c-addr u )
     \ generates a file basename for lib-handle-addr X
     0 <<# ['] #s $10 base-execute #> 
     s" gforth_c_" 2swap s+ #>> ;
 
-: prepend-dirname ( c-addr1 u1 -- c-addr2 u2 )
-    tempdir s" /" s+ 2over append
-    2swap drop free throw ;
+: libcc-named-dir ( -- c-addr u )
+    libcc-named-dir-v 2@ ;
 
-: c-library-name1 ( c-addr u -- )
-    \ set up filenames for a new library; c-addr u is the basename of
-    \ the library
+: libcc-tmp-dir ( -- c-addr u )
+    s" ~/.gforth/libcc-tmp/" ;
+
+: prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
+    2over s+ 2swap drop free throw ;
+
+: open-wrappers ( -- addr|0 )
+    lib-filename 2@ s" .la" s+
+    2dup libcc-named-dir string-prefix? if ( c-addr u )
+	\ see if we can open it in the path
+	libcc-named-dir nip /string
+	libcc-path open-path-file if
+	    0 exit endif
+	( wfile-id c-addr2 u2 ) rot close-file throw save-mem ( c-addr2 u2 )
+    endif
+    \ 2dup cr type
+    2dup open-lib >r
+    drop free throw r> ;
+
+: c-library-name-setup ( c-addr u -- )
     assert( c-source-file-id @ 0= )
-    prepend-dirname { d: filename }
-    here 0 , lib-handle-addr ! filename 2dup lib-filename 2!
-    2dup tempdir nip 1+ /string lib-modulename 2!
-    s" .c" s+ 2dup w/o create-file throw dup c-source-file-id !
+    { d: filename }
+    here 0 , lib-handle-addr ! filename lib-filename 2!
+    filename basename lib-modulename 2! ;
+   
+: c-library-name-create ( -- )
+    lib-filename 2@ s" .c" s+ 2dup w/o create-file throw
+    dup c-source-file-id !
     ['] print-c-prefix-lines swap outfile-execute
     drop free throw ;
 
+: c-named-library-name ( c-addr u -- )
+    \ set up filenames for a (possibly new) library; c-addr u is the
+    \ basename of the library
+    libcc-named-dir prepend-dirname c-library-name-setup
+    open-wrappers dup if
+	lib-handle-addr @ !
+    else
+	drop c-library-name-create
+    endif ;
+
+: c-tmp-library-name ( c-addr u -- )
+    \ set up filenames for a new library; c-addr u is the basename of
+    \ the library
+    libcc-tmp-dir prepend-dirname c-library-name-setup c-library-name-create ;
+
+: lib-handle ( -- addr )
+    lib-handle-addr @ @ ;
+
 : init-c-source-file ( -- )
-    c-source-file-id @ 0= if
-	here gen-filename c-library-name1
+    lib-handle 0= if
+	c-source-file-id @ 0= if
+	    here gen-filename c-tmp-library-name
+	endif
     endif ;
 
 : c-source-file ( -- file-id )
     c-source-file-id @ assert( dup ) ;
 
+: notype-execute ( ... xt -- ... )
+    what's type { oldtype } try
+	['] 2drop is type execute 0
+    restore
+	oldtype is type
+    endtry
+    throw ;
+
+: c-source-file-execute ( ... xt -- ... )
+    \ direct the output of xt to c-source-file, or nothing
+    lib-handle if
+	notype-execute
+    else
+	c-source-file outfile-execute
+    endif ;
+
 : .lib-error ( -- )
     [ifdef] lib-error
         ['] cr stderr outfile-execute
@@ -481,29 +557,29 @@ create gen-wrapped-types
 
 DEFER compile-wrapper-function ( -- )
 : compile-wrapper-function1 ( -- )
-    c-source-file close-file throw
-    0 c-source-file-id !
-    [ libtool-command s"  --silent --mode=compile gcc -I " s+
-    s" includedir" getenv append ] sliteral
-    s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
-    lib-filename 2@ append s" .lo" append ( c-addr u )
-\    cr 2dup type
-    2dup system drop free throw $? abort" libtool compile failed"
-    [ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
-    tempdir s+ s"  " append
-    lib-filename 2@ append s" .lo -o " append
-    lib-filename 2@ append s" .la" append ( c-addr u )
-    c-libs @ ['] append-l list-map
-\    2dup type cr
-    2dup system drop free throw $? abort" libtool link failed"
-    lib-filename 2@ s" .la" s+
-\    2dup type cr
-    2dup open-lib dup 0= if
-        .lib-error true abort" open-lib failed"
+    lib-handle 0= if
+	c-source-file close-file throw
+	0 c-source-file-id !
+	[ libtool-command s"  --silent --mode=compile --tag=CC " s+
+	  libtool-cc append s"  -I " append
+	  s" includedir" getenv append ] sliteral
+	s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
+	lib-filename 2@ append s" .lo" append ( c-addr u )
+	\    cr 2dup type
+	2dup system drop free throw $? abort" libtool compile failed"
+	[ libtool-command s"  --silent --mode=link --tag=CC " s+
+	  libtool-cc append s"  -module -rpath " s+ ] sliteral
+	lib-filename 2@ dirname replace-rpath s+ s"  " append
+	lib-filename 2@ append s" .lo -o " append
+	lib-filename 2@ append s" .la" append ( c-addr u )
+	c-libs @ ['] append-l list-map
+	\    2dup type cr
+	2dup system drop free throw $? abort" libtool link failed"
+	open-wrappers dup 0= if
+	    .lib-error true abort" open-lib failed"
+	endif
+	( lib-handle ) lib-handle-addr @ !
     endif
-    ( lib-handle ) lib-handle-addr @ !
-    2dup delete-file throw drop free throw
-    lib-filename 2@ s" .c" s+ 2dup delete-file throw drop free throw
     lib-filename 2@ drop free throw 0 0 lib-filename 2! ;
 ' compile-wrapper-function1 IS compile-wrapper-function
 \    s" ar rcs xxx.a xxx.o" system
@@ -522,7 +598,7 @@ DEFER compile-wrapper-function ( -- )
     noname create 2, lib-handle-addr @ ,
     parse-name { d: c-name }
     here parse-function-types c-name string,
-    ['] gen-wrapper-function c-source-file outfile-execute
+    ['] gen-wrapper-function c-source-file-execute
   does> ( ... -- ... )
     dup 2@ { xt-defer xt-cfr }
     dup cff-lha @ @ 0= if
@@ -557,15 +633,32 @@ clear-libs
     true abort" Called function of unfinished named C library" ;
 
 : c-library-name ( c-addr u -- ) \ gforth
-\G Start a C library with name @i{c-addr u}.
+\G Start a C library interface with name @i{c-addr u}.
     clear-libs
     ['] c-library-incomplete is compile-wrapper-function
-    c-library-name1 ;
+    c-named-library-name ;
 
 : c-library ( "name" -- ) \ gforth
 \G Parsing version of @code{c-library-name}
-    name save-mem c-library-name ;
+    parse-name save-mem c-library-name ;
 
-: end-c-library ( -- )
+: end-c-library ( -- ) \ gforth
+\G Finish and (if necessary) build the latest C library interface.
     ['] compile-wrapper-function1 is compile-wrapper-function
     compile-wrapper-function1 ;
+
+: init-libcc ( -- )
+    s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
+[IFDEF] make-path
+    make-path to libcc-path
+    libcc-named-dir libcc-path also-path
+    [ s" libccdir" getenv ] sliteral libcc-path also-path
+[THEN]
+;
+
+init-libcc
+
+:noname ( -- )
+    defers 'cold
+    init-libcc ;
+is 'cold