alien.libraries, compiler.cfg.builder.alien: include the result of dlerror/GetLastErr...

diff --git a/basis/alien/libraries/libraries.factor b/basis/alien/libraries/libraries.factor
index 37ac47307d56a148c8fbbeb7b49c20f639342232..e24105651a7f69f18d62e743d953ba02091374fd 100755 (executable)
--- 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 (file)
index 0000000..8db779d
--- /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 (file)
index 0000000..9a595c8
--- /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 d0a4d19723e79e1140670ac21f9c7e74b5e9af4e..114d1deb3e3fb08165d6a82e37bf9b35255e8ee4 100644 (file)
--- 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 3881439fc0ed0d1119506ad70dfaed6db546c281..3c00c5173e4ebb3fd015d93f1fea69ca92158974 100644 (file)
--- 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 ;