From 2521f05910e3c67f4808914bf18ac720ba83ca72 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 3 Dec 2008 08:53:28 -0600 Subject: [PATCH 1/5] Move cfdg.* back to extra --- {unmaintained => extra}/cfdg/authors.txt | 0 {unmaintained => extra}/cfdg/cfdg.factor | 0 {unmaintained => extra}/cfdg/gl/authors.txt | 0 {unmaintained => extra}/cfdg/gl/gl.factor | 0 {unmaintained => extra}/cfdg/models/aqua-star/aqua-star.factor | 0 {unmaintained => extra}/cfdg/models/aqua-star/authors.txt | 0 {unmaintained => extra}/cfdg/models/aqua-star/tags.txt | 0 {unmaintained => extra}/cfdg/models/chiaroscuro/authors.txt | 0 .../cfdg/models/chiaroscuro/chiaroscuro.factor | 0 {unmaintained => extra}/cfdg/models/chiaroscuro/tags.txt | 0 {unmaintained => extra}/cfdg/models/flower6/authors.txt | 0 {unmaintained => extra}/cfdg/models/flower6/deploy.factor | 0 {unmaintained => extra}/cfdg/models/flower6/flower6.factor | 0 {unmaintained => extra}/cfdg/models/flower6/tags.txt | 0 {unmaintained => extra}/cfdg/models/game1-turn6/authors.txt | 0 .../cfdg/models/game1-turn6/game1-turn6.factor | 0 {unmaintained => extra}/cfdg/models/game1-turn6/tags.txt | 0 {unmaintained => extra}/cfdg/models/lesson/authors.txt | 0 {unmaintained => extra}/cfdg/models/lesson/lesson.factor | 0 {unmaintained => extra}/cfdg/models/lesson/tags.txt | 0 {unmaintained => extra}/cfdg/models/rules08/rules08.factor | 0 {unmaintained => extra}/cfdg/models/rules08/tags.txt | 0 {unmaintained => extra}/cfdg/models/sierpinski/authors.txt | 0 {unmaintained => extra}/cfdg/models/sierpinski/sierpinski.factor | 0 {unmaintained => extra}/cfdg/models/sierpinski/tags.txt | 0 {unmaintained => extra}/cfdg/models/snowflake/authors.txt | 0 {unmaintained => extra}/cfdg/models/snowflake/snowflake.factor | 0 {unmaintained => extra}/cfdg/models/snowflake/tags.txt | 0 {unmaintained => extra}/cfdg/models/spirales/spirales.factor | 0 {unmaintained => extra}/cfdg/models/spirales/tags.txt | 0 {unmaintained => extra}/cfdg/summary.txt | 0 31 files changed, 0 insertions(+), 0 deletions(-) rename {unmaintained => extra}/cfdg/authors.txt (100%) rename {unmaintained => extra}/cfdg/cfdg.factor (100%) rename {unmaintained => extra}/cfdg/gl/authors.txt (100%) rename {unmaintained => extra}/cfdg/gl/gl.factor (100%) rename {unmaintained => extra}/cfdg/models/aqua-star/aqua-star.factor (100%) rename {unmaintained => extra}/cfdg/models/aqua-star/authors.txt (100%) rename {unmaintained => extra}/cfdg/models/aqua-star/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/chiaroscuro/authors.txt (100%) rename {unmaintained => extra}/cfdg/models/chiaroscuro/chiaroscuro.factor (100%) rename {unmaintained => extra}/cfdg/models/chiaroscuro/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/flower6/authors.txt (100%) rename {unmaintained => extra}/cfdg/models/flower6/deploy.factor (100%) rename {unmaintained => extra}/cfdg/models/flower6/flower6.factor (100%) rename {unmaintained => extra}/cfdg/models/flower6/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/game1-turn6/authors.txt (100%) rename {unmaintained => extra}/cfdg/models/game1-turn6/game1-turn6.factor (100%) rename {unmaintained => extra}/cfdg/models/game1-turn6/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/lesson/authors.txt (100%) rename {unmaintained => extra}/cfdg/models/lesson/lesson.factor (100%) rename {unmaintained => extra}/cfdg/models/lesson/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/rules08/rules08.factor (100%) rename {unmaintained => extra}/cfdg/models/rules08/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/sierpinski/authors.txt (100%) rename {unmaintained => extra}/cfdg/models/sierpinski/sierpinski.factor (100%) rename {unmaintained => extra}/cfdg/models/sierpinski/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/snowflake/authors.txt (100%) rename {unmaintained => extra}/cfdg/models/snowflake/snowflake.factor (100%) rename {unmaintained => extra}/cfdg/models/snowflake/tags.txt (100%) rename {unmaintained => extra}/cfdg/models/spirales/spirales.factor (100%) rename {unmaintained => extra}/cfdg/models/spirales/tags.txt (100%) rename {unmaintained => extra}/cfdg/summary.txt (100%) diff --git a/unmaintained/cfdg/authors.txt b/extra/cfdg/authors.txt similarity index 100% rename from unmaintained/cfdg/authors.txt rename to extra/cfdg/authors.txt diff --git a/unmaintained/cfdg/cfdg.factor b/extra/cfdg/cfdg.factor similarity index 100% rename from unmaintained/cfdg/cfdg.factor rename to extra/cfdg/cfdg.factor diff --git a/unmaintained/cfdg/gl/authors.txt b/extra/cfdg/gl/authors.txt similarity index 100% rename from unmaintained/cfdg/gl/authors.txt rename to extra/cfdg/gl/authors.txt diff --git a/unmaintained/cfdg/gl/gl.factor b/extra/cfdg/gl/gl.factor similarity index 100% rename from unmaintained/cfdg/gl/gl.factor rename to extra/cfdg/gl/gl.factor diff --git a/unmaintained/cfdg/models/aqua-star/aqua-star.factor b/extra/cfdg/models/aqua-star/aqua-star.factor similarity index 100% rename from unmaintained/cfdg/models/aqua-star/aqua-star.factor rename to extra/cfdg/models/aqua-star/aqua-star.factor diff --git a/unmaintained/cfdg/models/aqua-star/authors.txt b/extra/cfdg/models/aqua-star/authors.txt similarity index 100% rename from unmaintained/cfdg/models/aqua-star/authors.txt rename to extra/cfdg/models/aqua-star/authors.txt diff --git a/unmaintained/cfdg/models/aqua-star/tags.txt b/extra/cfdg/models/aqua-star/tags.txt similarity index 100% rename from unmaintained/cfdg/models/aqua-star/tags.txt rename to extra/cfdg/models/aqua-star/tags.txt diff --git a/unmaintained/cfdg/models/chiaroscuro/authors.txt b/extra/cfdg/models/chiaroscuro/authors.txt similarity index 100% rename from unmaintained/cfdg/models/chiaroscuro/authors.txt rename to extra/cfdg/models/chiaroscuro/authors.txt diff --git a/unmaintained/cfdg/models/chiaroscuro/chiaroscuro.factor b/extra/cfdg/models/chiaroscuro/chiaroscuro.factor similarity index 100% rename from unmaintained/cfdg/models/chiaroscuro/chiaroscuro.factor rename to extra/cfdg/models/chiaroscuro/chiaroscuro.factor diff --git a/unmaintained/cfdg/models/chiaroscuro/tags.txt b/extra/cfdg/models/chiaroscuro/tags.txt similarity index 100% rename from unmaintained/cfdg/models/chiaroscuro/tags.txt rename to extra/cfdg/models/chiaroscuro/tags.txt diff --git a/unmaintained/cfdg/models/flower6/authors.txt b/extra/cfdg/models/flower6/authors.txt similarity index 100% rename from unmaintained/cfdg/models/flower6/authors.txt rename to extra/cfdg/models/flower6/authors.txt diff --git a/unmaintained/cfdg/models/flower6/deploy.factor b/extra/cfdg/models/flower6/deploy.factor similarity index 100% rename from unmaintained/cfdg/models/flower6/deploy.factor rename to extra/cfdg/models/flower6/deploy.factor diff --git a/unmaintained/cfdg/models/flower6/flower6.factor b/extra/cfdg/models/flower6/flower6.factor similarity index 100% rename from unmaintained/cfdg/models/flower6/flower6.factor rename to extra/cfdg/models/flower6/flower6.factor diff --git a/unmaintained/cfdg/models/flower6/tags.txt b/extra/cfdg/models/flower6/tags.txt similarity index 100% rename from unmaintained/cfdg/models/flower6/tags.txt rename to extra/cfdg/models/flower6/tags.txt diff --git a/unmaintained/cfdg/models/game1-turn6/authors.txt b/extra/cfdg/models/game1-turn6/authors.txt similarity index 100% rename from unmaintained/cfdg/models/game1-turn6/authors.txt rename to extra/cfdg/models/game1-turn6/authors.txt diff --git a/unmaintained/cfdg/models/game1-turn6/game1-turn6.factor b/extra/cfdg/models/game1-turn6/game1-turn6.factor similarity index 100% rename from unmaintained/cfdg/models/game1-turn6/game1-turn6.factor rename to extra/cfdg/models/game1-turn6/game1-turn6.factor diff --git a/unmaintained/cfdg/models/game1-turn6/tags.txt b/extra/cfdg/models/game1-turn6/tags.txt similarity index 100% rename from unmaintained/cfdg/models/game1-turn6/tags.txt rename to extra/cfdg/models/game1-turn6/tags.txt diff --git a/unmaintained/cfdg/models/lesson/authors.txt b/extra/cfdg/models/lesson/authors.txt similarity index 100% rename from unmaintained/cfdg/models/lesson/authors.txt rename to extra/cfdg/models/lesson/authors.txt diff --git a/unmaintained/cfdg/models/lesson/lesson.factor b/extra/cfdg/models/lesson/lesson.factor similarity index 100% rename from unmaintained/cfdg/models/lesson/lesson.factor rename to extra/cfdg/models/lesson/lesson.factor diff --git a/unmaintained/cfdg/models/lesson/tags.txt b/extra/cfdg/models/lesson/tags.txt similarity index 100% rename from unmaintained/cfdg/models/lesson/tags.txt rename to extra/cfdg/models/lesson/tags.txt diff --git a/unmaintained/cfdg/models/rules08/rules08.factor b/extra/cfdg/models/rules08/rules08.factor similarity index 100% rename from unmaintained/cfdg/models/rules08/rules08.factor rename to extra/cfdg/models/rules08/rules08.factor diff --git a/unmaintained/cfdg/models/rules08/tags.txt b/extra/cfdg/models/rules08/tags.txt similarity index 100% rename from unmaintained/cfdg/models/rules08/tags.txt rename to extra/cfdg/models/rules08/tags.txt diff --git a/unmaintained/cfdg/models/sierpinski/authors.txt b/extra/cfdg/models/sierpinski/authors.txt similarity index 100% rename from unmaintained/cfdg/models/sierpinski/authors.txt rename to extra/cfdg/models/sierpinski/authors.txt diff --git a/unmaintained/cfdg/models/sierpinski/sierpinski.factor b/extra/cfdg/models/sierpinski/sierpinski.factor similarity index 100% rename from unmaintained/cfdg/models/sierpinski/sierpinski.factor rename to extra/cfdg/models/sierpinski/sierpinski.factor diff --git a/unmaintained/cfdg/models/sierpinski/tags.txt b/extra/cfdg/models/sierpinski/tags.txt similarity index 100% rename from unmaintained/cfdg/models/sierpinski/tags.txt rename to extra/cfdg/models/sierpinski/tags.txt diff --git a/unmaintained/cfdg/models/snowflake/authors.txt b/extra/cfdg/models/snowflake/authors.txt similarity index 100% rename from unmaintained/cfdg/models/snowflake/authors.txt rename to extra/cfdg/models/snowflake/authors.txt diff --git a/unmaintained/cfdg/models/snowflake/snowflake.factor b/extra/cfdg/models/snowflake/snowflake.factor similarity index 100% rename from unmaintained/cfdg/models/snowflake/snowflake.factor rename to extra/cfdg/models/snowflake/snowflake.factor diff --git a/unmaintained/cfdg/models/snowflake/tags.txt b/extra/cfdg/models/snowflake/tags.txt similarity index 100% rename from unmaintained/cfdg/models/snowflake/tags.txt rename to extra/cfdg/models/snowflake/tags.txt diff --git a/unmaintained/cfdg/models/spirales/spirales.factor b/extra/cfdg/models/spirales/spirales.factor similarity index 100% rename from unmaintained/cfdg/models/spirales/spirales.factor rename to extra/cfdg/models/spirales/spirales.factor diff --git a/unmaintained/cfdg/models/spirales/tags.txt b/extra/cfdg/models/spirales/tags.txt similarity index 100% rename from unmaintained/cfdg/models/spirales/tags.txt rename to extra/cfdg/models/spirales/tags.txt diff --git a/unmaintained/cfdg/summary.txt b/extra/cfdg/summary.txt similarity index 100% rename from unmaintained/cfdg/summary.txt rename to extra/cfdg/summary.txt From 83965c8564a0d89e896242b18acb4b9744a23592 Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 3 Dec 2008 08:53:43 -0600 Subject: [PATCH 2/5] cfdg: Use 'specialized-arrays.double' --- extra/cfdg/cfdg.factor | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/extra/cfdg/cfdg.factor b/extra/cfdg/cfdg.factor index 58772e23e0..e1c89374fd 100644 --- a/extra/cfdg/cfdg.factor +++ b/extra/cfdg/cfdg.factor @@ -6,8 +6,10 @@ USING: kernel alien.c-types combinators namespaces make arrays vars colors self self.slots random-weighted colors.hsv cfdg.gl accessors ui.gadgets.handler ui.gestures assocs ui.gadgets macros - qualified speicalized-arrays.double ; + qualified specialized-arrays.double ; + QUALIFIED: syntax + IN: cfdg ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -53,7 +55,10 @@ VAR: color-stack ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -: double-nth* ( c-array indices -- seq ) swap [ double-nth ] curry map ; +! : double-nth* ( c-array indices -- seq ) swap [ double-nth ] curry map ; + +: double-nth* ( c-array indices -- seq ) + swap byte-array>double-array [ nth ] curry map ; : check-size ( modelview -- num ) { 0 1 4 5 } double-nth* [ abs ] map biggest ; From 3254b1c103b025d2da8e7fcbd726d7eba3b6737a Mon Sep 17 00:00:00 2001 From: Eduardo Cavazos Date: Wed, 3 Dec 2008 08:56:25 -0600 Subject: [PATCH 3/5] Move pong back to extra --- {unmaintained => extra}/pong/pong.factor | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {unmaintained => extra}/pong/pong.factor (100%) diff --git a/unmaintained/pong/pong.factor b/extra/pong/pong.factor similarity index 100% rename from unmaintained/pong/pong.factor rename to extra/pong/pong.factor From cb5dd5c2355ee939da6c3a8c8dcacbedada0b90e Mon Sep 17 00:00:00 2001 From: "U-SLAVA-DFB8FF805\\Slava" Date: Wed, 3 Dec 2008 08:58:20 -0600 Subject: [PATCH 4/5] Get io.mmap to load on Windows again --- basis/io/windows/nt/privileges/privileges.factor | 1 - 1 file changed, 1 deletion(-) mode change 100644 => 100755 basis/io/windows/nt/privileges/privileges.factor diff --git a/basis/io/windows/nt/privileges/privileges.factor b/basis/io/windows/nt/privileges/privileges.factor old mode 100644 new mode 100755 index 106cf06b77..264f337eaf --- a/basis/io/windows/nt/privileges/privileges.factor +++ b/basis/io/windows/nt/privileges/privileges.factor @@ -42,7 +42,6 @@ TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES [ lookup-privilege ] dip [ TOKEN_PRIVILEGES-Privileges - [ 0 ] dip LUID_AND_ATTRIBUTES-nth set-LUID_AND_ATTRIBUTES-Luid ] keep ; From cc34ead7541b3d567ee62380c324bbf0f4f37c8a Mon Sep 17 00:00:00 2001 From: "U-SLAVA-DFB8FF805\\Slava" Date: Wed, 3 Dec 2008 09:12:57 -0600 Subject: [PATCH 5/5] Update windows.com.wrapper for specialized-arrays changes --- basis/windows/com/wrapper/wrapper.factor | 33 +++++++++++++----------- 1 file changed, 18 insertions(+), 15 deletions(-) mode change 100644 => 100755 basis/windows/com/wrapper/wrapper.factor diff --git a/basis/windows/com/wrapper/wrapper.factor b/basis/windows/com/wrapper/wrapper.factor old mode 100644 new mode 100755 index 5cb830bc66..710feeec4d --- a/basis/windows/com/wrapper/wrapper.factor +++ b/basis/windows/com/wrapper/wrapper.factor @@ -1,8 +1,9 @@ -USING: alien alien.c-types windows.com.syntax init -windows.com.syntax.private windows.com continuations kernel +USING: alien alien.c-types alien.accessors windows.com.syntax +init windows.com.syntax.private windows.com continuations kernel namespaces windows.ole32 libc vocabs assocs accessors arrays sequences quotations combinators math words compiler.units -destructors fry math.parser generalizations sets ; +destructors fry math.parser generalizations sets +specialized-arrays.alien specialized-arrays.direct.alien ; IN: windows.com.wrapper TUPLE: com-wrapper callbacks vtbls disposed ; @@ -51,23 +52,26 @@ unless _ case [ "void*" heap-size * rot com-add-ref - 0 rot set-void*-nth S_OK - ] [ nip f 0 rot set-void*-nth E_NOINTERFACE ] if* + swap 0 set-alien-cell S_OK + ] [ nip f swap 0 set-alien-cell E_NOINTERFACE ] if* ] ; : (make-add-ref) ( interfaces -- quot ) length "void*" heap-size * '[ - _ swap - 0 over ulong-nth - 1+ [ 0 rot set-ulong-nth ] keep + _ + [ alien-unsigned-4 1+ dup ] + [ set-alien-unsigned-4 ] + 2bi ] ; : (make-release) ( interfaces -- quot ) length "void*" heap-size * '[ - _ over - 0 over ulong-nth - 1- [ 0 rot set-ulong-nth ] keep - dup zero? [ swap (free-wrapped-object) ] [ nip ] if + _ + [ drop ] + [ alien-unsigned-4 1- dup ] + [ set-alien-unsigned-4 ] + 2tri + dup 0 = [ swap (free-wrapped-object) ] [ nip ] if ] ; : (make-iunknown-methods) ( interfaces -- quots ) @@ -125,8 +129,7 @@ unless : (malloc-wrapped-object) ( wrapper -- wrapped-object ) vtbls>> length "void*" heap-size * [ "ulong" heap-size + malloc ] keep - over - 1 0 rot set-ulong-nth ; + [ [ 1 ] 2dip set-alien-unsigned-4 ] [ drop ] 2bi ; : (callbacks>vtbl) ( callbacks -- vtbl ) [ execute ] void*-array{ } map-as underlying>> malloc-byte-array ; @@ -159,5 +162,5 @@ M: com-wrapper dispose* : com-wrap ( object wrapper -- wrapped-object ) [ vtbls>> ] [ (malloc-wrapped-object) ] bi - [ [ set-void*-nth ] curry each-index ] keep + [ over length 0 swap copy ] keep [ +wrapped-objects+ get-global set-at ] keep ;