From 3c29b4c1315c6ece6bcedbc98b54b8196b5d158e Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 4 May 2012 09:03:27 -0700 Subject: [PATCH] math.blas, alien.fortran: Back from beyond the grave. --- {unmaintained => extra}/alien/fortran/authors.txt | 0 {unmaintained => extra}/alien/fortran/fortran-docs.factor | 0 .../alien/fortran/fortran-tests.factor | 0 {unmaintained => extra}/alien/fortran/fortran.factor | 8 ++++---- {unmaintained => extra}/alien/fortran/summary.txt | 0 {unmaintained => extra}/alien/fortran/tags.txt | 0 .../math/blas/config/config-docs.factor | 0 {unmaintained => extra}/math/blas/config/config.factor | 2 +- {unmaintained => extra}/math/blas/ffi/authors.txt | 0 {unmaintained => extra}/math/blas/ffi/ffi.factor | 0 {unmaintained => extra}/math/blas/ffi/summary.txt | 0 {unmaintained => extra}/math/blas/ffi/tags.txt | 0 {unmaintained => extra}/math/blas/matrices/authors.txt | 0 .../math/blas/matrices/matrices-docs.factor | 0 .../math/blas/matrices/matrices-tests.factor | 0 .../math/blas/matrices/matrices.factor | 0 {unmaintained => extra}/math/blas/matrices/summary.txt | 0 {unmaintained => extra}/math/blas/matrices/tags.txt | 0 {unmaintained => extra}/math/blas/vectors/authors.txt | 0 {unmaintained => extra}/math/blas/vectors/summary.txt | 0 {unmaintained => extra}/math/blas/vectors/tags.txt | 0 .../math/blas/vectors/vectors-docs.factor | 0 .../math/blas/vectors/vectors-tests.factor | 0 {unmaintained => extra}/math/blas/vectors/vectors.factor | 0 24 files changed, 5 insertions(+), 5 deletions(-) rename {unmaintained => extra}/alien/fortran/authors.txt (100%) rename {unmaintained => extra}/alien/fortran/fortran-docs.factor (100%) rename {unmaintained => extra}/alien/fortran/fortran-tests.factor (100%) rename {unmaintained => extra}/alien/fortran/fortran.factor (98%) rename {unmaintained => extra}/alien/fortran/summary.txt (100%) rename {unmaintained => extra}/alien/fortran/tags.txt (100%) rename {unmaintained => extra}/math/blas/config/config-docs.factor (100%) rename {unmaintained => extra}/math/blas/config/config.factor (91%) rename {unmaintained => extra}/math/blas/ffi/authors.txt (100%) rename {unmaintained => extra}/math/blas/ffi/ffi.factor (100%) rename {unmaintained => extra}/math/blas/ffi/summary.txt (100%) rename {unmaintained => extra}/math/blas/ffi/tags.txt (100%) rename {unmaintained => extra}/math/blas/matrices/authors.txt (100%) rename {unmaintained => extra}/math/blas/matrices/matrices-docs.factor (100%) rename {unmaintained => extra}/math/blas/matrices/matrices-tests.factor (100%) rename {unmaintained => extra}/math/blas/matrices/matrices.factor (100%) rename {unmaintained => extra}/math/blas/matrices/summary.txt (100%) rename {unmaintained => extra}/math/blas/matrices/tags.txt (100%) rename {unmaintained => extra}/math/blas/vectors/authors.txt (100%) rename {unmaintained => extra}/math/blas/vectors/summary.txt (100%) rename {unmaintained => extra}/math/blas/vectors/tags.txt (100%) rename {unmaintained => extra}/math/blas/vectors/vectors-docs.factor (100%) rename {unmaintained => extra}/math/blas/vectors/vectors-tests.factor (100%) rename {unmaintained => extra}/math/blas/vectors/vectors.factor (100%) diff --git a/unmaintained/alien/fortran/authors.txt b/extra/alien/fortran/authors.txt similarity index 100% rename from unmaintained/alien/fortran/authors.txt rename to extra/alien/fortran/authors.txt diff --git a/unmaintained/alien/fortran/fortran-docs.factor b/extra/alien/fortran/fortran-docs.factor similarity index 100% rename from unmaintained/alien/fortran/fortran-docs.factor rename to extra/alien/fortran/fortran-docs.factor diff --git a/unmaintained/alien/fortran/fortran-tests.factor b/extra/alien/fortran/fortran-tests.factor similarity index 100% rename from unmaintained/alien/fortran/fortran-tests.factor rename to extra/alien/fortran/fortran-tests.factor diff --git a/unmaintained/alien/fortran/fortran.factor b/extra/alien/fortran/fortran.factor similarity index 98% rename from unmaintained/alien/fortran/fortran.factor rename to extra/alien/fortran/fortran.factor index 5d2bfe0142..75178f931b 100755 --- a/unmaintained/alien/fortran/fortran.factor +++ b/extra/alien/fortran/fortran.factor @@ -17,7 +17,7 @@ SINGLETONS: f2c-abi g95-abi gfortran-abi intel-unix-abi intel-windows-abi ; "I77" "libI77.so" cdecl add-library "F77" "libF77.so" cdecl add-library ; -os netbsd? [ add-f2c-libraries ] when +! os netbsd? [ add-f2c-libraries ] when >> : alien>nstring ( alien len encoding -- string ) @@ -440,15 +440,15 @@ MACRO: fortran-invoke ( return library function parameters -- ) [ \ fortran-invoke 5 [ ] nsequence ] dip define-declared ; SYNTAX: SUBROUTINE: - f current-library get scan ";" parse-tokens + f current-library get scan-token ";" parse-tokens [ "()" subseq? not ] filter define-fortran-function ; SYNTAX: FUNCTION: - scan current-library get scan ";" parse-tokens + scan-token current-library get scan-token ";" parse-tokens [ "()" subseq? not ] filter define-fortran-function ; SYNTAX: LIBRARY: - scan + scan-token [ current-library set ] [ set-fortran-abi ] bi ; diff --git a/unmaintained/alien/fortran/summary.txt b/extra/alien/fortran/summary.txt similarity index 100% rename from unmaintained/alien/fortran/summary.txt rename to extra/alien/fortran/summary.txt diff --git a/unmaintained/alien/fortran/tags.txt b/extra/alien/fortran/tags.txt similarity index 100% rename from unmaintained/alien/fortran/tags.txt rename to extra/alien/fortran/tags.txt diff --git a/unmaintained/math/blas/config/config-docs.factor b/extra/math/blas/config/config-docs.factor similarity index 100% rename from unmaintained/math/blas/config/config-docs.factor rename to extra/math/blas/config/config-docs.factor diff --git a/unmaintained/math/blas/config/config.factor b/extra/math/blas/config/config.factor similarity index 91% rename from unmaintained/math/blas/config/config.factor rename to extra/math/blas/config/config.factor index 76524d80ee..4c9f785284 100644 --- a/unmaintained/math/blas/config/config.factor +++ b/extra/math/blas/config/config.factor @@ -16,7 +16,7 @@ blas-fortran-abi [ { [ os macosx? ] [ intel-unix-abi ] } { [ os windows? cpu x86.32? and ] [ f2c-abi ] } { [ os windows? cpu x86.64? and ] [ gfortran-abi ] } - { [ os freebsd? ] [ gfortran-abi ] } + ! { [ os freebsd? ] [ gfortran-abi ] } { [ os linux? ] [ gfortran-abi ] } [ f2c-abi ] } cond diff --git a/unmaintained/math/blas/ffi/authors.txt b/extra/math/blas/ffi/authors.txt similarity index 100% rename from unmaintained/math/blas/ffi/authors.txt rename to extra/math/blas/ffi/authors.txt diff --git a/unmaintained/math/blas/ffi/ffi.factor b/extra/math/blas/ffi/ffi.factor similarity index 100% rename from unmaintained/math/blas/ffi/ffi.factor rename to extra/math/blas/ffi/ffi.factor diff --git a/unmaintained/math/blas/ffi/summary.txt b/extra/math/blas/ffi/summary.txt similarity index 100% rename from unmaintained/math/blas/ffi/summary.txt rename to extra/math/blas/ffi/summary.txt diff --git a/unmaintained/math/blas/ffi/tags.txt b/extra/math/blas/ffi/tags.txt similarity index 100% rename from unmaintained/math/blas/ffi/tags.txt rename to extra/math/blas/ffi/tags.txt diff --git a/unmaintained/math/blas/matrices/authors.txt b/extra/math/blas/matrices/authors.txt similarity index 100% rename from unmaintained/math/blas/matrices/authors.txt rename to extra/math/blas/matrices/authors.txt diff --git a/unmaintained/math/blas/matrices/matrices-docs.factor b/extra/math/blas/matrices/matrices-docs.factor similarity index 100% rename from unmaintained/math/blas/matrices/matrices-docs.factor rename to extra/math/blas/matrices/matrices-docs.factor diff --git a/unmaintained/math/blas/matrices/matrices-tests.factor b/extra/math/blas/matrices/matrices-tests.factor similarity index 100% rename from unmaintained/math/blas/matrices/matrices-tests.factor rename to extra/math/blas/matrices/matrices-tests.factor diff --git a/unmaintained/math/blas/matrices/matrices.factor b/extra/math/blas/matrices/matrices.factor similarity index 100% rename from unmaintained/math/blas/matrices/matrices.factor rename to extra/math/blas/matrices/matrices.factor diff --git a/unmaintained/math/blas/matrices/summary.txt b/extra/math/blas/matrices/summary.txt similarity index 100% rename from unmaintained/math/blas/matrices/summary.txt rename to extra/math/blas/matrices/summary.txt diff --git a/unmaintained/math/blas/matrices/tags.txt b/extra/math/blas/matrices/tags.txt similarity index 100% rename from unmaintained/math/blas/matrices/tags.txt rename to extra/math/blas/matrices/tags.txt diff --git a/unmaintained/math/blas/vectors/authors.txt b/extra/math/blas/vectors/authors.txt similarity index 100% rename from unmaintained/math/blas/vectors/authors.txt rename to extra/math/blas/vectors/authors.txt diff --git a/unmaintained/math/blas/vectors/summary.txt b/extra/math/blas/vectors/summary.txt similarity index 100% rename from unmaintained/math/blas/vectors/summary.txt rename to extra/math/blas/vectors/summary.txt diff --git a/unmaintained/math/blas/vectors/tags.txt b/extra/math/blas/vectors/tags.txt similarity index 100% rename from unmaintained/math/blas/vectors/tags.txt rename to extra/math/blas/vectors/tags.txt diff --git a/unmaintained/math/blas/vectors/vectors-docs.factor b/extra/math/blas/vectors/vectors-docs.factor similarity index 100% rename from unmaintained/math/blas/vectors/vectors-docs.factor rename to extra/math/blas/vectors/vectors-docs.factor diff --git a/unmaintained/math/blas/vectors/vectors-tests.factor b/extra/math/blas/vectors/vectors-tests.factor similarity index 100% rename from unmaintained/math/blas/vectors/vectors-tests.factor rename to extra/math/blas/vectors/vectors-tests.factor diff --git a/unmaintained/math/blas/vectors/vectors.factor b/extra/math/blas/vectors/vectors.factor similarity index 100% rename from unmaintained/math/blas/vectors/vectors.factor rename to extra/math/blas/vectors/vectors.factor