From 783eb0bb53ea536a56e25fc9de1046fedd609530 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 30 Aug 2009 04:06:41 -0500 Subject: [PATCH 1/5] change all stat, statfs, statvfs and calendar structs --- basis/calendar/unix/unix.factor | 15 +++-- basis/io/files/info/unix/bsd/bsd.factor | 9 +-- .../io/files/info/unix/freebsd/freebsd.factor | 57 ++++++++++--------- basis/io/files/info/unix/linux/linux.factor | 30 +++++----- basis/io/files/info/unix/macosx/macosx.factor | 48 ++++++++-------- basis/io/files/info/unix/netbsd/netbsd.factor | 57 +++++++++---------- .../io/files/info/unix/openbsd/openbsd.factor | 56 +++++++++--------- basis/io/files/info/unix/unix.factor | 41 +++++++------ basis/unix/stat/freebsd/32/32.factor | 30 ---------- basis/unix/stat/freebsd/32/tags.txt | 1 - basis/unix/stat/freebsd/64/64.factor | 30 ---------- basis/unix/stat/freebsd/64/tags.txt | 1 - basis/unix/stat/freebsd/freebsd.factor | 30 ++++++++-- basis/unix/stat/linux/32/32.factor | 37 ++++++------ basis/unix/stat/linux/64/64.factor | 37 ++++++------ basis/unix/stat/macosx/macosx.factor | 44 +++++++------- basis/unix/stat/netbsd/32/32.factor | 38 ++++++------- basis/unix/stat/netbsd/64/64.factor | 38 ++++++------- basis/unix/stat/openbsd/openbsd.factor | 42 +++++++------- basis/unix/stat/stat.factor | 10 ++-- basis/unix/statfs/freebsd/freebsd.factor | 48 ++++++++-------- basis/unix/statfs/linux/linux.factor | 26 ++++----- basis/unix/statfs/macosx/macosx.factor | 46 +++++++-------- basis/unix/statfs/openbsd/openbsd.factor | 48 ++++++++-------- basis/unix/statvfs/freebsd/freebsd.factor | 26 ++++----- basis/unix/statvfs/linux/linux.factor | 28 ++++----- basis/unix/statvfs/macosx/macosx.factor | 26 ++++----- basis/unix/statvfs/netbsd/netbsd.factor | 52 ++++++++--------- basis/unix/statvfs/openbsd/openbsd.factor | 26 ++++----- basis/unix/time/time.factor | 51 +++++++++-------- 30 files changed, 486 insertions(+), 542 deletions(-) delete mode 100644 basis/unix/stat/freebsd/32/32.factor delete mode 100644 basis/unix/stat/freebsd/32/tags.txt delete mode 100644 basis/unix/stat/freebsd/64/64.factor delete mode 100644 basis/unix/stat/freebsd/64/tags.txt diff --git a/basis/calendar/unix/unix.factor b/basis/calendar/unix/unix.factor index aa4e8f7e9a..28e54b89fb 100644 --- a/basis/calendar/unix/unix.factor +++ b/basis/calendar/unix/unix.factor @@ -1,28 +1,27 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. USING: alien alien.c-types alien.syntax arrays calendar -kernel math unix unix.time unix.types namespaces system ; +kernel math unix unix.time unix.types namespaces system +accessors classes.struct ; IN: calendar.unix : timeval>seconds ( timeval -- seconds ) - [ timeval-sec seconds ] [ timeval-usec microseconds ] bi - time+ ; + [ sec>> seconds ] [ usec>> microseconds ] bi time+ ; : timeval>unix-time ( timeval -- timestamp ) timeval>seconds since-1970 ; : timespec>seconds ( timespec -- seconds ) - [ timespec-sec seconds ] [ timespec-nsec nanoseconds ] bi - time+ ; + [ sec>> seconds ] [ nsec>> nanoseconds ] bi time+ ; : timespec>unix-time ( timespec -- timestamp ) timespec>seconds since-1970 ; : get-time ( -- alien ) - f time localtime ; + f time localtime tm memory>struct ; : timezone-name ( -- string ) - get-time tm-zone ; + get-time zone>> ; M: unix gmt-offset ( -- hours minutes seconds ) - get-time tm-gmtoff 3600 /mod 60 /mod ; + get-time gmtoff>> 3600 /mod 60 /mod ; diff --git a/basis/io/files/info/unix/bsd/bsd.factor b/basis/io/files/info/unix/bsd/bsd.factor index 6d0f3e7161..64fcd0b5d6 100644 --- a/basis/io/files/info/unix/bsd/bsd.factor +++ b/basis/io/files/info/unix/bsd/bsd.factor @@ -12,10 +12,7 @@ M: bsd new-file-info ( -- class ) bsd-file-info new ; M: bsd stat>file-info ( stat -- file-info ) [ call-next-method ] keep { - [ stat-st_flags >>flags ] - [ stat-st_gen >>gen ] - [ - stat-st_birthtimespec timespec>unix-time - >>birth-time - ] + [ st_flags>> >>flags ] + [ st_gen>> >>gen ] + [ st_birthtimespec>> timespec>unix-time >>birth-time ] } cleave ; diff --git a/basis/io/files/info/unix/freebsd/freebsd.factor b/basis/io/files/info/unix/freebsd/freebsd.factor index 61d7a1d921..8c55166cb7 100644 --- a/basis/io/files/info/unix/freebsd/freebsd.factor +++ b/basis/io/files/info/unix/freebsd/freebsd.factor @@ -4,7 +4,8 @@ USING: accessors alien.c-types alien.syntax combinators io.backend io.files io.files.info io.files.unix kernel math system unix unix.statfs.freebsd unix.statvfs.freebsd unix.getfsstat.freebsd sequences grouping alien.strings io.encodings.utf8 unix.types -specialized-arrays.direct.uint arrays io.files.info.unix ; +specialized-arrays.direct.uint arrays io.files.info.unix +classes.struct ; IN: io.files.info.unix.freebsd TUPLE: freebsd-file-system-info < unix-file-system-info @@ -13,43 +14,43 @@ version io-size owner syncreads syncwrites asyncreads asyncwrites ; M: freebsd new-file-system-info freebsd-file-system-info new ; M: freebsd file-system-statfs ( path -- byte-array ) - "statfs" [ statfs io-error ] keep ; + \ statfs [ statfs io-error ] keep ; M: freebsd statfs>file-system-info ( file-system-info statvfs -- file-system-info ) { - [ statfs-f_version >>version ] - [ statfs-f_type >>type ] - [ statfs-f_flags >>flags ] - [ statfs-f_bsize >>block-size ] - [ statfs-f_iosize >>io-size ] - [ statfs-f_blocks >>blocks ] - [ statfs-f_bfree >>blocks-free ] - [ statfs-f_bavail >>blocks-available ] - [ statfs-f_files >>files ] - [ statfs-f_ffree >>files-free ] - [ statfs-f_syncwrites >>syncwrites ] - [ statfs-f_asyncwrites >>asyncwrites ] - [ statfs-f_syncreads >>syncreads ] - [ statfs-f_asyncreads >>asyncreads ] - [ statfs-f_namemax >>name-max ] - [ statfs-f_owner >>owner ] - [ statfs-f_fsid 2 >array >>id ] - [ statfs-f_fstypename utf8 alien>string >>type ] - [ statfs-f_mntfromname utf8 alien>string >>device-name ] - [ statfs-f_mntonname utf8 alien>string >>mount-point ] + [ f_version>> >>version ] + [ f_type>> >>type ] + [ f_flags>> >>flags ] + [ f_bsize>> >>block-size ] + [ f_iosize>> >>io-size ] + [ f_blocks>> >>blocks ] + [ f_bfree>> >>blocks-free ] + [ f_bavail>> >>blocks-available ] + [ f_files>> >>files ] + [ f_ffree>> >>files-free ] + [ f_syncwrites>> >>syncwrites ] + [ f_asyncwrites>> >>asyncwrites ] + [ f_syncreads>> >>syncreads ] + [ f_asyncreads>> >>asyncreads ] + [ f_namemax>> >>name-max ] + [ f_owner>> >>owner ] + [ f_fsid>> 2 >array >>id ] + [ f_fstypename>> utf8 alien>string >>type ] + [ f_mntfromname>> utf8 alien>string >>device-name ] + [ f_mntonname>> utf8 alien>string >>mount-point ] } cleave ; M: freebsd file-system-statvfs ( path -- byte-array ) - "statvfs" [ statvfs io-error ] keep ; + \ statvfs [ \ statvfs io-error ] keep ; M: freebsd statvfs>file-system-info ( file-system-info statvfs -- file-system-info ) { - [ statvfs-f_favail >>files-available ] - [ statvfs-f_frsize >>preferred-block-size ] + [ f_favail>> >>files-available ] + [ f_frsize>> >>preferred-block-size ] } cleave ; M: freebsd file-systems ( -- array ) f 0 0 getfsstat dup io-error - "statfs" dup dup length 0 getfsstat io-error - "statfs" heap-size group - [ statfs-f_mntonname alien>native-string file-system-info ] map ; + \ statfs dup dup length 0 getfsstat io-error + statfs heap-size group + [ f_mntonname>> alien>native-string file-system-info ] map ; diff --git a/basis/io/files/info/unix/linux/linux.factor b/basis/io/files/info/unix/linux/linux.factor index a8eb9b65a0..bcf3d5f5a4 100644 --- a/basis/io/files/info/unix/linux/linux.factor +++ b/basis/io/files/info/unix/linux/linux.factor @@ -5,7 +5,7 @@ io.backend io.encodings.utf8 io.files io.files.info io.streams.string io.files.unix kernel math.order namespaces sequences sorting system unix unix.statfs.linux unix.statvfs.linux io.files.links specialized-arrays.direct.uint arrays io.files.info.unix assocs -io.pathnames unix.types ; +io.pathnames unix.types classes.struct ; FROM: csv => delimiter ; IN: io.files.info.unix.linux @@ -15,30 +15,30 @@ namelen ; M: linux new-file-system-info linux-file-system-info new ; M: linux file-system-statfs ( path -- byte-array ) - "statfs64" [ statfs64 io-error ] keep ; + \ statfs64 [ statfs64 io-error ] keep ; M: linux statfs>file-system-info ( struct -- statfs ) { - [ statfs64-f_type >>type ] - [ statfs64-f_bsize >>block-size ] - [ statfs64-f_blocks >>blocks ] - [ statfs64-f_bfree >>blocks-free ] - [ statfs64-f_bavail >>blocks-available ] - [ statfs64-f_files >>files ] - [ statfs64-f_ffree >>files-free ] - [ statfs64-f_fsid 2 >array >>id ] - [ statfs64-f_namelen >>namelen ] - [ statfs64-f_frsize >>preferred-block-size ] + [ f_type>> >>type ] + [ f_bsize>> >>block-size ] + [ f_blocks>> >>blocks ] + [ f_bfree>> >>blocks-free ] + [ f_bavail>> >>blocks-available ] + [ f_files>> >>files ] + [ f_ffree>> >>files-free ] + [ f_fsid>> 2 >array >>id ] + [ f_namelen>> >>namelen ] + [ f_frsize>> >>preferred-block-size ] ! [ statfs64-f_spare >>spare ] } cleave ; M: linux file-system-statvfs ( path -- byte-array ) - "statvfs64" [ statvfs64 io-error ] keep ; + \ statvfs64 [ statvfs64 io-error ] keep ; M: linux statvfs>file-system-info ( struct -- statfs ) { - [ statvfs64-f_flag >>flags ] - [ statvfs64-f_namemax >>name-max ] + [ f_flag>> >>flags ] + [ f_namemax>> >>name-max ] } cleave ; TUPLE: mtab-entry file-system-name mount-point type options diff --git a/basis/io/files/info/unix/macosx/macosx.factor b/basis/io/files/info/unix/macosx/macosx.factor index cfc13ba015..bd40f39534 100644 --- a/basis/io/files/info/unix/macosx/macosx.factor +++ b/basis/io/files/info/unix/macosx/macosx.factor @@ -4,7 +4,7 @@ USING: accessors alien.c-types alien.strings combinators grouping io.encodings.utf8 io.files kernel math sequences system unix io.files.unix specialized-arrays.direct.uint arrays unix.statfs.macosx unix.statvfs.macosx unix.getfsstat.macosx -io.files.info.unix io.files.info ; +io.files.info.unix io.files.info classes.struct struct-arrays ; IN: io.files.info.unix.macosx TUPLE: macosx-file-system-info < unix-file-system-info @@ -12,41 +12,39 @@ io-size owner type-id filesystem-subtype ; M: macosx file-systems ( -- array ) f dup 0 getmntinfo64 dup io-error - [ *void* ] dip - "statfs64" heap-size [ * memory>byte-array ] keep group - [ statfs64-f_mntonname utf8 alien>string file-system-info ] map ; - ! [ [ new-file-system-info ] dip statfs>file-system-info ] map ; + [ *void* ] dip \ statfs64 + [ f_mntonname>> utf8 alien>string file-system-info ] { } map-as ; M: macosx new-file-system-info macosx-file-system-info new ; M: macosx file-system-statfs ( normalized-path -- statfs ) - "statfs64" [ statfs64 io-error ] keep ; + \ statfs64 [ statfs64 io-error ] keep ; M: macosx file-system-statvfs ( normalized-path -- statvfs ) - "statvfs" [ statvfs io-error ] keep ; + \ statvfs [ statvfs io-error ] keep ; M: macosx statfs>file-system-info ( file-system-info byte-array -- file-system-info' ) { - [ statfs64-f_bsize >>block-size ] - [ statfs64-f_iosize >>io-size ] - [ statfs64-f_blocks >>blocks ] - [ statfs64-f_bfree >>blocks-free ] - [ statfs64-f_bavail >>blocks-available ] - [ statfs64-f_files >>files ] - [ statfs64-f_ffree >>files-free ] - [ statfs64-f_fsid 2 >array >>id ] - [ statfs64-f_owner >>owner ] - [ statfs64-f_type >>type-id ] - [ statfs64-f_flags >>flags ] - [ statfs64-f_fssubtype >>filesystem-subtype ] - [ statfs64-f_fstypename utf8 alien>string >>type ] - [ statfs64-f_mntonname utf8 alien>string >>mount-point ] - [ statfs64-f_mntfromname utf8 alien>string >>device-name ] + [ f_bsize>> >>block-size ] + [ f_iosize>> >>io-size ] + [ f_blocks>> >>blocks ] + [ f_bfree>> >>blocks-free ] + [ f_bavail>> >>blocks-available ] + [ f_files>> >>files ] + [ f_ffree>> >>files-free ] + [ f_fsid>> >>id ] + [ f_owner>> >>owner ] + [ f_type>> >>type-id ] + [ f_flags>> >>flags ] + [ f_fssubtype>> >>filesystem-subtype ] + [ f_fstypename>> utf8 alien>string >>type ] + [ f_mntonname>> utf8 alien>string >>mount-point ] + [ f_mntfromname>> utf8 alien>string >>device-name ] } cleave ; M: macosx statvfs>file-system-info ( file-system-info byte-array -- file-system-info' ) { - [ statvfs-f_frsize >>preferred-block-size ] - [ statvfs-f_favail >>files-available ] - [ statvfs-f_namemax >>name-max ] + [ f_frsize>> >>preferred-block-size ] + [ f_favail>> >>files-available ] + [ f_namemax>> >>name-max ] } cleave ; diff --git a/basis/io/files/info/unix/netbsd/netbsd.factor b/basis/io/files/info/unix/netbsd/netbsd.factor index 4f284b5f44..015b8d3250 100644 --- a/basis/io/files/info/unix/netbsd/netbsd.factor +++ b/basis/io/files/info/unix/netbsd/netbsd.factor @@ -4,7 +4,7 @@ USING: alien.syntax kernel unix.stat math unix combinators system io.backend accessors alien.c-types io.encodings.utf8 alien.strings unix.types io.files.unix io.files io.files.info unix.statvfs.netbsd unix.getfsstat.netbsd arrays -grouping sequences io.encodings.utf8 +grouping sequences io.encodings.utf8 classes.struct specialized-arrays.direct.uint io.files.info.unix ; IN: io.files.info.unix.netbsd @@ -16,38 +16,37 @@ idx mount-from ; M: netbsd new-file-system-info netbsd-file-system-info new ; M: netbsd file-system-statvfs - "statvfs" [ statvfs io-error ] keep ; + \ statvfs [ statvfs io-error ] keep ; M: netbsd statvfs>file-system-info ( file-system-info statvfs -- file-system-info' ) { - [ statvfs-f_flag >>flags ] - [ statvfs-f_bsize >>block-size ] - [ statvfs-f_frsize >>preferred-block-size ] - [ statvfs-f_iosize >>io-size ] - [ statvfs-f_blocks >>blocks ] - [ statvfs-f_bfree >>blocks-free ] - [ statvfs-f_bavail >>blocks-available ] - [ statvfs-f_bresvd >>blocks-reserved ] - [ statvfs-f_files >>files ] - [ statvfs-f_ffree >>files-free ] - [ statvfs-f_favail >>files-available ] - [ statvfs-f_fresvd >>files-reserved ] - [ statvfs-f_syncreads >>sync-reads ] - [ statvfs-f_syncwrites >>sync-writes ] - [ statvfs-f_asyncreads >>async-reads ] - [ statvfs-f_asyncwrites >>async-writes ] - [ statvfs-f_fsidx 2 >array >>idx ] - [ statvfs-f_fsid >>id ] - [ statvfs-f_namemax >>name-max ] - [ statvfs-f_owner >>owner ] - ! [ statvfs-f_spare >>spare ] - [ statvfs-f_fstypename utf8 alien>string >>type ] - [ statvfs-f_mntonname utf8 alien>string >>mount-point ] - [ statvfs-f_mntfromname utf8 alien>string >>device-name ] + [ f_flag>> >>flags ] + [ f_bsize>> >>block-size ] + [ f_frsize>> >>preferred-block-size ] + [ f_iosize>> >>io-size ] + [ f_blocks>> >>blocks ] + [ f_bfree>> >>blocks-free ] + [ f_bavail>> >>blocks-available ] + [ f_bresvd>> >>blocks-reserved ] + [ f_files>> >>files ] + [ f_ffree>> >>files-free ] + [ f_favail>> >>files-available ] + [ f_fresvd>> >>files-reserved ] + [ f_syncreads>> >>sync-reads ] + [ f_syncwrites>> >>sync-writes ] + [ f_asyncreads>> >>async-reads ] + [ f_asyncwrites>> >>async-writes ] + [ f_fsidx>> 2 >array >>idx ] + [ f_fsid>> >>id ] + [ f_namemax>> >>name-max ] + [ f_owner>> >>owner ] + [ f_fstypename>> utf8 alien>string >>type ] + [ f_mntonname>> utf8 alien>string >>mount-point ] + [ f_mntfromname>> utf8 alien>string >>device-name ] } cleave ; M: netbsd file-systems ( -- array ) f 0 0 getvfsstat dup io-error - "statvfs" dup dup length 0 getvfsstat io-error - "statvfs" heap-size group - [ statvfs-f_mntonname utf8 alien>string file-system-info ] map ; + \ statvfs dup dup length 0 getvfsstat io-error + \ statvfs heap-size group + [ f_mntonname>> utf8 alien>string file-system-info ] map ; diff --git a/basis/io/files/info/unix/openbsd/openbsd.factor b/basis/io/files/info/unix/openbsd/openbsd.factor index 0fe4c4bec0..507abccdac 100644 --- a/basis/io/files/info/unix/openbsd/openbsd.factor +++ b/basis/io/files/info/unix/openbsd/openbsd.factor @@ -4,7 +4,8 @@ USING: accessors alien.c-types alien.strings alien.syntax combinators io.backend io.files io.files.info io.files.unix kernel math sequences system unix unix.getfsstat.openbsd grouping unix.statfs.openbsd unix.statvfs.openbsd unix.types -specialized-arrays.direct.uint arrays io.files.info.unix ; +specialized-arrays.direct.uint arrays io.files.info.unix +classes.struct ; IN: io.files.unix.openbsd TUPLE: freebsd-file-system-info < unix-file-system-info @@ -14,42 +15,39 @@ owner ; M: openbsd new-file-system-info freebsd-file-system-info new ; M: openbsd file-system-statfs - "statfs" [ statfs io-error ] keep ; + \ statfs [ statfs io-error ] keep ; M: openbsd statfs>file-system-info ( file-system-info statfs -- file-system-info' ) { - [ statfs-f_flags >>flags ] - [ statfs-f_bsize >>block-size ] - [ statfs-f_iosize >>io-size ] - [ statfs-f_blocks >>blocks ] - [ statfs-f_bfree >>blocks-free ] - [ statfs-f_bavail >>blocks-available ] - [ statfs-f_files >>files ] - [ statfs-f_ffree >>files-free ] - [ statfs-f_favail >>files-available ] - [ statfs-f_syncwrites >>sync-writes ] - [ statfs-f_syncreads >>sync-reads ] - [ statfs-f_asyncwrites >>async-writes ] - [ statfs-f_asyncreads >>async-reads ] - [ statfs-f_fsid 2 >array >>id ] - [ statfs-f_namemax >>name-max ] - [ statfs-f_owner >>owner ] - ! [ statfs-f_spare >>spare ] - [ statfs-f_fstypename alien>native-string >>type ] - [ statfs-f_mntonname alien>native-string >>mount-point ] - [ statfs-f_mntfromname alien>native-string >>device-name ] + [ f_flags>> >>flags ] + [ f_bsize>> >>block-size ] + [ f_iosize>> >>io-size ] + [ f_blocks>> >>blocks ] + [ f_bfree>> >>blocks-free ] + [ f_bavail>> >>blocks-available ] + [ f_files>> >>files ] + [ f_ffree>> >>files-free ] + [ f_favail>> >>files-available ] + [ f_syncwrites>> >>sync-writes ] + [ f_syncreads>> >>sync-reads ] + [ f_asyncwrites>> >>async-writes ] + [ f_asyncreads>> >>async-reads ] + [ f_fsid>> 2 >array >>id ] + [ f_namemax>> >>name-max ] + [ f_owner>> >>owner ] + [ f_fstypename>> alien>native-string >>type ] + [ f_mntonname>> alien>native-string >>mount-point ] + [ f_mntfromname>> alien>native-string >>device-name ] } cleave ; M: openbsd file-system-statvfs ( normalized-path -- statvfs ) - "statvfs" [ statvfs io-error ] keep ; + \ statvfs [ statvfs io-error ] keep ; M: openbsd statvfs>file-system-info ( file-system-info statvfs -- file-system-info' ) - { - [ statvfs-f_frsize >>preferred-block-size ] - } cleave ; + f_frsize>> >>preferred-block-size ; M: openbsd file-systems ( -- seq ) f 0 0 getfsstat dup io-error - "statfs" dup dup length 0 getfsstat io-error - "statfs" heap-size group - [ statfs-f_mntonname alien>native-string file-system-info ] map ; + statfs dup dup length 0 getfsstat io-error + statfs heap-size group + [ f_mntonname>> alien>native-string file-system-info ] map ; diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor index 94cb60a2c6..20b3513c6c 100644 --- a/basis/io/files/info/unix/unix.factor +++ b/basis/io/files/info/unix/unix.factor @@ -4,7 +4,7 @@ USING: accessors kernel system math math.bitwise strings arrays sequences combinators combinators.short-circuit alien.c-types vocabs.loader calendar calendar.unix io.files.info io.files.types io.backend io.directories unix unix.stat unix.time unix.users -unix.groups ; +unix.groups classes.struct struct-arrays ; IN: io.files.info.unix TUPLE: unix-file-system-info < file-system-info @@ -69,19 +69,19 @@ M: unix stat>file-info ( stat -- file-info ) [ new-file-info ] dip { [ stat>type >>type ] - [ stat-st_size >>size ] - [ stat-st_mode >>permissions ] - [ stat-st_ctimespec timespec>unix-time >>created ] - [ stat-st_mtimespec timespec>unix-time >>modified ] - [ stat-st_atimespec timespec>unix-time >>accessed ] - [ stat-st_uid >>uid ] - [ stat-st_gid >>gid ] - [ stat-st_dev >>dev ] - [ stat-st_ino >>ino ] - [ stat-st_nlink >>nlink ] - [ stat-st_rdev >>rdev ] - [ stat-st_blocks >>blocks ] - [ stat-st_blksize >>blocksize ] + [ st_size>> >>size ] + [ st_mode>> >>permissions ] + [ st_ctimespec>> timespec>unix-time >>created ] + [ st_mtimespec>> timespec>unix-time >>modified ] + [ st_atimespec>> timespec>unix-time >>accessed ] + [ st_uid>> >>uid ] + [ st_gid>> >>gid ] + [ st_dev>> >>dev ] + [ st_ino>> >>ino ] + [ st_nlink>> >>nlink ] + [ st_rdev>> >>rdev ] + [ st_blocks>> >>blocks ] + [ st_blksize>> >>blocksize ] [ drop dup blocks>> standard-unix-block-size * >>size-on-disk ] } cleave ; @@ -98,12 +98,12 @@ M: unix stat>file-info ( stat -- file-info ) } case ; M: unix stat>type ( stat -- type ) - stat-st_mode n>file-type ; + st_mode>> n>file-type ; > ; : chmod-set-bit ( path mask ? -- ) [ dup stat-mode ] 2dip @@ -179,14 +179,12 @@ M: unix copy-file-and-info ( from to -- ) ] unless* ] map concat ; - : timestamp>timeval ( timestamp -- timeval ) unix-1970 time- duration>microseconds make-timeval ; : timestamps>byte-array ( timestamps -- byte-array ) - [ dup [ timestamp>timeval ] when ] map make-timeval-array ; + [ [ timestamp>timeval ] [ \ timeval ] if* ] map + \ timeval >struct-array ; PRIVATE> @@ -202,8 +200,7 @@ PRIVATE> f swap 2array set-file-times ; : set-file-ids ( path uid gid -- ) - [ normalize-path ] 2dip - [ [ -1 ] unless* ] bi@ chown io-error ; + [ normalize-path ] 2dip [ -1 or ] bi@ chown io-error ; GENERIC: set-file-user ( path string/id -- ) diff --git a/basis/unix/stat/freebsd/32/32.factor b/basis/unix/stat/freebsd/32/32.factor deleted file mode 100644 index 3692dea0c0..0000000000 --- a/basis/unix/stat/freebsd/32/32.factor +++ /dev/null @@ -1,30 +0,0 @@ -USING: kernel alien.syntax math ; - -IN: unix.stat - -! FreeBSD 8.0-CURRENT - -C-STRUCT: stat - { "__dev_t" "st_dev" } - { "ino_t" "st_ino" } - { "mode_t" "st_mode" } - { "nlink_t" "st_nlink" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "__dev_t" "st_rdev" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "off_t" "st_size" } - { "blkcnt_t" "st_blocks" } - { "blksize_t" "st_blksize" } - { "fflags_t" "st_flags" } - { "__uint32_t" "st_gen" } - { "__int32_t" "st_lspare" } - { "timespec" "st_birthtimespec" } -! not sure about the padding here. - { "__uint32_t" "pad0" } - { "__uint32_t" "pad1" } ; - -FUNCTION: int stat ( char* pathname, stat* buf ) ; -FUNCTION: int lstat ( char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/freebsd/32/tags.txt b/basis/unix/stat/freebsd/32/tags.txt deleted file mode 100644 index 6bf68304bb..0000000000 --- a/basis/unix/stat/freebsd/32/tags.txt +++ /dev/null @@ -1 +0,0 @@ -unportable diff --git a/basis/unix/stat/freebsd/64/64.factor b/basis/unix/stat/freebsd/64/64.factor deleted file mode 100644 index 73ba676701..0000000000 --- a/basis/unix/stat/freebsd/64/64.factor +++ /dev/null @@ -1,30 +0,0 @@ -USING: kernel alien.syntax math ; -IN: unix.stat - -! FreeBSD 8.0-CURRENT -! untested - -C-STRUCT: stat - { "__dev_t" "st_dev" } - { "ino_t" "st_ino" } - { "mode_t" "st_mode" } - { "nlink_t" "st_nlink" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "__dev_t" "st_rdev" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "off_t" "st_size" } - { "blkcnt_t" "st_blocks" } - { "blksize_t" "st_blksize" } - { "fflags_t" "st_flags" } - { "__uint32_t" "st_gen" } - { "__int32_t" "st_lspare" } - { "timespec" "st_birthtimespec" } -! not sure about the padding here. - { "__uint32_t" "pad0" } - { "__uint32_t" "pad1" } ; - -FUNCTION: int stat ( char* pathname, stat* buf ) ; -FUNCTION: int lstat ( char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/freebsd/64/tags.txt b/basis/unix/stat/freebsd/64/tags.txt deleted file mode 100644 index 6bf68304bb..0000000000 --- a/basis/unix/stat/freebsd/64/tags.txt +++ /dev/null @@ -1 +0,0 @@ -unportable diff --git a/basis/unix/stat/freebsd/freebsd.factor b/basis/unix/stat/freebsd/freebsd.factor index 299d0ecab5..02f31f3682 100644 --- a/basis/unix/stat/freebsd/freebsd.factor +++ b/basis/unix/stat/freebsd/freebsd.factor @@ -1,7 +1,27 @@ -USING: layouts combinators vocabs.loader ; +USING: kernel alien.syntax math classes.struct ; IN: unix.stat -cell-bits { - { 32 [ "unix.stat.freebsd.32" require ] } - { 64 [ "unix.stat.freebsd.64" require ] } -} case +! FreeBSD 8.0-CURRENT + +STRUCT: stat + { st_dev __dev_t } + { st_ino ino_t } + { st_mode mode_t } + { st_nlink nlink_t } + { st_uid uid_t } + { st_gid git_t } + { st_rdev __dev_t } + { st_atimespec timespec } + { st_mtimespec timespec } + { st_ctimespec timespec } + { st_size off_t } + { st_blocks blkcnt_t } + { st_blksize blksize_t } + { st_flags fflags_t } + { st_gen _uint32_t } + { st_lspare __int32_t } + { st_birthtimespec timespec } + { pad0 __int32_t[2] } + +FUNCTION: int stat ( char* pathname, stat* buf ) ; +FUNCTION: int lstat ( char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/linux/32/32.factor b/basis/unix/stat/linux/32/32.factor index 98c4b90f32..324237d645 100644 --- a/basis/unix/stat/linux/32/32.factor +++ b/basis/unix/stat/linux/32/32.factor @@ -1,25 +1,24 @@ -USING: kernel alien.syntax math sequences unix -alien.c-types arrays accessors combinators ; +USING: kernel alien.syntax math classes.struct ; IN: unix.stat ! stat64 -C-STRUCT: stat - { "dev_t" "st_dev" } - { "ushort" "__pad1" } - { "__ino_t" "__st_ino" } - { "mode_t" "st_mode" } - { "nlink_t" "st_nlink" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "dev_t" "st_rdev" } - { { "ushort" 2 } "__pad2" } - { "off64_t" "st_size" } - { "blksize_t" "st_blksize" } - { "blkcnt64_t" "st_blocks" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "ulonglong" "st_ino" } ; +STRUCT: stat + { st_dev dev_t } + { __pad1 ushort } + { __st_ino __ino_t } + { st_mode mode_t } + { st_nlink nlink_t } + { st_uid uid_t } + { st_gid gid_t } + { st_rdev dev_t } + { __pad2 ushort[2] } + { st_size off64_t } + { st_blksize blksize_t } + { st_blocks blkcnt64_t } + { st_atimespec timespec } + { st_mtimespec timespec } + { st_ctimespec timespec } + { st_ino ulonglong } ; FUNCTION: int __xstat64 ( int ver, char* pathname, stat* buf ) ; FUNCTION: int __lxstat64 ( int ver, char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/linux/64/64.factor b/basis/unix/stat/linux/64/64.factor index 581525dda0..cfd6553ca3 100644 --- a/basis/unix/stat/linux/64/64.factor +++ b/basis/unix/stat/linux/64/64.factor @@ -1,27 +1,24 @@ -USING: kernel alien.syntax math sequences unix -alien.c-types arrays accessors combinators ; +USING: kernel alien.syntax math classes.struct ; IN: unix.stat ! Ubuntu 7.10 64-bit -C-STRUCT: stat - { "dev_t" "st_dev" } - { "ino_t" "st_ino" } - { "nlink_t" "st_nlink" } - { "mode_t" "st_mode" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "int" "pad0" } - { "dev_t" "st_rdev" } - { "off64_t" "st_size" } - { "blksize_t" "st_blksize" } - { "blkcnt64_t" "st_blocks" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "long" "__unused0" } - { "long" "__unused1" } - { "long" "__unused2" } ; +STRUCT: stat + { st_dev dev_t } + { st_ino ino_t } + { st_nlink nlink_t } + { st_mode mode_t } + { st_uid uid_t } + { st_gid gid_t } + { pad0 int } + { st_rdev dev_t } + { st_size off64_t } + { st_blksize blksize_t } + { st_blocks blkcnt64_t } + { st_atimespec timespec } + { st_mtimespec timespec } + { st_ctimespec timespec } + { __unused0 long[3] } ; FUNCTION: int __xstat64 ( int ver, char* pathname, stat* buf ) ; FUNCTION: int __lxstat64 ( int ver, char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/macosx/macosx.factor b/basis/unix/stat/macosx/macosx.factor index 2656ec71e1..afab727ddb 100644 --- a/basis/unix/stat/macosx/macosx.factor +++ b/basis/unix/stat/macosx/macosx.factor @@ -1,30 +1,30 @@ -USING: kernel alien.syntax math unix math.bitwise -alien.c-types alien sequences grouping accessors combinators ; +USING: alien.c-types arrays accessors combinators classes.struct +alien.syntax ; IN: unix.stat ! Mac OS X ppc ! stat64 structure -C-STRUCT: stat - { "dev_t" "st_dev" } - { "mode_t" "st_mode" } - { "nlink_t" "st_nlink" } - { "ino64_t" "st_ino" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "dev_t" "st_rdev" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "timespec" "st_birthtimespec" } - { "off_t" "st_size" } - { "blkcnt_t" "st_blocks" } - { "blksize_t" "st_blksize" } - { "__uint32_t" "st_flags" } - { "__uint32_t" "st_gen" } - { "__int32_t" "st_lspare" } - { "__int64_t" "st_qspare0" } - { "__int64_t" "st_qspare1" } ; +STRUCT: stat + { st_dev dev_t } + { st_mode mode_t } + { st_nlink nlink_t } + { st_ino ino64_t } + { st_uid uid_t } + { st_gid gid_t } + { st_rdev dev_t } + { st_atimespec timespec } + { st_mtimespec timespec } + { st_ctimespec timespec } + { st_birthtimespec timespec } + { st_size off_t } + { st_blocks blkcnt_t } + { st_blksize blksize_t } + { st_flags __uint32_t } + { st_gen __uint32_t } + { st_lspare __int32_t } + { st_qspare0 __int64_t } + { st_qspare1 __int64_t } ; FUNCTION: int stat64 ( char* pathname, stat* buf ) ; FUNCTION: int lstat64 ( char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/netbsd/32/32.factor b/basis/unix/stat/netbsd/32/32.factor index c4cf5cc7a0..98403313b8 100644 --- a/basis/unix/stat/netbsd/32/32.factor +++ b/basis/unix/stat/netbsd/32/32.factor @@ -1,26 +1,26 @@ -USING: kernel alien.syntax math ; +USING: kernel alien.syntax math classes.struct ; IN: unix.stat ! NetBSD 4.0 -C-STRUCT: stat - { "dev_t" "st_dev" } - { "mode_t" "st_mode" } - { "ino_t" "st_ino" } - { "nlink_t" "st_nlink" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "dev_t" "st_rdev" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "timespec" "st_birthtimespec" } - { "off_t" "st_size" } - { "blkcnt_t" "st_blocks" } - { "blksize_t" "st_blksize" } - { "uint32_t" "st_flags" } - { "uint32_t" "st_gen" } - { { "uint32_t" 2 } "st_qspare" } ; +STRUCT: stat + { st_dev dev_t } + { st_mode mode_t } + { st_ino ino_t } + { st_nlink nlink_t } + { st_uid uid_t } + { st_gid gid_t } + { st_rdev dev_t } + { st_atimespec timespec } + { st_mtimespec timespec } + { st_ctimespec timespec } + { st_birthtimespec timespec } + { st_size off_t } + { st_blocks blkcnt_t } + { st_blksize blksize_t } + { st_flags uint32_t } + { st_gen uint32_t } + { st_qspare uint32_t[2] } ; FUNCTION: int __stat30 ( char* pathname, stat* buf ) ; FUNCTION: int __lstat30 ( char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/netbsd/64/64.factor b/basis/unix/stat/netbsd/64/64.factor index cd9286c6ba..c532e7e9ff 100644 --- a/basis/unix/stat/netbsd/64/64.factor +++ b/basis/unix/stat/netbsd/64/64.factor @@ -1,26 +1,26 @@ -USING: kernel alien.syntax math ; +USING: kernel alien.syntax math classes.struct ; IN: unix.stat ! NetBSD 4.0 -C-STRUCT: stat - { "dev_t" "st_dev" } - { "ino_t" "st_ino" } - { "mode_t" "st_mode" } - { "nlink_t" "st_nlink" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "dev_t" "st_rdev" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "off_t" "st_size" } - { "blkcnt_t" "st_blocks" } - { "blksize_t" "st_blksize" } - { "uint32_t" "st_flags" } - { "uint32_t" "st_gen" } - { "uint32_t" "st_spare0" } - { "timespec" "st_birthtimespec" } ; +STRUCT: stat + { st_dev dev_t } + { st_ino ino_t } + { st_mode mode_t } + { st_nlink nlink_t } + { st_uid uid_t } + { st_gid gid_t } + { st_rdev dev_t } + { st_atimespec timespec } + { st_mtimespec timespec } + { st_ctimespec timespec } + { st_size off_t } + { st_blocks blkcnt_t } + { st_blksize blksize_t } + { st_flags uint32_t } + { st_gen uint32_t } + { st_spare0 uint32_t } + { st_birthtimespec timespec } ; FUNCTION: int __stat13 ( char* pathname, stat* buf ) ; FUNCTION: int __lstat13 ( char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/openbsd/openbsd.factor b/basis/unix/stat/openbsd/openbsd.factor index f76d4c6e18..f326a5592d 100644 --- a/basis/unix/stat/openbsd/openbsd.factor +++ b/basis/unix/stat/openbsd/openbsd.factor @@ -1,28 +1,28 @@ -USING: kernel alien.syntax math ; +USING: kernel alien.syntax math classes.struct ; IN: unix.stat ! OpenBSD 4.2 -C-STRUCT: stat - { "dev_t" "st_dev" } - { "ino_t" "st_ino" } - { "mode_t" "st_mode" } - { "nlink_t" "st_nlink" } - { "uid_t" "st_uid" } - { "gid_t" "st_gid" } - { "dev_t" "st_rdev" } - { "int32_t" "st_lspare0" } - { "timespec" "st_atimespec" } - { "timespec" "st_mtimespec" } - { "timespec" "st_ctimespec" } - { "off_t" "st_size" } - { "int64_t" "st_blocks" } - { "u_int32_t" "st_blksize" } - { "u_int32_t" "st_flags" } - { "u_int32_t" "st_gen" } - { "int32_t" "st_lspare1" } - { "timespec" "st_birthtimespec" } - { { "int64_t" 2 } "st_qspare" } ; +STRUCT: stat + { st_dev dev_t } + { st_ino ino_t } + { st_mode mode_t } + { st_nlink nlink_t } + { st_uid uid_t } + { st_gid gid_t } + { st_rdev dev_ti } + { st_lspare0 int32_t } + { st_atimespec timespec } + { st_mtimespec timespec } + { st_ctimespec timespec } + { st_size off_t } + { st_blocks int64_t } + { st_blksize u_int32_t } + { st_flags u_int32_t } + { st_gen u_int32_t } + { st_lspare1 int32_t } + { st_birthtimespec timespec } + { st_qspare int64_t[2] } ; FUNCTION: int stat ( char* pathname, stat* buf ) ; FUNCTION: int lstat ( char* pathname, stat* buf ) ; diff --git a/basis/unix/stat/stat.factor b/basis/unix/stat/stat.factor index c3ab099d38..de5b4055d9 100644 --- a/basis/unix/stat/stat.factor +++ b/basis/unix/stat/stat.factor @@ -1,5 +1,5 @@ USING: kernel system combinators alien.syntax alien.c-types -math io.backend.unix vocabs.loader unix ; +math io.backend.unix vocabs.loader unix classes.struct ; IN: unix.stat ! File Types @@ -15,8 +15,8 @@ CONSTANT: S_IFLNK OCT: 120000 ! Symbolic link. CONSTANT: S_IFSOCK OCT: 140000 ! Socket. CONSTANT: S_IFWHT OCT: 160000 ! Whiteout. -C-STRUCT: fsid - { { "int" 2 } "__val" } ; +STRUCT: fsid + { __val int[2] } ; TYPEDEF: fsid __fsid_t TYPEDEF: fsid fsid_t @@ -30,7 +30,7 @@ TYPEDEF: fsid fsid_t } case >> : file-status ( pathname -- stat ) - "stat" [ [ stat ] unix-system-call drop ] keep ; + \ stat [ [ stat ] unix-system-call drop ] keep ; : link-status ( pathname -- stat ) - "stat" [ [ lstat ] unix-system-call drop ] keep ; + \ stat [ [ lstat ] unix-system-call drop ] keep ; diff --git a/basis/unix/statfs/freebsd/freebsd.factor b/basis/unix/statfs/freebsd/freebsd.factor index 70e2d5e561..d1e7949a54 100644 --- a/basis/unix/statfs/freebsd/freebsd.factor +++ b/basis/unix/statfs/freebsd/freebsd.factor @@ -1,34 +1,34 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax unix.types unix.stat ; +USING: alien.syntax unix.types unix.stat classes.struct ; IN: unix.statfs.freebsd CONSTANT: MFSNAMELEN 16 ! length of type name including null */ CONSTANT: MNAMELEN 88 ! size of on/from name bufs CONSTANT: STATFS_VERSION HEX: 20030518 ! current version number -C-STRUCT: statfs - { "uint32_t" "f_version" } - { "uint32_t" "f_type" } - { "uint64_t" "f_flags" } - { "uint64_t" "f_bsize" } - { "uint64_t" "f_iosize" } - { "uint64_t" "f_blocks" } - { "uint64_t" "f_bfree" } - { "int64_t" "f_bavail" } - { "uint64_t" "f_files" } - { "int64_t" "f_ffree" } - { "uint64_t" "f_syncwrites" } - { "uint64_t" "f_asyncwrites" } - { "uint64_t" "f_syncreads" } - { "uint64_t" "f_asyncreads" } - { { "uint64_t" 10 } "f_spare" } - { "uint32_t" "f_namemax" } - { "uid_t" "f_owner" } - { "fsid_t" "f_fsid" } - { { "char" 80 } "f_charspare" } - { { "char" MFSNAMELEN } "f_fstypename" } - { { "char" MNAMELEN } "f_mntfromname" } - { { "char" MNAMELEN } "f_mntonname" } ; +STRUCT: statfs + { f_version uint32_t } + { f_type uint32_t } + { f_flags uint64_t } + { f_bsize uint64_t } + { f_iosize uint64_t } + { f_blocks uint64_t } + { f_bfree uint64_t } + { f_bavail int64_t } + { f_files uint64_t } + { f_ffree int64_t } + { f_syncwrites uint64_t } + { f_asyncwrites uint64_t } + { f_syncreads uint64_t } + { f_asyncreads uint64_t } + { f_spare uint64_t[10] } + { f_namemax uint32_t } + { f_owner uid_t } + { f_fsid fsid_t } + { f_charspare char[80] } + { f_fstypename { "char" MFSNAMELEN } } + { f_mntfromname { "char" MNAMELEN } } + { f_mntonname { "char" MNAMELEN } } ; FUNCTION: int statfs ( char* path, statvfs* buf ) ; diff --git a/basis/unix/statfs/linux/linux.factor b/basis/unix/statfs/linux/linux.factor index c0db5ced1d..42d66ff1ba 100644 --- a/basis/unix/statfs/linux/linux.factor +++ b/basis/unix/statfs/linux/linux.factor @@ -1,19 +1,19 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax unix.types unix.stat ; +USING: alien.syntax unix.types unix.stat classes.struct ; IN: unix.statfs.linux -C-STRUCT: statfs64 - { "__SWORD_TYPE" "f_type" } - { "__SWORD_TYPE" "f_bsize" } - { "__fsblkcnt64_t" "f_blocks" } - { "__fsblkcnt64_t" "f_bfree" } - { "__fsblkcnt64_t" "f_bavail" } - { "__fsfilcnt64_t" "f_files" } - { "__fsfilcnt64_t" "f_ffree" } - { "__fsid_t" "f_fsid" } - { "__SWORD_TYPE" "f_namelen" } - { "__SWORD_TYPE" "f_frsize" } - { { "__SWORD_TYPE" 5 } "f_spare" } ; +STRUCT: statfs64 + { f_type __SWORD_TYPE } + { f_bsize __SWORD_TYPE } + { f_blocks __fsblkcnt64_t } + { f_bfree __fsblkcnt64_t } + { f_bavail __fsblkcnt64_t } + { f_files __fsblkcnt64_t } + { f_ffree __fsblkcnt64_t } + { f_fsid __fsid_t } + { f_namelen __SWORD_TYPE } + { f_frsize __SWORD_TYPE } + { f_spare __SWORD_TYPE[5] } ; FUNCTION: int statfs64 ( char* path, statfs64* buf ) ; diff --git a/basis/unix/statfs/macosx/macosx.factor b/basis/unix/statfs/macosx/macosx.factor index c262949730..38709f64fe 100644 --- a/basis/unix/statfs/macosx/macosx.factor +++ b/basis/unix/statfs/macosx/macosx.factor @@ -3,7 +3,7 @@ USING: alien.c-types io.encodings.utf8 io.encodings.string kernel sequences unix.stat accessors unix combinators math grouping system alien.strings math.bitwise alien.syntax -unix.types ; +unix.types classes.struct ; IN: unix.statfs.macosx CONSTANT: MNT_RDONLY HEX: 00000001 @@ -65,9 +65,9 @@ CONSTANT: VFS_CTL_NEWADDR HEX: 00010004 CONSTANT: VFS_CTL_TIMEO HEX: 00010005 CONSTANT: VFS_CTL_NOLOCKS HEX: 00010006 -C-STRUCT: vfsquery - { "uint32_t" "vq_flags" } - { { "uint32_t" 31 } "vq_spare" } ; +STRUCT: vfsquery + { vq_flags uint32_t } + { vq_spare uint32_t[31] } ; CONSTANT: VQ_NOTRESP HEX: 0001 CONSTANT: VQ_NEEDAUTH HEX: 0002 @@ -95,26 +95,26 @@ CONSTANT: MFSNAMELEN 15 CONSTANT: MNAMELEN 90 CONSTANT: MFSTYPENAMELEN 16 -C-STRUCT: fsid_t - { { "int32_t" 2 } "val" } ; +STRUCT: fsid_t + { val int32_t[2] } ; -C-STRUCT: statfs64 - { "uint32_t" "f_bsize" } - { "int32_t" "f_iosize" } - { "uint64_t" "f_blocks" } - { "uint64_t" "f_bfree" } - { "uint64_t" "f_bavail" } - { "uint64_t" "f_files" } - { "uint64_t" "f_ffree" } - { "fsid_t" "f_fsid" } - { "uid_t" "f_owner" } - { "uint32_t" "f_type" } - { "uint32_t" "f_flags" } - { "uint32_t" "f_fssubtype" } - { { "char" MFSTYPENAMELEN } "f_fstypename" } - { { "char" MAXPATHLEN } "f_mntonname" } - { { "char" MAXPATHLEN } "f_mntfromname" } - { { "uint32_t" 8 } "f_reserved" } ; +STRUCT: statfs64 + { f_bsize uint32_t } + { f_iosize int32_t } + { f_blocks uint64_t } + { f_bfree uint64_t } + { f_bavail uint64_t } + { f_files uint64_t } + { f_ffree uint64_t } + { f_fsid fsid_t } + { f_owner uid_t } + { f_type uint32_t } + { f_flags uint32_t } + { f_fssubtype uint32_t } + { f_fstypename { "char" MFSTYPENAMELEN } } + { f_mntonname { "char" MAXPATHLEN } } + { f_mntfromname { "char" MAXPATHLEN } } + { f_reserved uint32_t[8] } ; FUNCTION: int statfs64 ( char* path, statfs64* buf ) ; FUNCTION: int getmntinfo64 ( statfs64** mntbufp, int flags ) ; diff --git a/basis/unix/statfs/openbsd/openbsd.factor b/basis/unix/statfs/openbsd/openbsd.factor index 60590be4ea..590faf82a6 100644 --- a/basis/unix/statfs/openbsd/openbsd.factor +++ b/basis/unix/statfs/openbsd/openbsd.factor @@ -1,33 +1,33 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax unix.types unix.stat ; +USING: alien.syntax unix.types unix.stat classes.struct ; IN: unix.statfs.openbsd CONSTANT: MFSNAMELEN 16 CONSTANT: MNAMELEN 90 -C-STRUCT: statfs - { "u_int32_t" "f_flags" } - { "u_int32_t" "f_bsize" } - { "u_int32_t" "f_iosize" } - { "u_int64_t" "f_blocks" } - { "u_int64_t" "f_bfree" } - { "int64_t" "f_bavail" } - { "u_int64_t" "f_files" } - { "u_int64_t" "f_ffree" } - { "int64_t" "f_favail" } - { "u_int64_t" "f_syncwrites" } - { "u_int64_t" "f_syncreads" } - { "u_int64_t" "f_asyncwrites" } - { "u_int64_t" "f_asyncreads" } - { "fsid_t" "f_fsid" } - { "u_int32_t" "f_namemax" } - { "uid_t" "f_owner" } - { "u_int32_t" "f_ctime" } - { { "u_int32_t" 3 } "f_spare" } - { { "char" MFSNAMELEN } "f_fstypename" } - { { "char" MNAMELEN } "f_mntonname" } - { { "char" MNAMELEN } "f_mntfromname" } - { { "char" 160 } "mount_info" } ; +STRUCT: statfs + { f_flags u_int32_t } + { f_bsize u_int32_t } + { f_iosize u_int32_t } + { f_blocks u_int64_t } + { f_bfree u_int64_t } + { f_bavail int64_t } + { f_files u_int64_t } + { f_ffree u_int64_t } + { f_favail int64_t } + { f_syncwrites u_int64_t } + { f_syncreads u_int64_t } + { f_asyncwrites u_int64_t } + { f_asyncreads u_int64_t } + { f_fsid fsid_t } + { f_namemax u_int32_t } + { f_owner uid_t } + { f_ctime u_int32_t } + { f_spare u_int32_t[3] } + { f_fstypename { "char" MFSNAMELEN } } + { f_mntonname { "char" MNAMELEN } } + { f_mntfromname { "char" MNAMELEN } } + { mount_info char[160] } ; FUNCTION: int statfs ( char* path, statvfs* buf ) ; diff --git a/basis/unix/statvfs/freebsd/freebsd.factor b/basis/unix/statvfs/freebsd/freebsd.factor index 3140b85004..2fcd0c7372 100644 --- a/basis/unix/statvfs/freebsd/freebsd.factor +++ b/basis/unix/statvfs/freebsd/freebsd.factor @@ -1,20 +1,20 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax ; +USING: alien.syntax classes.struct ; IN: unix.statvfs.freebsd -C-STRUCT: statvfs - { "fsblkcnt_t" "f_bavail" } - { "fsblkcnt_t" "f_bfree" } - { "fsblkcnt_t" "f_blocks" } - { "fsfilcnt_t" "f_favail" } - { "fsfilcnt_t" "f_ffree" } - { "fsfilcnt_t" "f_files" } - { "ulong" "f_bsize" } - { "ulong" "f_flag" } - { "ulong" "f_frsize" } - { "ulong" "f_fsid" } - { "ulong" "f_namemax" } ; +STRUCT: statvfs + { f_bavail fsblkcnt_t } + { f_bfree fsblkcnt_t } + { f_blocks fsblkcnt_t } + { f_favail fsfilcnt_t } + { f_ffree fsfilcnt_t } + { f_files fsfilcnt_t } + { f_bsize ulong } + { f_flag ulong } + { f_frsize ulong } + { f_fsid ulong } + { f_namemax ulong } ; ! Flags CONSTANT: ST_RDONLY HEX: 1 ! Read-only file system diff --git a/basis/unix/statvfs/linux/linux.factor b/basis/unix/statvfs/linux/linux.factor index c92fef6aaa..6e408c8fa4 100644 --- a/basis/unix/statvfs/linux/linux.factor +++ b/basis/unix/statvfs/linux/linux.factor @@ -1,21 +1,21 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax ; +USING: alien.syntax classes.struct ; IN: unix.statvfs.linux -C-STRUCT: statvfs64 - { "ulong" "f_bsize" } - { "ulong" "f_frsize" } - { "__fsblkcnt64_t" "f_blocks" } - { "__fsblkcnt64_t" "f_bfree" } - { "__fsblkcnt64_t" "f_bavail" } - { "__fsfilcnt64_t" "f_files" } - { "__fsfilcnt64_t" "f_ffree" } - { "__fsfilcnt64_t" "f_favail" } - { "ulong" "f_fsid" } - { "ulong" "f_flag" } - { "ulong" "f_namemax" } - { { "int" 6 } "__f_spare" } ; +STRUCT: statvfs64 + { f_bsize ulong } + { f_frsize ulong } + { f_blocks __fsblkcnt64_t } + { f_bfree __fsblkcnt64_t } + { f_bavail __fsblkcnt64_t } + { f_files __fsfilcnt64_t } + { f_ffree __fsfilcnt64_t } + { f_favail __fsfilcnt64_t } + { f_fsid ulong } + { f_flag ulong } + { f_namemax ulong } + { __f_spare int[6] } ; FUNCTION: int statvfs64 ( char* path, statvfs64* buf ) ; diff --git a/basis/unix/statvfs/macosx/macosx.factor b/basis/unix/statvfs/macosx/macosx.factor index 0aafad69fa..3b1fe71a6a 100644 --- a/basis/unix/statvfs/macosx/macosx.factor +++ b/basis/unix/statvfs/macosx/macosx.factor @@ -1,20 +1,20 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax ; +USING: alien.syntax classes.struct ; IN: unix.statvfs.macosx -C-STRUCT: statvfs - { "ulong" "f_bsize" } - { "ulong" "f_frsize" } - { "fsblkcnt_t" "f_blocks" } - { "fsblkcnt_t" "f_bfree" } - { "fsblkcnt_t" "f_bavail" } - { "fsfilcnt_t" "f_files" } - { "fsfilcnt_t" "f_ffree" } - { "fsfilcnt_t" "f_favail" } - { "ulong" "f_fsid" } - { "ulong" "f_flag" } - { "ulong" "f_namemax" } ; +STRUCT: statvfs + { f_bsize ulong } + { f_frsize ulong } + { f_blocks fsblkcnt_t } + { f_bfree fsblkcnt_t } + { f_bavail fsblkcnt_t } + { f_files fsfilcnt_t } + { f_ffree fsfilcnt_t } + { f_favail fsfilcnt_t } + { f_fsid ulong } + { f_flag ulong } + { f_namemax ulong } ; ! Flags CONSTANT: ST_RDONLY HEX: 1 ! Read-only file system diff --git a/basis/unix/statvfs/netbsd/netbsd.factor b/basis/unix/statvfs/netbsd/netbsd.factor index 1adc1a3da8..25c96dc15d 100644 --- a/basis/unix/statvfs/netbsd/netbsd.factor +++ b/basis/unix/statvfs/netbsd/netbsd.factor @@ -1,35 +1,35 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax ; +USING: alien.syntax classes.struct ; IN: unix.statvfs.netbsd CONSTANT: _VFS_NAMELEN 32 CONSTANT: _VFS_MNAMELEN 1024 -C-STRUCT: statvfs - { "ulong" "f_flag" } - { "ulong" "f_bsize" } - { "ulong" "f_frsize" } - { "ulong" "f_iosize" } - { "fsblkcnt_t" "f_blocks" } - { "fsblkcnt_t" "f_bfree" } - { "fsblkcnt_t" "f_bavail" } - { "fsblkcnt_t" "f_bresvd" } - { "fsfilcnt_t" "f_files" } - { "fsfilcnt_t" "f_ffree" } - { "fsfilcnt_t" "f_favail" } - { "fsfilcnt_t" "f_fresvd" } - { "uint64_t" "f_syncreads" } - { "uint64_t" "f_syncwrites" } - { "uint64_t" "f_asyncreads" } - { "uint64_t" "f_asyncwrites" } - { "fsid_t" "f_fsidx" } - { "ulong" "f_fsid" } - { "ulong" "f_namemax" } - { "uid_t" "f_owner" } - { { "uint32_t" 4 } "f_spare" } - { { "char" _VFS_NAMELEN } "f_fstypename" } - { { "char" _VFS_MNAMELEN } "f_mntonname" } - { { "char" _VFS_MNAMELEN } "f_mntfromname" } ; +STRUCT: statvfs + { f_flag ulong } + { f_bsize ulong } + { f_frsize ulong } + { f_iosize ulong } + { f_blocks fsblkcnt_t } + { f_bfree fsblkcnt_t } + { f_bavail fsblkcnt_t } + { f_bresvd fsblkcnt_t } + { f_files fsfilcnt_t } + { f_ffree fsfilcnt_t } + { f_favail fsfilcnt_t } + { f_fresvd fsfilcnt_t } + { f_syncreads uint64_t } + { f_syncwrites uint64_t } + { f_asyncreads uint64_t } + { f_asyncwrites uint64_t } + { f_fsidx fsid_t } + { f_fsid ulong } + { f_namemax ulong } + { f_owner uid_t } + { f_spare uint32_t[4] } + { f_fstypename { "char" _VFS_NAMELEN } } + { f_mntonname { "char" _VFS_MNAMELEN } } + { f_mntfromname { "char" _VFS_MNAMELEN } } ; FUNCTION: int statvfs ( char* path, statvfs* buf ) ; diff --git a/basis/unix/statvfs/openbsd/openbsd.factor b/basis/unix/statvfs/openbsd/openbsd.factor index 4ca8d0749d..f2d12c29cc 100644 --- a/basis/unix/statvfs/openbsd/openbsd.factor +++ b/basis/unix/statvfs/openbsd/openbsd.factor @@ -1,20 +1,20 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax ; +USING: alien.syntax classes.struct ; IN: unix.statvfs.openbsd -C-STRUCT: statvfs - { "ulong" "f_bsize" } - { "ulong" "f_frsize" } - { "fsblkcnt_t" "f_blocks" } - { "fsblkcnt_t" "f_bfree" } - { "fsblkcnt_t" "f_bavail" } - { "fsfilcnt_t" "f_files" } - { "fsfilcnt_t" "f_ffree" } - { "fsfilcnt_t" "f_favail" } - { "ulong" "f_fsid" } - { "ulong" "f_flag" } - { "ulong" "f_namemax" } ; +STRUCT: statvfs + { f_bsize ulong } + { f_frsize ulong } + { f_blocks fsblkcnt_t } + { f_bfree fsblkcnt_t } + { f_bavail fsblkcnt_t } + { f_files fsfilcnt_t } + { f_ffree fsfilcnt_t } + { f_favail fsfilcnt_t } + { f_fsid ulong } + { f_flag ulong } + { f_namemax ulong } ; CONSTANT: ST_RDONLY 1 CONSTANT: ST_NOSUID 2 diff --git a/basis/unix/time/time.factor b/basis/unix/time/time.factor index 9847b09778..4f5ac99309 100644 --- a/basis/unix/time/time.factor +++ b/basis/unix/time/time.factor @@ -1,40 +1,41 @@ ! Copyright (C) 2008 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: kernel alien.syntax alien.c-types math unix.types ; +USING: kernel alien.syntax alien.c-types math unix.types +classes.struct accessors ; IN: unix.time -C-STRUCT: timeval - { "long" "sec" } - { "long" "usec" } ; +STRUCT: timeval + { sec long } + { usec long } ; -C-STRUCT: timespec - { "time_t" "sec" } - { "long" "nsec" } ; +STRUCT: timespec + { sec time_t } + { nsec long } ; : make-timeval ( us -- timeval ) 1000000 /mod - "timeval" - [ set-timeval-usec ] keep - [ set-timeval-sec ] keep ; + timeval + swap >>usec + swap >>sec ; : make-timespec ( us -- timespec ) 1000000 /mod 1000 * - "timespec" - [ set-timespec-nsec ] keep - [ set-timespec-sec ] keep ; + timespec + swap >>nsec + swap >>sec ; -C-STRUCT: tm - { "int" "sec" } ! Seconds: 0-59 (K&R says 0-61?) - { "int" "min" } ! Minutes: 0-59 - { "int" "hour" } ! Hours since midnight: 0-23 - { "int" "mday" } ! Day of the month: 1-31 - { "int" "mon" } ! Months *since* january: 0-11 - { "int" "year" } ! Years since 1900 - { "int" "wday" } ! Days since Sunday (0-6) - { "int" "yday" } ! Days since Jan. 1: 0-365 - { "int" "isdst" } ! +1 Daylight Savings Time, 0 No DST, - { "long" "gmtoff" } ! Seconds: 0-59 (K&R says 0-61?) - { "char*" "zone" } ; +STRUCT: tm + { sec int } + { min int } + { hour int } + { mday int } + { mon int } + { year int } + { wday int } + { yday int } + { isdst int } + { gmtoff long } + { zone char* } ; FUNCTION: time_t time ( time_t* t ) ; FUNCTION: tm* localtime ( time_t* clock ) ; From 447c5fbf7aced6b265d4b744f14e63062ec5a682 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 30 Aug 2009 05:15:18 -0500 Subject: [PATCH 2/5] compiler.cfg.linear-scan.live-intervals: dead-value-error is never thrown anymore --- .../cfg/linear-scan/live-intervals/live-intervals.factor | 2 -- 1 file changed, 2 deletions(-) diff --git a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor index 520518d27a..75dda9b475 100644 --- a/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor +++ b/basis/compiler/cfg/linear-scan/live-intervals/live-intervals.factor @@ -30,8 +30,6 @@ M: live-interval covers? ( insn# live-interval -- ? ) covers? ] if ; -ERROR: dead-value-error vreg ; - : add-new-range ( from to live-interval -- ) [ ] dip ranges>> push ; From d23688ea1a76b9522e04faeeba9dffca0ca51d0d Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 30 Aug 2009 05:36:16 -0500 Subject: [PATCH 3/5] tools.deploy.shaker: strip out functor-words global, fixing size regression from Joe's FUNCTOR-SYNTAX: patch --- basis/tools/deploy/shaker/shaker.factor | 2 ++ 1 file changed, 2 insertions(+) diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor index 19f8fb9080..6a133d9c87 100755 --- a/basis/tools/deploy/shaker/shaker.factor +++ b/basis/tools/deploy/shaker/shaker.factor @@ -289,6 +289,8 @@ IN: tools.deploy.shaker "disposables" "destructors" lookup , + "functor-words" "functors.backend" lookup , + deploy-threads? [ "initial-thread" "threads" lookup , ] unless From 7983b5515f1d276dfc14a18446ea18e19e0ef03d Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 30 Aug 2009 06:19:14 -0500 Subject: [PATCH 4/5] math.functions: some fixes --- basis/math/functions/functions-tests.factor | 19 +++++++ basis/math/functions/functions.factor | 63 ++++++++++++++------- 2 files changed, 61 insertions(+), 21 deletions(-) diff --git a/basis/math/functions/functions-tests.factor b/basis/math/functions/functions-tests.factor index e47de14dba..cde1c64f94 100644 --- a/basis/math/functions/functions-tests.factor +++ b/basis/math/functions/functions-tests.factor @@ -30,21 +30,40 @@ IN: math.functions.tests [ 0 ] [ 0 3 ^ ] unit-test [ 0.0 ] [ 1 log ] unit-test +[ 0.0 ] [ 1.0 log ] unit-test +[ 1.0 ] [ e log ] unit-test + +[ t ] [ 1 exp e = ] unit-test +[ t ] [ 1.0 exp e = ] unit-test +[ 1.0 ] [ -1 exp e * ] unit-test [ 1.0 ] [ 0 cosh ] unit-test +[ 1.0 ] [ 0.0 cosh ] unit-test [ 0.0 ] [ 1 acosh ] unit-test +[ 0.0 ] [ 1.0 acosh ] unit-test [ 1.0 ] [ 0 cos ] unit-test +[ 1.0 ] [ 0.0 cos ] unit-test [ 0.0 ] [ 1 acos ] unit-test +[ 0.0 ] [ 1.0 acos ] unit-test [ 0.0 ] [ 0 sinh ] unit-test +[ 0.0 ] [ 0.0 sinh ] unit-test [ 0.0 ] [ 0 asinh ] unit-test +[ 0.0 ] [ 0.0 asinh ] unit-test [ 0.0 ] [ 0 sin ] unit-test +[ 0.0 ] [ 0.0 sin ] unit-test [ 0.0 ] [ 0 asin ] unit-test +[ 0.0 ] [ 0.0 asin ] unit-test + +[ 0.0 ] [ 0 tan ] unit-test +[ t ] [ pi 2 / tan 1.e10 > ] unit-test [ t ] [ 10 atan real? ] unit-test +[ t ] [ 10.0 atan real? ] unit-test [ f ] [ 10 atanh real? ] unit-test +[ f ] [ 10.0 atanh real? ] unit-test [ t ] [ 10 asin sin 10 1.e-10 ~ ] unit-test [ t ] [ -1 sqrt neg dup acos cos 1.e-10 ~ ] unit-test diff --git a/basis/math/functions/functions.factor b/basis/math/functions/functions.factor index 0daea7f706..92f16764c0 100644 --- a/basis/math/functions/functions.factor +++ b/basis/math/functions/functions.factor @@ -52,14 +52,25 @@ PRIVATE> : >polar ( z -- abs arg ) >float-rect [ [ sq ] bi@ + fsqrt ] [ swap fatan2 ] 2bi ; inline -: cis ( arg -- z ) dup fcos swap fsin rect> ; inline +: cis ( arg -- z ) >float [ fcos ] [ fsin ] bi rect> ; inline : polar> ( abs arg -- z ) cis * ; inline +GENERIC: exp ( x -- y ) + +M: float exp fexp ; inline + +M: real exp >float exp ; inline + +M: complex exp >rect swap fexp swap polar> ; inline + float-rect swap ] [ swap fpow ] [ rot * fexp /f ] tri* ; inline + [ >float-rect swap ] + [ >float swap >float fpow ] + [ rot * exp /f ] + tri* ; inline : ^theta ( w abs arg -- theta ) [ >float-rect ] [ flog * swap ] [ * + ] tri* ; inline @@ -91,7 +102,7 @@ PRIVATE> { { [ over 0 = ] [ nip 0^ ] } { [ dup integer? ] [ integer^ ] } - { [ 2dup real^? ] [ fpow ] } + { [ 2dup real^? ] [ [ >float ] bi@ fpow ] } [ ^complex ] } cond ; inline @@ -146,17 +157,13 @@ M: real absq sq ; inline : >=1? ( x -- ? ) dup complex? [ drop f ] [ 1 >= ] if ; inline -GENERIC: exp ( x -- y ) - -M: real exp fexp ; inline - -M: complex exp >rect swap fexp swap polar> ; - GENERIC: log ( x -- y ) -M: real log dup 0.0 >= [ flog ] [ 0.0 rect> log ] if ; inline +M: float log dup 0.0 >= [ flog ] [ 0.0 rect> log ] if ; inline -M: complex log >polar swap flog swap rect> ; +M: real log >float log ; inline + +M: complex log >polar swap flog swap rect> ; inline : 10^ ( x -- y ) 10 swap ^ ; inline @@ -169,7 +176,9 @@ M: complex cos [ [ fcos ] [ fcosh ] bi* * ] [ [ fsin neg ] [ fsinh ] bi* * ] 2bi rect> ; -M: real cos fcos ; inline +M: float cos fcos ; inline + +M: real cos >float cos ; inline : sec ( x -- y ) cos recip ; inline @@ -180,7 +189,9 @@ M: complex cosh [ [ fcosh ] [ fcos ] bi* * ] [ [ fsinh ] [ fsin ] bi* * ] 2bi rect> ; -M: real cosh fcosh ; inline +M: float cosh fcosh ; inline + +M: real cosh >float cosh ; inline : sech ( x -- y ) cosh recip ; inline @@ -191,7 +202,9 @@ M: complex sin [ [ fsin ] [ fcosh ] bi* * ] [ [ fcos ] [ fsinh ] bi* * ] 2bi rect> ; -M: real sin fsin ; inline +M: float sin fsin ; inline + +M: real sin >float sin ; inline : cosec ( x -- y ) sin recip ; inline @@ -202,7 +215,9 @@ M: complex sinh [ [ fsinh ] [ fcos ] bi* * ] [ [ fcosh ] [ fsin ] bi* * ] 2bi rect> ; -M: real sinh fsinh ; inline +M: float sinh fsinh ; inline + +M: real sinh >float sinh ; inline : cosech ( x -- y ) sinh recip ; inline @@ -210,13 +225,17 @@ GENERIC: tan ( x -- y ) foldable M: complex tan [ sin ] [ cos ] bi / ; -M: real tan ftan ; inline +M: float tan ftan ; inline + +M: real tan >float tan ; inline GENERIC: tanh ( x -- y ) foldable M: complex tanh [ sinh ] [ cosh ] bi / ; -M: real tanh ftanh ; inline +M: float tanh ftanh ; inline + +M: real tanh >float tanh ; inline : cot ( x -- y ) tan recip ; inline @@ -242,17 +261,19 @@ M: real tanh ftanh ; inline : -i* ( x -- y ) >rect swap neg rect> ; : asin ( x -- y ) - dup [-1,1]? [ fasin ] [ i* asinh -i* ] if ; inline + dup [-1,1]? [ >float fasin ] [ i* asinh -i* ] if ; inline : acos ( x -- y ) - dup [-1,1]? [ facos ] [ asin pi 2 / swap - ] if ; + dup [-1,1]? [ >float facos ] [ asin pi 2 / swap - ] if ; inline GENERIC: atan ( x -- y ) foldable -M: complex atan i* atanh i* ; +M: complex atan i* atanh i* ; inline -M: real atan fatan ; inline +M: float atan fatan ; inline + +M: real atan >float atan ; inline : asec ( x -- y ) recip acos ; inline From ec70e1d7143795338dba14b9239b667d4c79c8d2 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sun, 30 Aug 2009 06:32:20 -0500 Subject: [PATCH 5/5] More minor documentation tweaks --- basis/help/handbook/handbook.factor | 5 +---- basis/math/bits/bits-docs.factor | 1 + basis/math/complex/complex.factor | 7 +++---- basis/math/libm/libm-docs.factor | 8 ++++---- core/math/math-docs.factor | 1 + 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/basis/help/handbook/handbook.factor b/basis/help/handbook/handbook.factor index 5db362d9bc..3effd5931e 100644 --- a/basis/help/handbook/handbook.factor +++ b/basis/help/handbook/handbook.factor @@ -106,10 +106,7 @@ ARTICLE: "numbers" "Numbers" { $subsection "complex-numbers" } "Advanced features:" { $subsection "math-vectors" } -{ $subsection "math-intervals" } -{ $subsection "math-bitfields" } -"Implementation:" -{ $subsection "math.libm" } ; +{ $subsection "math-intervals" } ; USE: io.buffers diff --git a/basis/math/bits/bits-docs.factor b/basis/math/bits/bits-docs.factor index 36043a5576..9e69823906 100644 --- a/basis/math/bits/bits-docs.factor +++ b/basis/math/bits/bits-docs.factor @@ -6,6 +6,7 @@ IN: math.bits ABOUT: "math.bits" ARTICLE: "math.bits" "Number bits virtual sequence" +"The " { $vocab-link "math.bits" } " vocabulary implements a virtual sequence which presents an integer as a sequence of bits, with the first element of the sequence being the least significant bit of the integer." { $subsection bits } { $subsection } { $subsection make-bits } ; diff --git a/basis/math/complex/complex.factor b/basis/math/complex/complex.factor index ce94dfaca8..c432089f4d 100644 --- a/basis/math/complex/complex.factor +++ b/basis/math/complex/complex.factor @@ -1,8 +1,7 @@ ! Copyright (C) 2006, 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors kernel kernel.private math math.private -math.libm math.functions arrays math.functions.private sequences -parser ; +math.functions arrays math.functions.private sequences parser ; IN: math.complex.private M: real real-part ; inline @@ -26,8 +25,8 @@ M: complex * [ *re - ] [ *im + ] 2bi rect> ; inline M: complex / [ / ] complex/ ; inline M: complex /f [ /f ] complex/ ; inline M: complex /i [ /i ] complex/ ; inline -M: complex abs absq >float fsqrt ; inline -M: complex sqrt >polar [ fsqrt ] [ 2.0 / ] bi* polar> ; inline +M: complex abs absq sqrt ; inline +M: complex sqrt >polar [ sqrt ] [ 2.0 / ] bi* polar> ; inline IN: syntax diff --git a/basis/math/libm/libm-docs.factor b/basis/math/libm/libm-docs.factor index a890a59c19..abbb6f1289 100644 --- a/basis/math/libm/libm-docs.factor +++ b/basis/math/libm/libm-docs.factor @@ -3,10 +3,10 @@ IN: math.libm ARTICLE: "math.libm" "C standard library math functions" "The words in the " { $vocab-link "math.libm" } " vocabulary call C standard library math functions. They are used to implement words in the " { $vocab-link "math.functions" } " vocabulary." -$nl -"They can be called directly, however there is little reason to do so, since they only implement real-valued functions, and in some cases place restrictions on the domain:" -{ $example "USE: math.functions" "2 acos ." "C{ 0.0 1.316957896924817 }" } -{ $unchecked-example "USE: math.libm" "2 facos ." "0/0." } +{ $warning +"These functions are unsafe. The compiler special-cases them to operate on floats only. They can be called directly, however there is little reason to do so, since they only implement real-valued functions, and in some cases place restrictions on the domain:" +{ $example "USE: math.functions" "2.0 acos ." "C{ 0.0 1.316957896924817 }" } +{ $unchecked-example "USE: math.libm" "2 facos ." "0/0." } } "Trigonometric functions:" { $subsection fcos } { $subsection fsin } diff --git a/core/math/math-docs.factor b/core/math/math-docs.factor index 853aca5969..ab2a5ab8be 100644 --- a/core/math/math-docs.factor +++ b/core/math/math-docs.factor @@ -420,6 +420,7 @@ ARTICLE: "bitwise-arithmetic" "Bitwise arithmetic" { $subsection 2/ } { $subsection 2^ } { $subsection bit? } +"Advanced topics:" { $subsection "math.bitwise" } { $subsection "math.bits" } { $see-also "booleans" } ;