steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

db4
Slava Pestov 2008-11-18 09:44:59 -06:00
parent f0552accce a79107695e
commit 67c8fd8182
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
extra/boids/boids.factor
View File

@ -83,7 +83,7 @@ VAR: separation-radius
: relative-position ( self other -- v ) swap [ pos>> ] bi@ v- ; : relative-position ( self other -- v ) swap [ pos>> ] bi@ v- ;
: relative-angle ( self other -- angle ) : 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 > ; : above? ( n a b -- ? ) nip > ;
: wrap ( n a b -- n ) : wrap ( n a b -- n )
{ { [ 3dup below? ] {
[ 2nip ] } { [ 3dup below? ] [ 2nip ] }
{ [ 3dup above? ] { [ 3dup above? ] [ drop nip ] }
[ drop nip ] } { [ t ] [ 2drop ] }
{ [ t ] }
[ 2drop ] } } cond ;
cond ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

2
extra/ftp/server/server.factor
View File

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

2
extra/update/latest/latest.factor
View File

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