From 1b508b9c376ea04577232b50d17d4a9af0545716 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 22 Feb 2010 13:10:20 +1300 Subject: [PATCH 1/6] cocoa.messages: fix --- basis/cocoa/messages/messages.factor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor index eab301add7..76b77721ff 100644 --- a/basis/cocoa/messages/messages.factor +++ b/basis/cocoa/messages/messages.factor @@ -236,10 +236,11 @@ ERROR: no-objc-type name ; ] bi ; : import-objc-class ( name quot -- ) - over define-objc-class-word + 2dup swap define-objc-class-word + over objc_getClass [ drop ] [ call( -- ) ] if dup objc_getClass [ - [ objc-class register-objc-methods ] - [ objc-meta-class register-objc-methods ] bi + [ objc_getClass register-objc-methods ] + [ objc_getMetaClass register-objc-methods ] bi ] [ drop ] if ; : root-class ( class -- root ) From 2ab1be755cfa1e20516d945934af7d799a85dfac Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 22 Feb 2010 13:16:34 +1300 Subject: [PATCH 2/6] vocabs.loader: tweak platform checking logic --- core/vocabs/loader/loader.factor | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor index 67d7d7677d..c8cf77b795 100644 --- a/core/vocabs/loader/loader.factor +++ b/core/vocabs/loader/loader.factor @@ -1,4 +1,4 @@ -! Copyright (C) 2007, 2009 Eduardo Cavazos, Slava Pestov. +! Copyright (C) 2007, 2010 Eduardo Cavazos, Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: namespaces make sequences io io.files io.pathnames kernel assocs words vocabs definitions parser continuations hashtables @@ -57,9 +57,15 @@ PRIVATE> SYMBOL: load-help? +! Defined by vocabs.metadata +SYMBOL: check-vocab-hook + +check-vocab-hook [ [ drop ] ] initialize + >source-loaded? dup vocab-source-path [ parse-file ] [ [ ] ] if* @@ -99,11 +105,6 @@ PRIVATE> SYMBOL: blacklist -! Defined by vocabs.metadata -SYMBOL: check-vocab-hook - -check-vocab-hook [ [ drop ] ] initialize - From 5fe49b13bfbeba4628f72b3c40ef9ddf26f85000 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 22 Feb 2010 13:16:46 +1300 Subject: [PATCH 3/6] windows.com.prettyprint: remove circular dependency on windows.com --- basis/windows/com/prettyprint/prettyprint.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/windows/com/prettyprint/prettyprint.factor b/basis/windows/com/prettyprint/prettyprint.factor index c75f43f560..ef79a58600 100644 --- a/basis/windows/com/prettyprint/prettyprint.factor +++ b/basis/windows/com/prettyprint/prettyprint.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: windows.com windows.kernel32 windows.ole32 -prettyprint.custom prettyprint.sections sequences ; +USING: windows.kernel32 windows.ole32 prettyprint.custom +prettyprint.sections sequences ; IN: windows.com.prettyprint M: GUID pprint* guid>string "GUID: " prepend text ; From f9d6191c4bc2399d3f66a121351959db23bb4ee1 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 22 Feb 2010 13:18:45 +1300 Subject: [PATCH 4/6] cpu.ppc: fix string c-type usage --- basis/cpu/ppc/ppc.factor | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor index 22eb2543b4..6d84aad8d5 100644 --- a/basis/cpu/ppc/ppc.factor +++ b/basis/cpu/ppc/ppc.factor @@ -2,8 +2,9 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs sequences kernel combinators make math math.order math.ranges system namespaces locals layouts words -alien alien.accessors alien.c-types alien.data literals cpu.architecture -cpu.ppc.assembler cpu.ppc.assembler.backend compiler.cfg.registers +alien alien.accessors alien.c-types alien.complex alien.data +literals cpu.architecture cpu.ppc.assembler +cpu.ppc.assembler.backend compiler.cfg.registers compiler.cfg.instructions compiler.cfg.comparisons compiler.codegen.fixup compiler.cfg.intrinsics compiler.cfg.stack-frame compiler.cfg.build-stack-frame @@ -780,4 +781,4 @@ USE: vocabs.loader { [ os linux? ] [ "cpu.ppc.linux" require ] } } cond -"complex-double" c-type t >>return-in-registers? drop +complex-double c-type t >>return-in-registers? drop From ed18b911c83e6b3f697731affb0744b2a56182a1 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 21 Feb 2010 16:49:44 -0800 Subject: [PATCH 5/6] io.sockets.windows.nt: update string c-types in alien-indirect --- basis/io/sockets/windows/nt/nt.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basis/io/sockets/windows/nt/nt.factor b/basis/io/sockets/windows/nt/nt.factor index 0dd85954ac..8eb2df5b46 100644 --- a/basis/io/sockets/windows/nt/nt.factor +++ b/basis/io/sockets/windows/nt/nt.factor @@ -55,8 +55,8 @@ TUPLE: ConnectEx-args port [ lpOverlapped>> ] [ ptr>> ] } cleave - "int" - { "SOCKET" "sockaddr_in*" "int" "PVOID" "DWORD" "LPDWORD" "void*" } + int + { SOCKET void* int PVOID DWORD LPDWORD void* } "stdcall" alien-indirect drop winsock-error-string [ throw ] when* ; inline From 92e1ca8b612977f8090a1e8ac7fdb1f95a2b467c Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 21 Feb 2010 16:49:58 -0800 Subject: [PATCH 6/6] math.blas: update string c-types --- basis/math/blas/matrices/matrices.factor | 8 ++++---- basis/math/blas/vectors/vectors.factor | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basis/math/blas/matrices/matrices.factor b/basis/math/blas/matrices/matrices.factor index 0a6fc147ad..22c649c544 100644 --- a/basis/math/blas/matrices/matrices.factor +++ b/basis/math/blas/matrices/matrices.factor @@ -305,10 +305,10 @@ M: MATRIX pprint-delims : define-complex-blas-matrix ( TYPE T -- ) "U" "C" (define-blas-matrix) ; -"float" "S" define-real-blas-matrix -"double" "D" define-real-blas-matrix -"complex-float" "C" define-complex-blas-matrix -"complex-double" "Z" define-complex-blas-matrix +float "S" define-real-blas-matrix +double "D" define-real-blas-matrix +complex-float "C" define-complex-blas-matrix +complex-double "Z" define-complex-blas-matrix >> diff --git a/basis/math/blas/vectors/vectors.factor b/basis/math/blas/vectors/vectors.factor index 083400224e..caf0984aa4 100644 --- a/basis/math/blas/vectors/vectors.factor +++ b/basis/math/blas/vectors/vectors.factor @@ -238,10 +238,10 @@ M: VECTOR Vasum [ drop (define-blas-vector) ] [ (define-complex-blas-vector) ] 3bi ; -"float" "S" define-real-blas-vector -"double" "D" define-real-blas-vector -"complex-float" "C" "S" define-complex-blas-vector -"complex-double" "Z" "D" define-complex-blas-vector +float "S" define-real-blas-vector +double "D" define-real-blas-vector +complex-float "C" "S" define-complex-blas-vector +complex-double "Z" "D" define-complex-blas-vector >>