From b6e0f0180b99d321bc92c85f6c64f2334b4aa799 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Mon, 12 Sep 2011 12:27:34 -0700
Subject: [PATCH] alien.libraries, compiler.cfg.builder.alien: include the
result of dlerror/GetLastError in the linkage-error for missing symbols
---
basis/alien/libraries/libraries.factor | 9 +++++++++
basis/alien/libraries/unix/unix.factor | 5 +++++
basis/alien/libraries/windows/windows.factor | 5 +++++
basis/compiler/cfg/builder/alien/alien.factor | 4 ++--
basis/compiler/errors/errors.factor | 12 ++++++------
5 files changed, 27 insertions(+), 8 deletions(-)
create mode 100644 basis/alien/libraries/unix/unix.factor
create mode 100644 basis/alien/libraries/windows/windows.factor
diff --git a/basis/alien/libraries/libraries.factor b/basis/alien/libraries/libraries.factor
index 37ac47307d..e24105651a 100755
--- a/basis/alien/libraries/libraries.factor
+++ b/basis/alien/libraries/libraries.factor
@@ -5,12 +5,21 @@ kernel namespaces destructors sequences strings
system io.pathnames fry ;
IN: alien.libraries
+ERROR: unknown-dlsym-platform ;
+<< {
+ { [ os windows? ] [ "alien.libraries.windows" ] }
+ { [ os unix? ] [ "alien.libraries.unix" ] }
+ [ unknown-dlsym-platform ]
+} cond use-vocab >>
+
: dlopen ( path -- dll ) native-string>alien (dlopen) ;
: dlsym ( name dll -- alien ) [ string>symbol ] dip (dlsym) ;
: dlsym-raw ( name dll -- alien ) [ string>symbol ] dip (dlsym-raw) ;
+: dlerror ( -- message/f ) (dlerror) ;
+
SYMBOL: libraries
libraries [ H{ } clone ] initialize
diff --git a/basis/alien/libraries/unix/unix.factor b/basis/alien/libraries/unix/unix.factor
new file mode 100644
index 0000000000..8db779d013
--- /dev/null
+++ b/basis/alien/libraries/unix/unix.factor
@@ -0,0 +1,5 @@
+USING: alien.c-types alien.syntax io.encodings.utf8 ;
+IN: alien.libraries.unix
+
+FUNCTION-ALIAS: (dlerror)
+ c-string[utf8] dlerror ( ) ;
diff --git a/basis/alien/libraries/windows/windows.factor b/basis/alien/libraries/windows/windows.factor
new file mode 100644
index 0000000000..9a595c8a09
--- /dev/null
+++ b/basis/alien/libraries/windows/windows.factor
@@ -0,0 +1,5 @@
+USING: windows.errors ;
+IN: alien.libraries.windows
+
+: (dlerror) ( -- message )
+ win32-error-string ;
diff --git a/basis/compiler/cfg/builder/alien/alien.factor b/basis/compiler/cfg/builder/alien/alien.factor
index d0a4d19723..114d1deb3e 100644
--- a/basis/compiler/cfg/builder/alien/alien.factor
+++ b/basis/compiler/cfg/builder/alien/alien.factor
@@ -70,8 +70,8 @@ M: array dlsym-valid? '[ _ dlsym ] any? ;
: check-dlsym ( symbols dll -- )
dup dll-valid? [
dupd dlsym-valid?
- [ drop ] [ cfg get word>> no-such-symbol ] if
- ] [ dll-path cfg get word>> no-such-library drop ] if ;
+ [ drop ] [ dlerror cfg get word>> no-such-symbol ] if
+ ] [ dll-path "" cfg get word>> no-such-library drop ] if ;
: decorated-symbol ( params -- symbols )
[ function>> ] [ parameters>> [ stack-size ] map-sum number>string ] bi
diff --git a/basis/compiler/errors/errors.factor b/basis/compiler/errors/errors.factor
index 3881439fc0..3c00c5173e 100644
--- a/basis/compiler/errors/errors.factor
+++ b/basis/compiler/errors/errors.factor
@@ -44,7 +44,7 @@ T{ error-type
: <linkage-error> ( error word -- linkage-error )
\ linkage-error <definition-error> ;
-: linkage-error ( error word class -- )
+: linkage-error ( name message word class -- )
'[ _ boa ] dip <linkage-error> dup asset>> linkage-errors get set-at ; inline
T{ error-type
@@ -57,16 +57,16 @@ T{ error-type
{ fatal? f }
} define-error-type
-TUPLE: no-such-library name ;
+TUPLE: no-such-library name message ;
M: no-such-library summary drop "Library not found" ;
-: no-such-library ( name word -- ) \ no-such-library linkage-error ;
+: no-such-library ( name message word -- ) \ no-such-library linkage-error ;
-TUPLE: no-such-symbol name ;
+TUPLE: no-such-symbol name message ;
M: no-such-symbol summary drop "Symbol not found" ;
-: no-such-symbol ( name word -- ) \ no-such-symbol linkage-error ;
+: no-such-symbol ( name message word -- ) \ no-such-symbol linkage-error ;
-ERROR: not-compiled word error ;
\ No newline at end of file
+ERROR: not-compiled word error ;