From 5b0244104099919d76423f3ec34a3e1a3fae5724 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 14 Mar 2008 02:24:42 -0500 Subject: [PATCH 1/5] Add missing types --- extra/unix/types/freebsd/freebsd.factor | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) mode change 100644 => 100755 extra/unix/types/freebsd/freebsd.factor diff --git a/extra/unix/types/freebsd/freebsd.factor b/extra/unix/types/freebsd/freebsd.factor old mode 100644 new mode 100755 index 8d2d11e8ee..6e01ae9fd5 --- a/extra/unix/types/freebsd/freebsd.factor +++ b/extra/unix/types/freebsd/freebsd.factor @@ -2,6 +2,10 @@ USING: alien.syntax ; IN: unix.types +! FreeBSD 7 x86.32 + +! Need to verify on 64-bit + TYPEDEF: ushort __uint16_t TYPEDEF: uint __uint32_t TYPEDEF: int __int32_t @@ -16,4 +20,7 @@ TYPEDEF: __uint32_t gid_t TYPEDEF: __int64_t off_t TYPEDEF: __int64_t blkcnt_t TYPEDEF: __uint32_t blksize_t -TYPEDEF: __uint32_t fflags_t \ No newline at end of file +TYPEDEF: __uint32_t fflags_t +TYPEDEF: int ssize_t +TYPEDEF: int pid_t +TYPEDEF: int time_t \ No newline at end of file From 90f8aa3136d994dd027370bf554fbe01bdbb2efe Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 14 Mar 2008 02:27:43 -0500 Subject: [PATCH 2/5] Fix regressions --- core/bootstrap/primitives.factor | 6 ++++++ extra/io/mmap/mmap-tests.factor | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor index b900b2fd49..52067b888c 100755 --- a/core/bootstrap/primitives.factor +++ b/core/bootstrap/primitives.factor @@ -301,6 +301,12 @@ define-builtin "f" "syntax" lookup builtins get remove [ ] subset f union-class define-class +"f" "syntax" create [ not ] "predicate" set-word-prop +"f?" "syntax" create "syntax" vocab-words delete-at + +"general-t" "kernel" create [ ] "predicate" set-word-prop +"general-t?" "kernel" create "syntax" vocab-words delete-at + ! Catch-all class for providing a default method. "object" "kernel" create [ drop t ] "predicate" set-word-prop "object" "kernel" create diff --git a/extra/io/mmap/mmap-tests.factor b/extra/io/mmap/mmap-tests.factor index c75c7b9bd4..b17d7aeab9 100755 --- a/extra/io/mmap/mmap-tests.factor +++ b/extra/io/mmap/mmap-tests.factor @@ -4,7 +4,7 @@ IN: io.mmap.tests [ "mmap-test-file.txt" resource-path delete-file ] ignore-errors [ ] [ "12345" "mmap-test-file.txt" resource-path ascii set-file-contents ] unit-test -[ ] [ "mmap-test-file.txt" resource-path dup file-info file-info-length [ CHAR: 2 0 pick set-nth drop ] with-mapped-file ] unit-test +[ ] [ "mmap-test-file.txt" resource-path dup file-info file-info-size [ CHAR: 2 0 pick set-nth drop ] with-mapped-file ] unit-test [ 5 ] [ "mmap-test-file.txt" resource-path dup file-info file-info-size [ length ] with-mapped-file ] unit-test [ "22345" ] [ "mmap-test-file.txt" resource-path ascii file-contents ] unit-test [ "mmap-test-file.txt" resource-path delete-file ] ignore-errors From c13d759ec684c44b1365988724159a5a1fb0bfc8 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 14 Mar 2008 02:27:51 -0500 Subject: [PATCH 3/5] Cleanup --- extra/pack/pack.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/pack/pack.factor b/extra/pack/pack.factor index a2958d5bea..f5ba0fd11d 100755 --- a/extra/pack/pack.factor +++ b/extra/pack/pack.factor @@ -88,7 +88,7 @@ M: string b, ( n string -- ) heap-size b, ; read [ zero? ] right-trim dup empty? [ drop f ] when ; : (read-128-ber) ( n -- n ) - 1 read first + read1 [ >r 7 shift r> 7 clear-bit bitor ] keep 7 bit? [ (read-128-ber) ] when ; From dcda3d5bcfdaa79c34eaba04030eca7e8096d902 Mon Sep 17 00:00:00 2001 From: sheeple Date: Fri, 14 Mar 2008 01:36:30 -0500 Subject: [PATCH 4/5] Fix FreeBSD --- Makefile | 4 ++-- extra/io/unix/freebsd/freebsd.factor | 2 +- misc/_target | 20 ++++++++++++++++++++ misc/target | 9 ++++++--- 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100755 misc/_target diff --git a/Makefile b/Makefile index 6f12633871..054d57b641 100755 --- a/Makefile +++ b/Makefile @@ -46,10 +46,10 @@ DLL_OBJS = $(PLAF_DLL_OBJS) \ EXE_OBJS = $(PLAF_EXE_OBJS) default: misc/wordsize - make `./misc/target` + $(MAKE) `./misc/target` help: - @echo "Run 'make' with one of the following parameters:" + @echo "Run '$(MAKE)' with one of the following parameters:" @echo "" @echo "freebsd-x86-32" @echo "freebsd-x86-64" diff --git a/extra/io/unix/freebsd/freebsd.factor b/extra/io/unix/freebsd/freebsd.factor index 2aad0bdb1a..65b4a6f0f7 100644 --- a/extra/io/unix/freebsd/freebsd.factor +++ b/extra/io/unix/freebsd/freebsd.factor @@ -1,5 +1,5 @@ IN: io.unix.freebsd -USING: io.unix.bsd io.backend core-foundation.fsevents ; +USING: io.unix.bsd io.backend ; TUPLE: freebsd-io ; diff --git a/misc/_target b/misc/_target new file mode 100755 index 0000000000..2be071c17d --- /dev/null +++ b/misc/_target @@ -0,0 +1,20 @@ +#!/bin/bash + +if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] +then + echo macosx-ppc +elif [ `uname -s` = Darwin ] +then + echo macosx-x86-`./misc/wordsize` +elif [ \( `uname -s` = Linux \) -a \( `uname -m` = i686 \) ] +then + echo linux-x86-32 +elif [ \( `uname -s` = Linux \) -a \( `uname -m` = x86_64 \) ] +then + echo linux-x86-64 +elif [ \( `uname -o` = Cygwin \) -a \( `uname -m` = i686 \) ] +then + echo winnt-x86-`./misc/wordsize` +else + echo help +fi \ No newline at end of file diff --git a/misc/target b/misc/target index 2be071c17d..880de8f47a 100755 --- a/misc/target +++ b/misc/target @@ -1,6 +1,9 @@ -#!/bin/bash +#!/bin/sh -if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] +if [ \( `uname -s ` = FreeBSD \) -a \( `uname -p` = i386 \) ] +then + echo freebsd-x86-32 +elif [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] then echo macosx-ppc elif [ `uname -s` = Darwin ] @@ -17,4 +20,4 @@ then echo winnt-x86-`./misc/wordsize` else echo help -fi \ No newline at end of file +fi From f1ba5e8368f51c6b39b593407a6a2cca7fd5317a Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 14 Mar 2008 02:36:27 -0500 Subject: [PATCH 5/5] Remove obsolete file --- misc/_target | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 misc/_target diff --git a/misc/_target b/misc/_target deleted file mode 100755 index 2be071c17d..0000000000 --- a/misc/_target +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ \( `uname -s` = Darwin \) -a \( `uname -p` = powerpc \) ] -then - echo macosx-ppc -elif [ `uname -s` = Darwin ] -then - echo macosx-x86-`./misc/wordsize` -elif [ \( `uname -s` = Linux \) -a \( `uname -m` = i686 \) ] -then - echo linux-x86-32 -elif [ \( `uname -s` = Linux \) -a \( `uname -m` = x86_64 \) ] -then - echo linux-x86-64 -elif [ \( `uname -o` = Cygwin \) -a \( `uname -m` = i686 \) ] -then - echo winnt-x86-`./misc/wordsize` -else - echo help -fi \ No newline at end of file