Merge branch 'master' into new-alien-pointers

db4
Joe Groff 2010-02-21 18:19:17 -08:00
commit 971af554e1
7 changed files with 28 additions and 28 deletions
basis
cocoa/messages
cpu/ppc
io/sockets/windows/nt
math/blas
windows/com/prettyprint
core/vocabs/loader

View File

@ -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 )

View File

@ -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

View File

@ -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

View File

@ -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
>>

View File

@ -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
>>

View File

@ -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 ;

View File

@ -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>