From 63e06589bddfa387fdbe41cc0abeaeac83f7b205 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 26 Mar 2009 18:56:10 -0500 Subject: [PATCH 1/2] don't normalize-path in add-library --- basis/alien/libraries/libraries.factor | 1 - basis/compiler/tests/alien.factor | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/basis/alien/libraries/libraries.factor b/basis/alien/libraries/libraries.factor index adb9eeb1bb..3fcc15974c 100644 --- a/basis/alien/libraries/libraries.factor +++ b/basis/alien/libraries/libraries.factor @@ -18,5 +18,4 @@ TUPLE: library path abi dll ; library dup [ dll>> ] when ; : add-library ( name path abi -- ) - [ dup [ normalize-path ] when ] dip swap libraries get set-at ; diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor index aa9346f788..b26abb561c 100644 --- a/basis/compiler/tests/alien.factor +++ b/basis/compiler/tests/alien.factor @@ -1,18 +1,19 @@ -IN: compiler.tests USING: alien alien.c-types alien.syntax compiler kernel namespaces namespaces tools.test sequences stack-checker stack-checker.errors words arrays parser quotations continuations effects namespaces.private io io.streams.string memory system threads tools.test math accessors combinators specialized-arrays.float alien.libraries ; +IN: compiler.tests << : libfactor-ffi-tests-path ( -- string ) + "resource:" normalize-path { - { [ os winnt? ] [ "resource:libfactor-ffi-test.dll" ] } - { [ os macosx? ] [ "resource:libfactor-ffi-test.dylib" ] } - { [ os unix? ] [ "resource:libfactor-ffi-test.so" ] } - } cond ; + { [ os winnt? ] [ "libfactor-ffi-test.dll" ] } + { [ os macosx? ] [ "libfactor-ffi-test.dylib" ] } + { [ os unix? ] [ "libfactor-ffi-test.so" ] } + } cond append-path ; "f-cdecl" libfactor-ffi-tests-path "cdecl" add-library From 73b8bf1193deb75a4d147c979fc05c88df7cebb6 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 26 Mar 2009 19:58:23 -0500 Subject: [PATCH 2/2] fix using list --- basis/compiler/tests/alien.factor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/basis/compiler/tests/alien.factor b/basis/compiler/tests/alien.factor index b26abb561c..7d65ea7103 100644 --- a/basis/compiler/tests/alien.factor +++ b/basis/compiler/tests/alien.factor @@ -3,7 +3,8 @@ namespaces namespaces tools.test sequences stack-checker stack-checker.errors words arrays parser quotations continuations effects namespaces.private io io.streams.string memory system threads tools.test math accessors combinators -specialized-arrays.float alien.libraries ; +specialized-arrays.float alien.libraries io.pathnames +io.backend ; IN: compiler.tests <<