Merge branch 'master' into new-alien-pointers

diff --git a/basis/cocoa/messages/messages.factor b/basis/cocoa/messages/messages.factor
index eab301add741ec6f347c0c537327f41112080939..76b77721ffe1ca60aeec4b3b55c66ff5153fa096 100644 (file)
--- 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 )

diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor
index 22eb2543b4fdd3829e88b0d6eba263690c6f1356..6d84aad8d50bd2a422e722ad3a71dc0aee555589 100644 (file)
--- 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

diff --git a/basis/io/sockets/windows/nt/nt.factor b/basis/io/sockets/windows/nt/nt.factor
index 0dd85954acb222857fc4b31f3e1e00e7a31b9469..8eb2df5b4624f3725f89e608c9c198350f5c1883 100644 (file)
--- 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
 

diff --git a/basis/math/blas/matrices/matrices.factor b/basis/math/blas/matrices/matrices.factor
index 0a6fc147ade16f62d221bec1d22d90efbbb4a03e..22c649c54422cf68eb436f42ee9392ea46ee9541 100644 (file)
--- 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 083400224e98adf1b59aef23c44616624d512d74..caf0984aa404ab0af69227119af8732e5d0b8591 100644 (file)
--- 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
 
 >>
 

diff --git a/basis/windows/com/prettyprint/prettyprint.factor b/basis/windows/com/prettyprint/prettyprint.factor
index c75f43f560c1f8ef04b90e0a7c01b8d64fb47ce1..ef79a586005fac7e75150c1ccb3e1bf569aa3821 100644 (file)
--- 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 ;

diff --git a/core/vocabs/loader/loader.factor b/core/vocabs/loader/loader.factor
index 67d7d7677d212304fd3a36fc4eef5ee8dab13268..c8cf77b795612145bc2a0acbe6fda1d21ff1d6d0 100644 (file)
--- 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
+
 <PRIVATE
 
 : load-source ( vocab -- )
+    dup check-vocab-hook get call( vocab -- )
     [
         +parsing+ >>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
-
 <PRIVATE
 
 : add-to-blacklist ( error vocab -- )
@@ -122,10 +123,7 @@ M: vocab (load-vocab)
 M: vocab-link (load-vocab)
     vocab-name (load-vocab) ;
 
-M: string (load-vocab)
-    [ check-vocab-hook get call( vocab -- ) ]
-    [ create-vocab (load-vocab) ]
-    bi ;
+M: string (load-vocab) create-vocab (load-vocab) ;
 
 PRIVATE>