Merge branch 'master' of git://factorcode.org/git/factor
commit
848c340ae9
|
@ -1,7 +1,7 @@
|
||||||
IN: alien.tests
|
IN: alien.tests
|
||||||
USING: alien alien.accessors byte-arrays arrays kernel
|
USING: alien alien.accessors alien.syntax byte-arrays arrays
|
||||||
kernel.private namespaces tools.test sequences libc math system
|
kernel kernel.private namespaces tools.test sequences libc math
|
||||||
prettyprint layouts ;
|
system prettyprint layouts ;
|
||||||
|
|
||||||
[ t ] [ -1 <alien> alien-address 0 > ] unit-test
|
[ t ] [ -1 <alien> alien-address 0 > ] unit-test
|
||||||
|
|
||||||
|
@ -68,3 +68,7 @@ cell 8 = [
|
||||||
[ f ] [ 0 B{ 1 2 3 } <displaced-alien> pinned-c-ptr? ] unit-test
|
[ f ] [ 0 B{ 1 2 3 } <displaced-alien> pinned-c-ptr? ] unit-test
|
||||||
|
|
||||||
[ "( displaced alien )" ] [ 0 B{ 1 2 3 } <displaced-alien> unparse ] unit-test
|
[ "( displaced alien )" ] [ 0 B{ 1 2 3 } <displaced-alien> unparse ] unit-test
|
||||||
|
|
||||||
|
[ f ] [ DLL" fadfasdfsada" dll-valid? ] unit-test
|
||||||
|
|
||||||
|
[ f ] [ "does not exist" DLL" fadsfasfdsaf" dlsym ] unit-test
|
||||||
|
|
|
@ -32,7 +32,7 @@ PRIVATE>
|
||||||
>r >r swapd roll indirect-quot r> r>
|
>r >r swapd roll indirect-quot r> r>
|
||||||
-rot define-declared ;
|
-rot define-declared ;
|
||||||
|
|
||||||
: DLL" skip-blank parse-string dlopen parsed ; parsing
|
: DLL" lexer get skip-blank parse-string dlopen parsed ; parsing
|
||||||
|
|
||||||
: ALIEN: scan string>number <alien> parsed ; parsing
|
: ALIEN: scan string>number <alien> parsed ; parsing
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,8 @@ TUPLE: second-one ;
|
||||||
UNION: both first-one union-class ;
|
UNION: both first-one union-class ;
|
||||||
|
|
||||||
[ t ] [ both tuple classes-intersect? ] unit-test
|
[ t ] [ both tuple classes-intersect? ] unit-test
|
||||||
|
[ null ] [ vector virtual-sequence class-and ] unit-test
|
||||||
|
[ f ] [ vector virtual-sequence classes-intersect? ] unit-test
|
||||||
|
|
||||||
[ t ] [ \ fixnum \ integer class< ] unit-test
|
[ t ] [ \ fixnum \ integer class< ] unit-test
|
||||||
[ t ] [ \ fixnum \ fixnum class< ] unit-test
|
[ t ] [ \ fixnum \ fixnum class< ] unit-test
|
||||||
|
|
|
@ -294,4 +294,6 @@ cell-bits 32 = [
|
||||||
\ >= inlined?
|
\ >= inlined?
|
||||||
] unit-test
|
] unit-test
|
||||||
|
|
||||||
|
[ t ] [
|
||||||
|
[ { vector } declare nth-unsafe ] \ nth-unsafe inlined?
|
||||||
|
] unit-test
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
USING: arrays math parser tools.test kernel generic words
|
USING: arrays math parser tools.test kernel generic words
|
||||||
io.streams.string namespaces classes effects source-files
|
io.streams.string namespaces classes effects source-files
|
||||||
assocs sequences strings io.files definitions continuations
|
assocs sequences strings io.files definitions continuations
|
||||||
sorting tuples compiler.units debugger ;
|
sorting tuples compiler.units debugger vocabs.loader ;
|
||||||
IN: parser.tests
|
IN: parser.tests
|
||||||
|
|
||||||
[
|
[
|
||||||
|
@ -459,3 +459,5 @@ must-fail-with
|
||||||
<string-reader> "d-f-s-test" parse-stream drop
|
<string-reader> "d-f-s-test" parse-stream drop
|
||||||
] unit-test
|
] unit-test
|
||||||
] times
|
] times
|
||||||
|
|
||||||
|
[ ] [ "parser" reload ] unit-test
|
||||||
|
|
|
@ -478,7 +478,15 @@ SYMBOL: interactive-vocabs
|
||||||
: smudged-usage ( -- usages referenced removed )
|
: smudged-usage ( -- usages referenced removed )
|
||||||
removed-definitions filter-moved keys [
|
removed-definitions filter-moved keys [
|
||||||
outside-usages
|
outside-usages
|
||||||
[ empty? swap pathname? or not ] assoc-subset
|
[
|
||||||
|
empty? [ drop f ] [
|
||||||
|
{
|
||||||
|
{ [ dup pathname? ] [ f ] }
|
||||||
|
{ [ dup method-body? ] [ f ] }
|
||||||
|
{ [ t ] [ t ] }
|
||||||
|
} cond nip
|
||||||
|
] if
|
||||||
|
] assoc-subset
|
||||||
dup values concat prune swap keys
|
dup values concat prune swap keys
|
||||||
] keep ;
|
] keep ;
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,7 @@ $nl
|
||||||
}
|
}
|
||||||
"The " { $link , } " and " { $link @ } " specifiers may be freely mixed:"
|
"The " { $link , } " and " { $link @ } " specifiers may be freely mixed:"
|
||||||
{ $code
|
{ $code
|
||||||
"{ 8 13 14 27 } [ even? ] 5 [ @ dup , ? ] map"
|
"{ 8 13 14 27 } [ even? ] 5 '[ @ dup , ? ] map"
|
||||||
"{ 8 13 14 27 } [ even? ] 5 [ dup ] swap [ ? ] curry 3compose map"
|
"{ 8 13 14 27 } [ even? ] 5 [ dup ] swap [ ? ] curry 3compose map"
|
||||||
"{ 8 13 14 27 } [ even? dup 5 ? ] map"
|
"{ 8 13 14 27 } [ even? dup 5 ? ] map"
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,6 +82,7 @@ H{
|
||||||
{ page-color { 0.95 0.95 0.95 1 } }
|
{ page-color { 0.95 0.95 0.95 1 } }
|
||||||
{ border-color { 1 0 0 1 } }
|
{ border-color { 1 0 0 1 } }
|
||||||
{ border-width 5 }
|
{ border-width 5 }
|
||||||
|
{ wrap-margin 500 }
|
||||||
} warning-style set-global
|
} warning-style set-global
|
||||||
|
|
||||||
SYMBOL: table-content-style
|
SYMBOL: table-content-style
|
||||||
|
|
|
@ -197,15 +197,15 @@ DEFINE_PRIMITIVE(dlsym)
|
||||||
F_DLL *d;
|
F_DLL *d;
|
||||||
|
|
||||||
if(dll == F)
|
if(dll == F)
|
||||||
d = NULL;
|
box_alien(ffi_dlsym(NULL,sym));
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
d = untag_dll(dll);
|
d = untag_dll(dll);
|
||||||
if(d->dll == NULL)
|
if(d->dll == NULL)
|
||||||
dpush(F);
|
dpush(F);
|
||||||
|
else
|
||||||
|
box_alien(ffi_dlsym(d,sym));
|
||||||
}
|
}
|
||||||
|
|
||||||
box_alien(ffi_dlsym(d,sym));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* close a native library handle */
|
/* close a native library handle */
|
||||||
|
|
Loading…
Reference in New Issue