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

db4
Slava Pestov 2008-11-18 09:44:59 -06:00
commit 67c8fd8182
3 changed files with 9 additions and 10 deletions

View File

@ -83,7 +83,7 @@ VAR: separation-radius
: relative-position ( self other -- v ) swap [ pos>> ] bi@ v- ;
: relative-angle ( self other -- angle )
over vel>> -rot relative-position angle-between ;
over vel>> -rot relative-position angle-between ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@ -189,13 +189,12 @@ boids> [ within-alignment-neighborhood? ] with filter ;
: above? ( n a b -- ? ) nip > ;
: wrap ( n a b -- n )
{ { [ 3dup below? ]
[ 2nip ] }
{ [ 3dup above? ]
[ drop nip ] }
{ [ t ]
[ 2drop ] } }
cond ;
{
{ [ 3dup below? ] [ 2nip ] }
{ [ 3dup above? ] [ drop nip ] }
{ [ t ] [ 2drop ] }
}
cond ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

View File

@ -75,7 +75,7 @@ C: <ftp-list> ftp-list
: handle-USER ( ftp-command -- )
[
tokenized>> second client get (>>user)
drop
331 "Please specify the password." server-response
] [
2drop "bad USER" ftp-error

View File

@ -9,7 +9,7 @@ IN: update.latest
: git-pull-master ( -- )
image parent-directory
[
{ "git" "pull" "git://factorcode.org/git/factor.git" "master" }
{ "git" "pull" "http://factorcode.org/git/factor.git" "master" }
run-command
]
with-directory ;