--- gforth/libcc.fs	2009/10/18 17:52:50	1.61
+++ gforth/libcc.fs	2012/03/22 16:27:11	1.70
@@ -1,6 +1,6 @@
 \ libcc.fs	foreign function interface implemented using a C compiler
 
-\ Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
+\ Copyright (C) 2006,2007,2008,2009,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -67,11 +67,6 @@
 \ The files are built in .../lib/gforth/$VERSION/libcc/ or
 \ ~/.gforth/libcc/$HOST/.
 
-\ other things to do:
-
-\ c-variable forth-name c-name
-\ c-constant forth-name c-name
-
 \ Todo: conversion between function pointers and xts (both directions)
 
 \ taking an xt and turning it into a function pointer:
@@ -143,6 +138,7 @@ struct
     cell% field cff-deferred \ xt of c-function deferred word
     cell% field cff-lha \ address of the lib-handle for the lib that
                         \ contains the wrapper function of the word
+    char% field cff-ctype  \ call type (function=1, value=0)
     char% field cff-rtype  \ return type
     char% field cff-np     \ number of parameters
     1 0   field cff-ptypes \ #npar parameter types
@@ -158,7 +154,7 @@ variable lib-handle-addr \ points to the
 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
+Variable libcc-path      \ pointer to path of library directories
 
 defer replace-rpath ( c-addr1 u1 -- c-addr2 u2 )
 ' noop is replace-rpath
@@ -292,16 +288,38 @@ drop
 
 set-current
 
-: parse-libcc-type ( "libcc-type" -- u )
-    parse-name libcc-types search-wordlist 0= -13 and throw execute ;
+\ call types
+0
+const+ c-func
+const+ c-val
+const+ c-var
+drop
+
+: libcc-type ( c-addr u -- u2 )
+	libcc-types search-wordlist 0= -13 and throw execute ;
+
+: parse-libcc-type ( "libcc-type" -- u )  parse-name libcc-type ;
 
-: parse-function-types ( "{libcc-type}" "--" "libcc-type" -- )
-    here 2 chars allot here begin
+: parse-return-type ( "libcc-type" -- u )
+	parse-libcc-type dup 0< -32 and throw ;
+
+: parse-function-types ( "{libcc-type}" "--" "libcc-type" -- addr )
+    c-func c, here
+    dup 2 chars allot here begin
 	parse-libcc-type dup 0>= while
 	    c,
     repeat
     drop here swap - over char+ c!
-    parse-libcc-type dup 0< -32 and throw swap c! ;
+    parse-return-type swap c! ;
+
+: parse-value-type ( "{--}" "libcc-type" -- addr )
+    c-val c, here
+    parse-libcc-type  dup 0< if drop parse-return-type then
+    c,  0 c, ;
+
+: parse-variable-type ( -- addr )
+	c-var c, here
+	s" a" libcc-type c,  0 c, ;
 
 : type-letter ( n -- c )
     chars s" nadrfv" drop + c@ ;
@@ -373,7 +391,7 @@ create gen-par-types
 
 \ the call itself
 
-: gen-wrapped-call { d: pars d: c-name fp-change1 sp-change1 -- }
+: gen-wrapped-func { d: pars d: c-name fp-change1 sp-change1 -- }
     c-name type ." ("
     fp-change1 sp-change1 pars over + swap u+do 
 	i c@ gen-par
@@ -383,6 +401,20 @@ create gen-par-types
     loop
     2drop ." )" ;
 
+: gen-wrapped-const { d: pars d: c-name fp-change1 sp-change1 -- }
+	." (" c-name type ." )" ;
+
+: gen-wrapped-var { d: pars d: c-name fp-change1 sp-change1 -- }
+	." &(" c-name type ." )" ;
+
+create gen-call-types
+' gen-wrapped-func ,
+' gen-wrapped-const ,
+' gen-wrapped-var ,
+
+: gen-wrapped-call ( pars c-name fp-change1 sp-change1 -- )
+	5 pick 3 chars - c@ cells gen-call-types + @ execute ;
+
 \ calls for various kinds of return values
 
 : gen-wrapped-void ( pars c-name fp-change1 sp-change1 -- fp-change sp-change )
@@ -434,7 +466,9 @@ create gen-wrapped-types
     \ addr points to the return type index of a c-function descriptor
     dup { descriptor }
     count { ret } count 2dup { d: pars } chars + count { d: c-name }
-    ." void " lib-modulename 2@ type ." _LTX_" descriptor wrapper-function-name 2dup type drop free throw
+    ." void "
+    [ lib-suffix s" .la" str= [IF] ] lib-modulename 2@ type ." _LTX_" [ [THEN] ]
+    descriptor wrapper-function-name 2dup type drop free throw
     .\" (GFORTH_ARGS)\n"
     .\" {\n  Cell MAYBE_UNUSED *sp = gforth_SP;\n  Float MAYBE_UNUSED *fp = gforth_FP;\n  "
     pars c-name 2over count-stacks ret gen-wrapped-stmt .\" ;\n"
@@ -478,7 +512,7 @@ create gen-wrapped-types
     2over s+ 2swap drop free throw ;
 
 : open-wrappers ( -- addr|0 )
-    lib-filename 2@ s" .la" s+
+    lib-filename 2@ lib-suffix 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
@@ -562,14 +596,14 @@ DEFER compile-wrapper-function ( -- )
     lib-handle 0= if
 	c-source-file close-file throw
 	0 c-source-file-id !
-	[ libtool-command s"  --silent --mode=compile " s+
+	[ libtool-command s"  --silent --tag=CC --mode=compile " s+
 	  libtool-cc append s"  -I '" append
 	  s" includedir" getenv append  s" '" append ] sliteral
 	s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
 	lib-filename 2@ append s" .lo" append ( c-addr u )
 	\    2dup type cr
 	2dup system drop free throw $? abort" libtool compile failed"
-	[ libtool-command s"  --silent --mode=link " s+
+	[ libtool-command s"  --silent --tag=CC --mode=link " s+
 	  libtool-cc append libtool-flags append s"  -module -rpath " s+ ] sliteral
 	lib-filename 2@ dirname replace-rpath s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
@@ -594,12 +628,12 @@ DEFER compile-wrapper-function ( -- )
     endif
     wrapper-name drop free throw ;
 
-: c-function-ft ( xt-defr xt-cfr "c-name" "{libcc-type}" "--" "libcc-type" -- )
+: c-function-ft ( xt-defr xt-cfr xt-parse "c-name" "type signature" -- )
     \ build time/first time action for c-function
-    init-c-source-file
+    { xt-parse-types } init-c-source-file
     noname create 2, lib-handle-addr @ ,
     parse-name { d: c-name }
-    here parse-function-types c-name string,
+    xt-parse-types execute c-name string,
     ['] gen-wrapper-function c-source-file-execute
   does> ( ... -- ... )
     dup 2@ { xt-defer xt-cfr }
@@ -617,11 +651,25 @@ DEFER compile-wrapper-function ( -- )
   does> ( ... -- ... )
     @ call-c ;
 
-: c-function ( "forth-name" "c-name" "@{type@}" "--" "type" -- ) \ gforth
+: (c-function) ( xt-parse "forth-name" "c-name" "{stack effect}" -- )
+    { xt-parse-types } defer lastxt dup c-function-rt
+    lastxt xt-parse-types c-function-ft
+    lastxt swap defer! ;
+
+: c-function ( "forth-name" "c-name" "@{type@}" "---" "type" -- ) \ gforth
     \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
     \G specified stack effect and calls the C function @code{c-name}.
-    defer lastxt dup c-function-rt lastxt c-function-ft
-    lastxt swap defer! ;
+    ['] parse-function-types (c-function) ;
+
+: c-value ( "forth-name" "c-name" "---" "type" -- ) \ gforth
+    \G Define a Forth word @i{forth-name}.  @i{Forth-name} has the
+    \G specified stack effect and gives the C value of @code{c-name}.
+    ['] parse-value-type (c-function) ;
+
+: c-variable ( "forth-name" "c-name" -- ) \ gforth
+    \G Define a Forth word @i{forth-name}.  @i{Forth-name} returns the
+    \G address of @code{c-name}.
+    ['] parse-variable-type (c-function) ;
 
 : clear-libs ( -- ) \ gforth
 \G Clear the list of libs
@@ -652,8 +700,8 @@ clear-libs
 
 : init-libcc ( -- )
     s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
-[IFDEF] make-path
-    make-path to libcc-path
+[IFDEF] $init
+    libcc-path $init
     libcc-named-dir libcc-path also-path
     [ s" libccdir" getenv ] sliteral libcc-path also-path
 [THEN]