Merge branch 'master' of git://factorcode.org/git/factor

core/alien/alien-tests.factor

@@ -1,7 +1,7 @@
 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
 
@@ -68,3 +68,7 @@ cell 8 = [
 [ 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
+
+[ f ] [ DLL" fadfasdfsada" dll-valid? ] unit-test
+
+[ f ] [ "does not exist" DLL" fadsfasfdsaf" dlsym ] unit-test

core/alien/syntax/syntax.factor

@@ -32,7 +32,7 @@ PRIVATE>
     >r >r swapd roll indirect-quot r> r>
     -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
 

core/classes/classes-tests.factor

@@ -28,6 +28,8 @@ TUPLE: second-one ;
 UNION: both first-one union-class ;
 
 [ 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 \ fixnum class< ] unit-test

core/inference/class/class-tests.factor

@@ -294,4 +294,6 @@ cell-bits 32 = [
     \ >= inlined?
 ] unit-test
 
-
+[ t ] [
+    [ { vector } declare nth-unsafe ] \ nth-unsafe inlined?
+] unit-test

core/parser/parser-tests.factor

@@ -1,7 +1,7 @@
 USING: arrays math parser tools.test kernel generic words
 io.streams.string namespaces classes effects source-files
 assocs sequences strings io.files definitions continuations
-sorting tuples compiler.units debugger ;
+sorting tuples compiler.units debugger vocabs.loader ;
 IN: parser.tests
 
 [
@@ -459,3 +459,5 @@ must-fail-with
         <string-reader> "d-f-s-test" parse-stream drop
     ] unit-test
 ] times
+
+[ ] [ "parser" reload ] unit-test

core/parser/parser.factor

@@ -478,7 +478,15 @@ SYMBOL: interactive-vocabs
 : smudged-usage ( -- usages referenced removed )
     removed-definitions filter-moved keys [
         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
     ] keep ;
 

extra/fry/fry-docs.factor

@@ -46,7 +46,7 @@ $nl
 }
 "The " { $link , } " and " { $link @ } " specifiers may be freely mixed:"
 { $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? dup 5 ? ] map"
 }

extra/help/stylesheet/stylesheet.factor

@@ -82,6 +82,7 @@ H{
     { page-color { 0.95 0.95 0.95 1 } }
     { border-color { 1 0 0 1 } }
     { border-width 5 }
+    { wrap-margin 500 }
 } warning-style set-global
 
 SYMBOL: table-content-style

vm/alien.c

@@ -197,15 +197,15 @@ DEFINE_PRIMITIVE(dlsym)
 	F_DLL *d;
 
 	if(dll == F)
-		d = NULL;
+		box_alien(ffi_dlsym(NULL,sym));
 	else
 	{
 		d = untag_dll(dll);
 		if(d->dll == NULL)
 			dpush(F);
+		else
+			box_alien(ffi_dlsym(d,sym));
 	}
-
-	box_alien(ffi_dlsym(d,sym));
 }
 
 /* close a native library handle */