From 0a4d926212bc74598327198c27752bd115d1ae16 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 6 Aug 2009 16:16:17 -0400 Subject: [PATCH 01/38] simplify dip/call/curry/compose in callable objects before prettyprinting --- basis/prettyprint/backend/backend.factor | 8 +-- .../prettyprint/backend/callables/authors.txt | 1 + .../backend/callables/callables-tests.factor | 15 ++++ .../backend/callables/callables.factor | 72 +++++++++++++++++++ .../prettyprint/backend/callables/summary.txt | 1 + 5 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 basis/prettyprint/backend/callables/authors.txt create mode 100644 basis/prettyprint/backend/callables/callables-tests.factor create mode 100644 basis/prettyprint/backend/callables/callables.factor create mode 100644 basis/prettyprint/backend/callables/summary.txt diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index 27416e0f89..a3e5ba810f 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -3,8 +3,9 @@ USING: accessors arrays byte-arrays byte-vectors generic hashtables assocs kernel math namespaces make sequences strings sbufs vectors words prettyprint.config prettyprint.custom prettyprint.sections -quotations io io.pathnames io.styles math.parser effects classes.tuple -math.order classes.tuple.private classes combinators colors ; +prettyprint.backend.callables quotations io io.pathnames io.styles +math.parser effects classes.tuple math.order classes.tuple.private +classes combinators colors ; IN: prettyprint.backend M: effect pprint* effect>string "(" ")" surround text ; @@ -177,8 +178,7 @@ M: callstack pprint-delims drop \ CS{ \ } ; M: object >pprint-sequence ; M: vector >pprint-sequence ; M: byte-vector >pprint-sequence ; -M: curry >pprint-sequence ; -M: compose >pprint-sequence ; +M: callable >pprint-sequence simplify-callable ; M: hashtable >pprint-sequence >alist ; M: wrapper >pprint-sequence wrapped>> 1array ; M: callstack >pprint-sequence callstack>array ; diff --git a/basis/prettyprint/backend/callables/authors.txt b/basis/prettyprint/backend/callables/authors.txt new file mode 100644 index 0000000000..f13c9c1e77 --- /dev/null +++ b/basis/prettyprint/backend/callables/authors.txt @@ -0,0 +1 @@ +Joe Groff diff --git a/basis/prettyprint/backend/callables/callables-tests.factor b/basis/prettyprint/backend/callables/callables-tests.factor new file mode 100644 index 0000000000..de5b8a073a --- /dev/null +++ b/basis/prettyprint/backend/callables/callables-tests.factor @@ -0,0 +1,15 @@ +! (c) 2009 Joe Groff bsd license +USING: kernel math prettyprint prettyprint.backend.callables +tools.test ; +IN: prettyprint.backend.callables + +[ [ dip ] ] [ [ dip ] simplify-callable ] unit-test +[ [ [ + ] dip ] ] [ [ [ + ] dip ] simplify-callable ] unit-test +[ [ + 5 ] ] [ [ 5 [ + ] dip ] simplify-callable ] unit-test +[ [ + ] ] [ [ [ + ] call ] simplify-callable ] unit-test +[ [ call ] ] [ [ call ] simplify-callable ] unit-test +[ [ 5 + ] ] [ [ 5 [ + ] curry call ] simplify-callable ] unit-test +[ [ 4 5 + ] ] [ [ 4 5 [ + ] 2curry call ] simplify-callable ] unit-test +[ [ 4 5 6 + ] ] [ [ 4 5 6 [ + ] 3curry call ] simplify-callable ] unit-test +[ [ + . ] ] [ [ [ + ] [ . ] compose call ] simplify-callable ] unit-test +[ [ . + ] ] [ [ [ + ] [ . ] prepose call ] simplify-callable ] unit-test diff --git a/basis/prettyprint/backend/callables/callables.factor b/basis/prettyprint/backend/callables/callables.factor new file mode 100644 index 0000000000..19350b6b51 --- /dev/null +++ b/basis/prettyprint/backend/callables/callables.factor @@ -0,0 +1,72 @@ +! (c) 2009 Joe Groff bsd license +USING: combinators combinators.short-circuit generalizations +kernel macros math math.ranges quotations sequences words ; +IN: prettyprint.backend.callables + += [ ] 3sequence ] 2bi + prefix \ 2&& [ ] 2sequence ; + +: end-len>from-to ( seq end len -- from to seq ) + [ - ] [ drop 1 + ] 2bi rot ; + +: slice-change ( seq end len quot -- seq' ) + [ end-len>from-to ] dip + [ [ subseq ] dip call ] curry + [ replace-slice ] 3bi ; inline + +: when-slice-match ( seq i criteria quot -- seq' ) + [ [ 2dup ] dip slice-match? ] dip [ drop ] if ; inline + +: simplify-dip ( quot i -- quot' ) + { [ literal? ] [ callable? ] } + [ 2 [ first2 swap suffix ] slice-change ] when-slice-match ; + +: simplify-call ( quot i -- quot' ) + { [ callable? ] } + [ 1 [ first ] slice-change ] when-slice-match ; + +: simplify-curry ( quot i -- quot' ) + { [ literal? ] [ callable? ] } + [ 2 [ first2 swap prefix 1quotation ] slice-change ] when-slice-match ; + +: simplify-2curry ( quot i -- quot' ) + { [ literal? ] [ literal? ] [ callable? ] } + [ 3 [ [ 2 head ] [ third ] bi append 1quotation ] slice-change ] when-slice-match ; + +: simplify-3curry ( quot i -- quot' ) + { [ literal? ] [ literal? ] [ literal? ] [ callable? ] } + [ 4 [ [ 3 head ] [ fourth ] bi append 1quotation ] slice-change ] when-slice-match ; + +: simplify-compose ( quot i -- quot' ) + { [ callable? ] [ callable? ] } + [ 2 [ first2 append 1quotation ] slice-change ] when-slice-match ; + +: simplify-prepose ( quot i -- quot' ) + { [ callable? ] [ callable? ] } + [ 2 [ first2 swap append 1quotation ] slice-change ] when-slice-match ; + +: (simplify-callable) ( quot -- quot' ) + dup [ simple-combinators member? ] find { + { \ dip [ simplify-dip ] } + { \ call [ simplify-call ] } + { \ curry [ simplify-curry ] } + { \ 2curry [ simplify-2curry ] } + { \ 3curry [ simplify-3curry ] } + { \ compose [ simplify-compose ] } + { \ prepose [ simplify-prepose ] } + [ 2drop ] + } case ; + +PRIVATE> + +: simplify-callable ( quot -- quot' ) + [ (simplify-callable) ] to-fixed-point ; diff --git a/basis/prettyprint/backend/callables/summary.txt b/basis/prettyprint/backend/callables/summary.txt new file mode 100644 index 0000000000..870a5fa64d --- /dev/null +++ b/basis/prettyprint/backend/callables/summary.txt @@ -0,0 +1 @@ +Quotation simplification for prettyprinting automatically-constructed callable objects From 556904cf57f874ec16a88ac37edbea89751b106f Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 6 Aug 2009 16:21:53 -0400 Subject: [PATCH 02/38] simplify-callable docs --- basis/prettyprint/backend/callables/callables-docs.factor | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 basis/prettyprint/backend/callables/callables-docs.factor diff --git a/basis/prettyprint/backend/callables/callables-docs.factor b/basis/prettyprint/backend/callables/callables-docs.factor new file mode 100644 index 0000000000..968fdbcb3d --- /dev/null +++ b/basis/prettyprint/backend/callables/callables-docs.factor @@ -0,0 +1,6 @@ +USING: help help.markup help.syntax ; +IN: prettyprint.backend.callables + +HELP: simplify-callable +{ $values { "quot" callable } { "quot'" callable } } +{ $description "Converts " { $snippet "quot" } " into an equivalent quotation by simplifying usages of " { $link dip } ", " { $link call } ", " { $link curry } ", and " { $link compose } " with literal parameters. This word is used when callable objects are prettyprinted." } ; From fcfe16d8d0b0b04957349b7e96711add3a530124 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Fri, 7 Aug 2009 16:19:46 -0400 Subject: [PATCH 03/38] make simplify-callable prettyprinting an optional load in extra --- basis/prettyprint/backend/backend.factor | 7 +++---- .../backend => extra/prettyprint}/callables/authors.txt | 0 .../prettyprint}/callables/callables-docs.factor | 4 ++-- .../prettyprint}/callables/callables-tests.factor | 4 ++-- .../prettyprint}/callables/callables.factor | 7 +++++-- .../backend => extra/prettyprint}/callables/summary.txt | 0 6 files changed, 12 insertions(+), 10 deletions(-) rename {basis/prettyprint/backend => extra/prettyprint}/callables/authors.txt (100%) rename {basis/prettyprint/backend => extra/prettyprint}/callables/callables-docs.factor (81%) rename {basis/prettyprint/backend => extra/prettyprint}/callables/callables-tests.factor (87%) rename {basis/prettyprint/backend => extra/prettyprint}/callables/callables.factor (93%) rename {basis/prettyprint/backend => extra/prettyprint}/callables/summary.txt (100%) diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index a3e5ba810f..103a5a72ec 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -3,9 +3,8 @@ USING: accessors arrays byte-arrays byte-vectors generic hashtables assocs kernel math namespaces make sequences strings sbufs vectors words prettyprint.config prettyprint.custom prettyprint.sections -prettyprint.backend.callables quotations io io.pathnames io.styles -math.parser effects classes.tuple math.order classes.tuple.private -classes combinators colors ; +quotations io io.pathnames io.styles math.parser effects classes.tuple +math.order classes.tuple.private classes combinators colors ; IN: prettyprint.backend M: effect pprint* effect>string "(" ")" surround text ; @@ -178,7 +177,7 @@ M: callstack pprint-delims drop \ CS{ \ } ; M: object >pprint-sequence ; M: vector >pprint-sequence ; M: byte-vector >pprint-sequence ; -M: callable >pprint-sequence simplify-callable ; +M: callable >pprint-sequence ; M: hashtable >pprint-sequence >alist ; M: wrapper >pprint-sequence wrapped>> 1array ; M: callstack >pprint-sequence callstack>array ; diff --git a/basis/prettyprint/backend/callables/authors.txt b/extra/prettyprint/callables/authors.txt similarity index 100% rename from basis/prettyprint/backend/callables/authors.txt rename to extra/prettyprint/callables/authors.txt diff --git a/basis/prettyprint/backend/callables/callables-docs.factor b/extra/prettyprint/callables/callables-docs.factor similarity index 81% rename from basis/prettyprint/backend/callables/callables-docs.factor rename to extra/prettyprint/callables/callables-docs.factor index 968fdbcb3d..9865f0eaee 100644 --- a/basis/prettyprint/backend/callables/callables-docs.factor +++ b/extra/prettyprint/callables/callables-docs.factor @@ -1,5 +1,5 @@ -USING: help help.markup help.syntax ; -IN: prettyprint.backend.callables +USING: help help.markup help.syntax kernel quotations ; +IN: prettyprint.callables HELP: simplify-callable { $values { "quot" callable } { "quot'" callable } } diff --git a/basis/prettyprint/backend/callables/callables-tests.factor b/extra/prettyprint/callables/callables-tests.factor similarity index 87% rename from basis/prettyprint/backend/callables/callables-tests.factor rename to extra/prettyprint/callables/callables-tests.factor index de5b8a073a..9d9abb3305 100644 --- a/basis/prettyprint/backend/callables/callables-tests.factor +++ b/extra/prettyprint/callables/callables-tests.factor @@ -1,7 +1,7 @@ ! (c) 2009 Joe Groff bsd license -USING: kernel math prettyprint prettyprint.backend.callables +USING: kernel math prettyprint prettyprint.callables tools.test ; -IN: prettyprint.backend.callables +IN: prettyprint.callables.tests [ [ dip ] ] [ [ dip ] simplify-callable ] unit-test [ [ [ + ] dip ] ] [ [ [ + ] dip ] simplify-callable ] unit-test diff --git a/basis/prettyprint/backend/callables/callables.factor b/extra/prettyprint/callables/callables.factor similarity index 93% rename from basis/prettyprint/backend/callables/callables.factor rename to extra/prettyprint/callables/callables.factor index 19350b6b51..195a6ce48b 100644 --- a/basis/prettyprint/backend/callables/callables.factor +++ b/extra/prettyprint/callables/callables.factor @@ -1,7 +1,8 @@ ! (c) 2009 Joe Groff bsd license USING: combinators combinators.short-circuit generalizations -kernel macros math math.ranges quotations sequences words ; -IN: prettyprint.backend.callables +kernel macros math math.ranges prettyprint.custom quotations +sequences words ; +IN: prettyprint.callables : simplify-callable ( quot -- quot' ) [ (simplify-callable) ] to-fixed-point ; + +M: callable >pprint-sequence simplify-callable ; diff --git a/basis/prettyprint/backend/callables/summary.txt b/extra/prettyprint/callables/summary.txt similarity index 100% rename from basis/prettyprint/backend/callables/summary.txt rename to extra/prettyprint/callables/summary.txt From e0624f37b319ea7276a6799833a7993a57119106 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 9 Aug 2009 12:52:38 -0400 Subject: [PATCH 04/38] pools vocab --- extra/pools/authors.txt | 1 + extra/pools/pools-tests.factor | 26 ++++++++++++++ extra/pools/pools.factor | 66 ++++++++++++++++++++++++++++++++++ extra/pools/summary.txt | 1 + 4 files changed, 94 insertions(+) create mode 100644 extra/pools/authors.txt create mode 100644 extra/pools/pools-tests.factor create mode 100644 extra/pools/pools.factor create mode 100644 extra/pools/summary.txt diff --git a/extra/pools/authors.txt b/extra/pools/authors.txt new file mode 100644 index 0000000000..f13c9c1e77 --- /dev/null +++ b/extra/pools/authors.txt @@ -0,0 +1 @@ +Joe Groff diff --git a/extra/pools/pools-tests.factor b/extra/pools/pools-tests.factor new file mode 100644 index 0000000000..8ba6b2b0f0 --- /dev/null +++ b/extra/pools/pools-tests.factor @@ -0,0 +1,26 @@ +! (c)2009 Joe Groff bsd license +USING: kernel pools tools.test ; +IN: pools.tests + +TUPLE: foo x ; +POOL: foo 2 + +[ 1 ] [ + foo class-pool pool-empty + foo new-from-pool drop + foo class-pool pool-free-size +] unit-test + +[ T{ foo } T{ foo } f ] [ + foo class-pool pool-empty + foo new-from-pool + foo new-from-pool + foo new-from-pool +] unit-test + +[ f ] [ + foo class-pool pool-empty + foo new-from-pool + foo new-from-pool + eq? +] unit-test diff --git a/extra/pools/pools.factor b/extra/pools/pools.factor new file mode 100644 index 0000000000..268555e307 --- /dev/null +++ b/extra/pools/pools.factor @@ -0,0 +1,66 @@ +! (c)2009 Joe Groff bsd license +USING: accessors arrays bit-arrays classes +classes.tuple.private fry kernel locals parser +sequences sequences.private words ; +IN: pools + +TUPLE: pool + prototype + { objects array } + { free bit-array } ; + +: ( size class -- pool ) + [ nip new ] + [ [ iota ] dip '[ _ new ] replicate ] + [ drop ] 2tri + pool boa ; + +: pool-size ( pool -- size ) + objects>> length ; + +: pool-free-size ( pool -- free-size ) + free>> [ f = ] filter length ; + + size + size [| n | n from array-nth n to set-array-nth ] each + to ; inline + +: (pool-new) ( pool -- object ) + [ free>> [ f = ] find drop ] [ + over [ + [ objects>> nth ] [ [ t ] 2dip free>> set-nth ] 2bi + ] [ drop ] if + ] bi ; + +: (pool-init) ( pool object -- object ) + [ prototype>> ] dip copy-tuple ; inline + +PRIVATE> + +: pool-new ( pool -- object ) + dup (pool-new) [ (pool-init) ] [ drop f ] if* ; inline + +: pool-free ( object pool -- ) + [ objects>> [ eq? ] with find drop ] + [ [ f ] 2dip free>> set-nth ] bi ; + +: pool-empty ( pool -- ) + free>> [ length iota ] keep [ [ f ] 2dip set-nth ] curry each ; + +: class-pool ( class -- pool ) + "pool" word-prop ; + +: set-class-pool ( class pool -- ) + "pool" set-word-prop ; + +: new-from-pool ( class -- object ) + class-pool pool-new ; + +: free-to-pool ( object -- ) + dup class class-pool pool-free ; + +SYNTAX: POOL: + scan-word scan-word '[ _ swap ] [ swap set-class-pool ] bi ; diff --git a/extra/pools/summary.txt b/extra/pools/summary.txt new file mode 100644 index 0000000000..e9e83c307c --- /dev/null +++ b/extra/pools/summary.txt @@ -0,0 +1 @@ +Preallocated pools of tuple objects From 7243d097cb102e386ac3037273f8a8542e4231ce Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Sun, 9 Aug 2009 15:22:09 -0400 Subject: [PATCH 05/38] pools docs, better implementation --- extra/pools/pools-docs.factor | 76 ++++++++++++++++++++++++++++++++++ extra/pools/pools-tests.factor | 12 +++--- extra/pools/pools.factor | 24 +++-------- 3 files changed, 89 insertions(+), 23 deletions(-) create mode 100644 extra/pools/pools-docs.factor diff --git a/extra/pools/pools-docs.factor b/extra/pools/pools-docs.factor new file mode 100644 index 0000000000..58f9d9ea1b --- /dev/null +++ b/extra/pools/pools-docs.factor @@ -0,0 +1,76 @@ +! (c)2009 Joe Groff bsd license +USING: classes help.markup help.syntax kernel math ; +IN: pools + +HELP: +{ $values + { "size" integer } { "class" class } + { "pool" pool } +} +{ $description "Creates a " { $link pool } " of " { $snippet "size" } " objects of " { $snippet "class" } "." } ; + +HELP: POOL: +{ $syntax "POOL: class size" } +{ $description "Creates a " { $link pool } " of " { $snippet "size" } " objects of " { $snippet "class" } ", and associates it with the class using " { $link set-class-pool } "." } ; + +HELP: class-pool +{ $values + { "class" class } + { "pool" pool } +} +{ $description "Returns the " { $link pool } " associated with " { $snippet "class" } ", or " { $link f } " if no pool is associated." } ; + +HELP: free-to-pool +{ $values + { "object" object } +} +{ $description "Frees an object from the " { $link pool } " it was allocated from. The object must have been allocated by " { $link new-from-pool } "." } ; + +HELP: new-from-pool +{ $values + { "class" class } + { "object" object } +} +{ $description "Allocates an object from the " { $link pool } " associated with " { $snippet "class" } ". If the pool is exhausted, " { $link f } " is returned." } ; + +{ POSTPONE: POOL: class-pool set-class-pool new-from-pool free-to-pool } related-words + +HELP: pool +{ $class-description "A " { $snippet "pool" } " contains a fixed-size set of preallocated tuple objects. Once the pool has been allocated, its objects can be allocated with " { $link pool-new } " and freed with " { $link pool-free } " in constant time. A pool can also be associated with its class with the " { $link POSTPONE: POOL: } " syntax or the " { $link set-class-pool } " word, after which the words " { $link new-from-pool } " and " { $link free-to-pool } " can be used with the class name to allocate and free objects." } ; + +HELP: pool-free +{ $values + { "object" object } { "pool" pool } +} +{ $description "Frees an object back into " { $link pool } "." } ; + +HELP: pool-size +{ $values + { "pool" pool } + { "size" integer } +} +{ $description "Returns the number of unallocated objects inside a " { $link pool } "." } ; + +HELP: pool-new +{ $values + { "pool" pool } + { "object" object } +} +{ $description "Returns an unallocated object out of a " { $link pool } ". If the pool is exhausted, " { $link f } " is returned." } ; + +{ pool pool-new pool-free pool-size } related-words + +HELP: set-class-pool +{ $values + { "class" class } { "pool" pool } +} +{ $description "Associates a " { $link pool } " with " { $snippet "class" } "." } ; + +ARTICLE: "pools" "Pools" +"The " { $vocab-link "pools" } " vocabulary provides " { $link pool } " objects which manage preallocated collections of objects." +{ $subsection pool } +{ $subsection POSTPONE: POOL: } +{ $subsection new-from-pool } +{ $subsection free-to-pool } ; + +ABOUT: "pools" diff --git a/extra/pools/pools-tests.factor b/extra/pools/pools-tests.factor index 8ba6b2b0f0..eb5282519e 100644 --- a/extra/pools/pools-tests.factor +++ b/extra/pools/pools-tests.factor @@ -3,23 +3,25 @@ USING: kernel pools tools.test ; IN: pools.tests TUPLE: foo x ; -POOL: foo 2 [ 1 ] [ - foo class-pool pool-empty + foo 2 foo set-class-pool + foo new-from-pool drop - foo class-pool pool-free-size + foo class-pool pool-size ] unit-test [ T{ foo } T{ foo } f ] [ - foo class-pool pool-empty + foo 2 foo set-class-pool + foo new-from-pool foo new-from-pool foo new-from-pool ] unit-test [ f ] [ - foo class-pool pool-empty + foo 2 foo set-class-pool + foo new-from-pool foo new-from-pool eq? diff --git a/extra/pools/pools.factor b/extra/pools/pools.factor index 268555e307..859aa64cd0 100644 --- a/extra/pools/pools.factor +++ b/extra/pools/pools.factor @@ -1,26 +1,21 @@ ! (c)2009 Joe Groff bsd license USING: accessors arrays bit-arrays classes classes.tuple.private fry kernel locals parser -sequences sequences.private words ; +sequences sequences.private vectors words ; IN: pools TUPLE: pool prototype - { objects array } - { free bit-array } ; + { objects vector } ; : ( size class -- pool ) [ nip new ] - [ [ iota ] dip '[ _ new ] replicate ] - [ drop ] 2tri + [ [ iota ] dip '[ _ new ] V{ } replicate-as ] 2bi pool boa ; : pool-size ( pool -- size ) objects>> length ; -: pool-free-size ( pool -- free-size ) - free>> [ f = ] filter length ; - > [ f = ] find drop ] [ - over [ - [ objects>> nth ] [ [ t ] 2dip free>> set-nth ] 2bi - ] [ drop ] if - ] bi ; + objects>> [ f ] [ pop ] if-empty ; : (pool-init) ( pool object -- object ) [ prototype>> ] dip copy-tuple ; inline @@ -44,11 +35,7 @@ PRIVATE> dup (pool-new) [ (pool-init) ] [ drop f ] if* ; inline : pool-free ( object pool -- ) - [ objects>> [ eq? ] with find drop ] - [ [ f ] 2dip free>> set-nth ] bi ; - -: pool-empty ( pool -- ) - free>> [ length iota ] keep [ [ f ] 2dip set-nth ] curry each ; + objects>> push ; : class-pool ( class -- pool ) "pool" word-prop ; @@ -64,3 +51,4 @@ PRIVATE> SYNTAX: POOL: scan-word scan-word '[ _ swap ] [ swap set-class-pool ] bi ; + From a54f89356573c2ffa204db153c263408fdd3815f Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 10 Aug 2009 16:18:43 -0400 Subject: [PATCH 06/38] Move pools -> memory.pools --- extra/{ => memory}/pools/authors.txt | 0 extra/{ => memory}/pools/pools-docs.factor | 8 ++++---- extra/{ => memory}/pools/pools-tests.factor | 4 ++-- extra/{ => memory}/pools/pools.factor | 2 +- extra/{ => memory}/pools/summary.txt | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename extra/{ => memory}/pools/authors.txt (100%) rename extra/{ => memory}/pools/pools-docs.factor (92%) rename extra/{ => memory}/pools/pools-tests.factor (86%) rename extra/{ => memory}/pools/pools.factor (98%) rename extra/{ => memory}/pools/summary.txt (100%) diff --git a/extra/pools/authors.txt b/extra/memory/pools/authors.txt similarity index 100% rename from extra/pools/authors.txt rename to extra/memory/pools/authors.txt diff --git a/extra/pools/pools-docs.factor b/extra/memory/pools/pools-docs.factor similarity index 92% rename from extra/pools/pools-docs.factor rename to extra/memory/pools/pools-docs.factor index 58f9d9ea1b..a2cc5d7dad 100644 --- a/extra/pools/pools-docs.factor +++ b/extra/memory/pools/pools-docs.factor @@ -1,6 +1,6 @@ ! (c)2009 Joe Groff bsd license USING: classes help.markup help.syntax kernel math ; -IN: pools +IN: memory.pools HELP: { $values @@ -66,11 +66,11 @@ HELP: set-class-pool } { $description "Associates a " { $link pool } " with " { $snippet "class" } "." } ; -ARTICLE: "pools" "Pools" -"The " { $vocab-link "pools" } " vocabulary provides " { $link pool } " objects which manage preallocated collections of objects." +ARTICLE: "memory.pools" "Pools" +"The " { $vocab-link "memory.pools" } " vocabulary provides " { $link pool } " objects which manage preallocated collections of objects." { $subsection pool } { $subsection POSTPONE: POOL: } { $subsection new-from-pool } { $subsection free-to-pool } ; -ABOUT: "pools" +ABOUT: "memory.pools" diff --git a/extra/pools/pools-tests.factor b/extra/memory/pools/pools-tests.factor similarity index 86% rename from extra/pools/pools-tests.factor rename to extra/memory/pools/pools-tests.factor index eb5282519e..29f99a5a11 100644 --- a/extra/pools/pools-tests.factor +++ b/extra/memory/pools/pools-tests.factor @@ -1,6 +1,6 @@ ! (c)2009 Joe Groff bsd license -USING: kernel pools tools.test ; -IN: pools.tests +USING: kernel memory.pools tools.test ; +IN: memory.pools.tests TUPLE: foo x ; diff --git a/extra/pools/pools.factor b/extra/memory/pools/pools.factor similarity index 98% rename from extra/pools/pools.factor rename to extra/memory/pools/pools.factor index 859aa64cd0..33d1fbedcb 100644 --- a/extra/pools/pools.factor +++ b/extra/memory/pools/pools.factor @@ -2,7 +2,7 @@ USING: accessors arrays bit-arrays classes classes.tuple.private fry kernel locals parser sequences sequences.private vectors words ; -IN: pools +IN: memory.pools TUPLE: pool prototype diff --git a/extra/pools/summary.txt b/extra/memory/pools/summary.txt similarity index 100% rename from extra/pools/summary.txt rename to extra/memory/pools/summary.txt From ce2722ff6d2503c2a207cbf8b9407d0fd3750143 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 10 Aug 2009 16:27:56 -0400 Subject: [PATCH 07/38] piles vocab (pools of raw memory) --- extra/memory/piles/authors.txt | 1 + extra/memory/piles/piles-docs.factor | 48 +++++++++++++++++++++++++++ extra/memory/piles/piles-tests.factor | 46 +++++++++++++++++++++++++ extra/memory/piles/piles.factor | 33 ++++++++++++++++++ extra/memory/piles/summary.txt | 1 + 5 files changed, 129 insertions(+) create mode 100644 extra/memory/piles/authors.txt create mode 100644 extra/memory/piles/piles-docs.factor create mode 100644 extra/memory/piles/piles-tests.factor create mode 100644 extra/memory/piles/piles.factor create mode 100644 extra/memory/piles/summary.txt diff --git a/extra/memory/piles/authors.txt b/extra/memory/piles/authors.txt new file mode 100644 index 0000000000..f13c9c1e77 --- /dev/null +++ b/extra/memory/piles/authors.txt @@ -0,0 +1 @@ +Joe Groff diff --git a/extra/memory/piles/piles-docs.factor b/extra/memory/piles/piles-docs.factor new file mode 100644 index 0000000000..7779d39a37 --- /dev/null +++ b/extra/memory/piles/piles-docs.factor @@ -0,0 +1,48 @@ +! (c)2009 Joe Groff bsd license +USING: alien destructors help.markup help.syntax kernel math ; +IN: memory.piles + +HELP: +{ $values + { "size" integer } + { "pile" pile } +} +{ $description "Allocates " { $snippet "size" } " bytes of raw memory for a new " { $link pile } ". The pile should be " { $link dispose } "d when it is no longer needed." } ; + +HELP: not-enough-pile-space +{ $values + { "pile" pile } +} +{ $description "This error is thrown by " { $link pile-alloc } " when the " { $link pile } " does not have enough remaining space for the requested allocation." } ; + +HELP: pile +{ $class-description "A " { $snippet "pile" } " is a block of raw memory that can be apportioned out in constant time. A pile is allocated using the " { $link } " word. Blocks of memory can be requested from the pile using " { $link pile-alloc } ", and all the pile's memory can be reclaimed with " { $link pile-empty } "." } ; + +HELP: pile-align +{ $values + { "pile" pile } { "align" "a power of two" } + { "pile" pile } +} +{ $description "Adjusts a " { $link pile } "'s internal state so that the next call to " { $link pile-alloc } " will return a pointer aligned to " { $snippet "align" } " bytes relative to the pile's initial offset." } ; + +HELP: pile-alloc +{ $values + { "pile" pile } { "size" integer } + { "alien" alien } +} +{ $description "Requests " { $snippet "size" } " bytes from a " { $link pile } ". If the pile does not have enough space to satisfy the request, a " { $link not-enough-pile-space } " error is thrown." } ; + +HELP: pile-empty +{ $values + { "pile" pile } +} +{ $description "Reclaims all the memory allocated out of a " { $link pile } ". Allocations will resume from the beginning of the pile." } ; + +ARTICLE: "memory.piles" "Piles" +"A " { $link pile } " is a block of raw memory. Portions of its memory can be allocated from the beginning of the pile in constant time, and the pile can be emptied and its pointer reset to the beginning." +{ $subsection } +{ $subsection pile-alloc } +{ $subsection pile-align } +{ $subsection pile-empty } ; + +ABOUT: "memory.piles" diff --git a/extra/memory/piles/piles-tests.factor b/extra/memory/piles/piles-tests.factor new file mode 100644 index 0000000000..11b6399ed4 --- /dev/null +++ b/extra/memory/piles/piles-tests.factor @@ -0,0 +1,46 @@ +USING: accessors alien destructors kernel math +memory.piles tools.test ; +IN: memory.piles.tests + +[ 25 ] [ + [ + 100 &dispose + [ 25 pile-alloc ] [ 50 pile-alloc ] bi + swap [ alien-address ] bi@ - + ] with-destructors +] unit-test + +[ 32 ] [ + [ + 100 &dispose + [ 25 pile-alloc ] [ 8 pile-align 50 pile-alloc ] bi + swap [ alien-address ] bi@ - + ] with-destructors +] unit-test + +[ 75 ] [ + [ + 100 &dispose + dup 25 pile-alloc drop + dup 50 pile-alloc drop + offset>> + ] with-destructors +] unit-test + +[ 100 ] [ + [ + 100 &dispose + dup 25 pile-alloc drop + dup 75 pile-alloc drop + offset>> + ] with-destructors +] unit-test + +[ + [ + 100 &dispose + dup 25 pile-alloc drop + dup 76 pile-alloc drop + ] with-destructors +] [ not-enough-pile-space? ] must-fail-with + diff --git a/extra/memory/piles/piles.factor b/extra/memory/piles/piles.factor new file mode 100644 index 0000000000..b8a79b4824 --- /dev/null +++ b/extra/memory/piles/piles.factor @@ -0,0 +1,33 @@ +! (c)2009 Joe Groff bsd license +USING: accessors alien destructors kernel libc math ; +IN: memory.piles + +TUPLE: pile + { underlying c-ptr } + { size integer } + { offset integer } ; + +ERROR: not-enough-pile-space pile ; + +M: pile dispose + [ [ free ] when* f ] change-underlying drop ; + +: ( size -- pile ) + [ malloc ] keep 0 pile boa ; + +: pile-empty ( pile -- ) + 0 >>offset drop ; + +: pile-alloc ( pile size -- alien ) + [ + [ [ ] [ size>> ] [ offset>> ] tri ] dip + + < [ not-enough-pile-space ] [ drop ] if + ] [ + drop [ offset>> ] [ underlying>> ] bi + ] [ + [ + ] curry change-offset drop + ] 2tri ; + +: pile-align ( pile align -- pile ) + [ align ] curry change-offset ; + diff --git a/extra/memory/piles/summary.txt b/extra/memory/piles/summary.txt new file mode 100644 index 0000000000..f217f30294 --- /dev/null +++ b/extra/memory/piles/summary.txt @@ -0,0 +1 @@ +Preallocated raw memory blocks From 06a5c78a3465d52a660276f724658672ab752923 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 10 Aug 2009 16:31:54 -0400 Subject: [PATCH 08/38] piles lore --- extra/memory/piles/piles-docs.factor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/memory/piles/piles-docs.factor b/extra/memory/piles/piles-docs.factor index 7779d39a37..c2bc29af1c 100644 --- a/extra/memory/piles/piles-docs.factor +++ b/extra/memory/piles/piles-docs.factor @@ -43,6 +43,7 @@ ARTICLE: "memory.piles" "Piles" { $subsection } { $subsection pile-alloc } { $subsection pile-align } -{ $subsection pile-empty } ; +{ $subsection pile-empty } +"An example of the utility of piles is in video games. For example, the game Abuse was scripted with a Lisp dialect. In order to avoid stalls from traditional GC or heap-based allocators, the Abuse Lisp VM would allocate values from a preallocated pile over the course of a frame, and release the entire pile at the end of the frame." ; ABOUT: "memory.piles" From 0376cf0f9d5ec32ddfab59c4cab2059b33d05aa7 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 10 Aug 2009 19:33:27 -0400 Subject: [PATCH 09/38] allow commas in numeric literals --- core/math/parser/parser-tests.factor | 8 ++++++++ core/math/parser/parser.factor | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/core/math/parser/parser-tests.factor b/core/math/parser/parser-tests.factor index c655965e35..2b440b24d4 100644 --- a/core/math/parser/parser-tests.factor +++ b/core/math/parser/parser-tests.factor @@ -25,6 +25,14 @@ unit-test [ "e" string>number ] unit-test +[ 100000 ] +[ "100,000" string>number ] +unit-test + +[ 100000.0 ] +[ "100,000.0" string>number ] +unit-test + [ "100.0" ] [ "1.0e2" string>number number>string ] unit-test diff --git a/core/math/parser/parser.factor b/core/math/parser/parser.factor index 437308d53f..cc01699bd4 100644 --- a/core/math/parser/parser.factor +++ b/core/math/parser/parser.factor @@ -28,13 +28,16 @@ IN: math.parser { CHAR: d 13 } { CHAR: e 14 } { CHAR: f 15 } - } at 255 or ; inline + { CHAR: , f } + } at* [ drop 255 ] unless ; inline : string>digits ( str -- digits ) [ digit> ] B{ } map-as ; inline : (digits>integer) ( valid? accum digit radix -- valid? accum ) - 2dup < [ swapd * + ] [ 2drop 2drop f 0 ] if ; inline + over [ + 2dup < [ swapd * + ] [ 2drop 2drop f 0 ] if + ] [ 2drop ] if ; inline : each-digit ( seq radix quot -- n/f ) [ t 0 ] 3dip curry each swap [ drop f ] unless ; inline @@ -80,6 +83,7 @@ SYMBOL: negative? ] if ; inline : string>float ( str -- n/f ) + [ CHAR: , eq? not ] filter >byte-array 0 suffix (string>float) ; PRIVATE> From 1c2d94e91c0cd887aeddcd3f16c979ee1eeb7750 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Mon, 10 Aug 2009 22:39:31 -0400 Subject: [PATCH 10/38] copyright --- extra/memory/piles/piles-tests.factor | 1 + 1 file changed, 1 insertion(+) diff --git a/extra/memory/piles/piles-tests.factor b/extra/memory/piles/piles-tests.factor index 11b6399ed4..4bb9cc20b3 100644 --- a/extra/memory/piles/piles-tests.factor +++ b/extra/memory/piles/piles-tests.factor @@ -1,3 +1,4 @@ +! (c)2009 Joe Groff bsd license USING: accessors alien destructors kernel math memory.piles tools.test ; IN: memory.piles.tests From 3ac907cbc25b836a9412b9f6a83cdd66d07b7c47 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 11 Aug 2009 22:13:18 -0400 Subject: [PATCH 11/38] tuple-ish structs --- core/slots/slots.factor | 2 +- extra/classes/c-types/c-types.factor | 74 +++++++++++++++ extra/classes/struct/struct-tests.factor | 16 ++++ extra/classes/struct/struct.factor | 111 +++++++++++++++++++++++ 4 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 extra/classes/c-types/c-types.factor create mode 100644 extra/classes/struct/struct-tests.factor create mode 100644 extra/classes/struct/struct.factor diff --git a/core/slots/slots.factor b/core/slots/slots.factor index 9215857018..4873a52542 100755 --- a/core/slots/slots.factor +++ b/core/slots/slots.factor @@ -170,7 +170,7 @@ M: class initial-value* no-initial-value ; : initial-value ( class -- object ) { { [ \ f bootstrap-word over class<= ] [ f ] } - { [ \ array-capacity bootstrap-word over class<= ] [ 0 ] } + { [ dup \ integer bootstrap-word class<= ] [ 0 ] } { [ float bootstrap-word over class<= ] [ 0.0 ] } { [ string bootstrap-word over class<= ] [ "" ] } { [ array bootstrap-word over class<= ] [ { } ] } diff --git a/extra/classes/c-types/c-types.factor b/extra/classes/c-types/c-types.factor new file mode 100644 index 0000000000..ad7f061464 --- /dev/null +++ b/extra/classes/c-types/c-types.factor @@ -0,0 +1,74 @@ +USING: alien alien.c-types classes classes.predicate kernel +math math.order words ; +IN: classes.c-types + +PREDICATE: char < fixnum + HEX: -80 HEX: 7f between? ; + +PREDICATE: uchar < fixnum + HEX: 0 HEX: ff between? ; + +PREDICATE: short < fixnum + HEX: -8000 HEX: 7fff between? ; + +PREDICATE: ushort < fixnum + HEX: 0 HEX: ffff between? ; + +PREDICATE: int < integer + HEX: -8000,0000 HEX: 7fff,ffff between? ; + +PREDICATE: uint < integer + HEX: 0 HEX: ffff,ffff between? ; + +PREDICATE: longlong < integer + HEX: -8000,0000,0000,0000 HEX: 7fff,ffff,ffff,ffff between? ; + +PREDICATE: ulonglong < integer + HEX: 0 HEX: ffff,ffff,ffff,ffff between? ; + +SYMBOLS: long ulong ; + +<< + "long" heap-size 8 = + [ + \ long integer [ HEX: -8000,0000,0000,0000 HEX: 7fff,ffff,ffff,ffff between? ] define-predicate-class + \ ulong integer [ HEX: 0 HEX: ffff,ffff,ffff,ffff between? ] define-predicate-class + ] [ + \ long integer [ HEX: -8000,0000 HEX: 7fff,ffff between? ] define-predicate-class + \ ulong integer [ HEX: 0 HEX: ffff,ffff between? ] define-predicate-class + ] if +>> + +: set-class-c-type ( class c-type -- ) + "class-c-type" set-word-prop ; + +: class-c-type ( class -- c-type ) + "class-c-type" word-prop ; + +alien "void*" set-class-c-type +\ f "void*" set-class-c-type +pinned-c-ptr "void*" set-class-c-type +boolean "bool" set-class-c-type +char "char" set-class-c-type +uchar "uchar" set-class-c-type +short "short" set-class-c-type +ushort "ushort" set-class-c-type +int "int" set-class-c-type +uint "uint" set-class-c-type +long "long" set-class-c-type +ulong "ulong" set-class-c-type +longlong "longlong" set-class-c-type +ulonglong "ulonglong" set-class-c-type +float "double" set-class-c-type + +PREDICATE: c-type-class < class + "class-c-type" word-prop ; + +M: c-type-class c-type class-c-type c-type ; +M: c-type-class c-type-align class-c-type c-type-align ; +M: c-type-class c-type-getter class-c-type c-type-getter ; +M: c-type-class c-type-setter class-c-type c-type-setter ; +M: c-type-class c-type-boxer-quot class-c-type c-type-boxer-quot ; +M: c-type-class c-type-unboxer-quot class-c-type c-type-unboxer-quot ; +M: c-type-class heap-size class-c-type heap-size ; + diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor new file mode 100644 index 0000000000..9d0c18feb4 --- /dev/null +++ b/extra/classes/struct/struct-tests.factor @@ -0,0 +1,16 @@ +USING: classes.struct tools.test ; +IN: classes.struct.test + +STRUCT: foo + { x char } + { y int initial: 123 } + { z boolean } ; + +STRUCT: bar + { w ushort initial: HEX: ffff } + { foo foo } ; + +[ 12 ] [ foo heap-size ] unit-test +[ 16 ] [ bar heap-size ] unit-test +[ 123 ] [ foo new y>> ] unit-test +[ 123 ] [ bar new foo>> y>> ] unit-test diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor new file mode 100644 index 0000000000..130c939214 --- /dev/null +++ b/extra/classes/struct/struct.factor @@ -0,0 +1,111 @@ +USING: accessors alien alien.c-types byte-arrays classes +classes.c-types classes.parser classes.tuple +classes.tuple.parser classes.tuple.private fry kernel +kernel.private libc make math math.order sequences slots +slots.private words ; +IN: classes.struct + +! struct class + +TUPLE: struct + { (underlying) c-ptr read-only } ; + +PREDICATE: struct-class < tuple-class + \ struct subclass-of? ; + +! struct allocation + +M: struct >c-ptr + 2 slot { c-ptr } declare ; inline + +: memory>struct ( ptr class -- struct ) + over c-ptr? [ swap \ c-ptr bad-slot-value ] unless + tuple-layout ; inline + +: malloc-struct ( class -- struct ) + [ heap-size malloc ] keep memory>struct ; inline + +: ( class -- struct ) + [ heap-size ] keep memory>struct ; inline + +M: struct-class new + dup "prototype" word-prop + [ >c-ptr clone swap memory>struct ] [ ] if ; inline + +! Struct slot accessors + +M: struct-class reader-quot + nip + [ class>> c-type-getter-boxer ] + [ offset>> [ >c-ptr ] swap suffix ] bi prepend ; + +M: struct-class writer-quot + nip + [ class>> c-setter ] + [ offset>> [ >c-ptr ] swap suffix ] bi prepend ; + +! Struct as c-type + +: align-offset ( offset class -- offset' ) + c-type-align align ; + +: struct-offsets ( slots -- size ) + 0 [ + [ class>> align-offset ] keep + [ (>>offset) ] [ class>> heap-size + ] 2bi + ] reduce ; + +: struct-align ( slots -- align ) + [ class>> c-type-align ] [ max ] map-reduce ; + +M: struct-class c-type ; + +M: struct-class c-type-align + "struct-align" word-prop ; + +M: struct-class c-type-getter + drop [ swap ] ; + +M: struct-class c-type-setter + [ c-type-getter ] [ c-type-unboxer-quot ] [ heap-size ] tri + '[ @ swap @ _ memcpy ] ; + +M: struct-class c-type-boxer-quot + '[ _ memory>struct ] ; + +M: struct-class c-type-unboxer-quot + drop [ >c-ptr ] ; + +M: struct-class heap-size + "struct-size" word-prop ; + +! class definition + +: struct-prototype ( class -- prototype ) + [ heap-size ] [ new [ 2 set-slot ] keep ] bi ; ! [ "struct-slots" word-prop ] tri + ! [ [ initial>> ] [ name>> setter-word ] bi over [ execute( struct value -- struct ) ] [ 2drop ] if ] each ; + +: (define-struct-class) ( class slots size align -- ) + [ + [ "struct-slots" set-word-prop ] + [ define-accessors ] 2bi + ] + [ "struct-size" set-word-prop ] + [ "struct-align" set-word-prop ] tri-curry* tri ; + +: check-struct-slots ( slots -- ) + [ class>> c-type drop ] each ; + +: define-struct-class ( class slots -- ) + [ drop struct f define-tuple-class ] [ + make-slots dup + [ check-struct-slots ] [ struct-offsets ] [ struct-align ] tri + (define-struct-class) + ] [ drop dup struct-prototype "prototype" set-word-prop ] 2tri ; + +: parse-struct-definition ( -- class slots ) + CREATE-CLASS [ parse-tuple-slots ] { } make ; + +SYNTAX: STRUCT: + parse-struct-definition define-struct-class ; + From f239856649b38b4fe1f4c7f4932464777e9ba77c Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 09:15:46 -0400 Subject: [PATCH 12/38] make "struct-class new" work to create a struct with initial values set --- extra/classes/struct/struct.factor | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 130c939214..94d3b625e8 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -1,3 +1,4 @@ +! (c)Joe Groff bsd license USING: accessors alien alien.c-types byte-arrays classes classes.c-types classes.parser classes.tuple classes.tuple.parser classes.tuple.private fry kernel @@ -30,7 +31,7 @@ M: struct >c-ptr M: struct-class new dup "prototype" word-prop - [ >c-ptr clone swap memory>struct ] [ ] if ; inline + [ >c-ptr clone swap memory>struct ] [ ] if* ; inline ! Struct slot accessors @@ -39,11 +40,13 @@ M: struct-class reader-quot [ class>> c-type-getter-boxer ] [ offset>> [ >c-ptr ] swap suffix ] bi prepend ; -M: struct-class writer-quot - nip +: (writer-quot) ( slot -- quot ) [ class>> c-setter ] [ offset>> [ >c-ptr ] swap suffix ] bi prepend ; +M: struct-class writer-quot + nip (writer-quot) ; + ! Struct as c-type : align-offset ( offset class -- offset' ) @@ -82,8 +85,14 @@ M: struct-class heap-size ! class definition : struct-prototype ( class -- prototype ) - [ heap-size ] [ new [ 2 set-slot ] keep ] bi ; ! [ "struct-slots" word-prop ] tri - ! [ [ initial>> ] [ name>> setter-word ] bi over [ execute( struct value -- struct ) ] [ 2drop ] if ] each ; + [ heap-size ] + [ tuple-layout [ 2 set-slot ] keep ] + [ "struct-slots" word-prop ] tri + [ + [ initial>> ] + [ (writer-quot) ] bi + over [ swapd [ call( value struct -- ) ] curry keep ] [ 2drop ] if + ] each ; : (define-struct-class) ( class slots size align -- ) [ From 4896d6b9a31531d5a114b339662808402fb8a992 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 09:37:39 -0400 Subject: [PATCH 13/38] struct boa --- extra/classes/struct/struct.factor | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 94d3b625e8..94932f89d9 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -1,8 +1,9 @@ ! (c)Joe Groff bsd license USING: accessors alien alien.c-types byte-arrays classes classes.c-types classes.parser classes.tuple -classes.tuple.parser classes.tuple.private fry kernel -kernel.private libc make math math.order sequences slots +classes.tuple.parser classes.tuple.private combinators +combinators.smart fry generalizations kernel kernel.private +libc macros make math math.order quotations sequences slots slots.private words ; IN: classes.struct @@ -33,6 +34,19 @@ M: struct-class new dup "prototype" word-prop [ >c-ptr clone swap memory>struct ] [ ] if* ; inline +MACRO: ( class -- quot: ( ... -- struct ) ) + [ + [ \ [ ] 2sequence ] + [ + "struct-slots" word-prop + [ length \ ndip ] + [ [ name>> setter-word 1quotation ] map \ spread ] bi + ] bi + ] [ ] output>sequence ; + +M: struct-class boa + ; inline + ! Struct slot accessors M: struct-class reader-quot From 4461a63e1d76f58f05b46d3b2f3ad1eed098cd57 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 10:01:32 -0400 Subject: [PATCH 14/38] get classes.struct tests passing --- extra/classes/struct/struct-tests.factor | 15 +++++++++++++-- extra/classes/struct/struct.factor | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 9d0c18feb4..6e739edb5f 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -1,5 +1,6 @@ -USING: classes.struct tools.test ; -IN: classes.struct.test +USING: accessors alien.c-types classes.c-types classes.struct +combinators kernel tools.test ; +IN: classes.struct.tests STRUCT: foo { x char } @@ -14,3 +15,13 @@ STRUCT: bar [ 16 ] [ bar heap-size ] unit-test [ 123 ] [ foo new y>> ] unit-test [ 123 ] [ bar new foo>> y>> ] unit-test + +[ 1 2 3 t ] [ + 1 2 3 t foo boa bar boa + { + [ w>> ] + [ foo>> x>> ] + [ foo>> y>> ] + [ foo>> z>> ] + } cleave +] unit-test diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 94932f89d9..b4132c6816 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -22,7 +22,7 @@ M: struct >c-ptr : memory>struct ( ptr class -- struct ) over c-ptr? [ swap \ c-ptr bad-slot-value ] unless - tuple-layout ; inline + tuple-layout [ 2 set-slot ] keep ; : malloc-struct ( class -- struct ) [ heap-size malloc ] keep memory>struct ; inline @@ -100,7 +100,7 @@ M: struct-class heap-size : struct-prototype ( class -- prototype ) [ heap-size ] - [ tuple-layout [ 2 set-slot ] keep ] + [ memory>struct ] [ "struct-slots" word-prop ] tri [ [ initial>> ] @@ -122,7 +122,7 @@ M: struct-class heap-size : define-struct-class ( class slots -- ) [ drop struct f define-tuple-class ] [ make-slots dup - [ check-struct-slots ] [ struct-offsets ] [ struct-align ] tri + [ check-struct-slots ] [ struct-offsets ] [ struct-align [ align ] keep ] tri (define-struct-class) ] [ drop dup struct-prototype "prototype" set-word-prop ] 2tri ; From 940fbd5ace3afd0256a731308fe6f264b727c612 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 10:37:09 -0400 Subject: [PATCH 15/38] see STRUCT: definitions as STRUCT: definitions --- extra/classes/struct/prettyprint/prettyprint.factor | 11 +++++++++++ extra/classes/struct/struct-tests.factor | 2 +- extra/classes/struct/struct.factor | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 extra/classes/struct/prettyprint/prettyprint.factor diff --git a/extra/classes/struct/prettyprint/prettyprint.factor b/extra/classes/struct/prettyprint/prettyprint.factor new file mode 100644 index 0000000000..c0db8530c0 --- /dev/null +++ b/extra/classes/struct/prettyprint/prettyprint.factor @@ -0,0 +1,11 @@ +! (c)Joe Groff bsd license +USING: classes.struct kernel prettyprint.backend +prettyprint.sections see.private sequences words ; +IN: classes.struct.prettyprint + +M: struct-class see-class* + pprint-; block> ; + + diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 6e739edb5f..2c8f68c651 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -17,7 +17,7 @@ STRUCT: bar [ 123 ] [ bar new foo>> y>> ] unit-test [ 1 2 3 t ] [ - 1 2 3 t foo boa bar boa + 1 2 3 t foo boa bar boa { [ w>> ] [ foo>> x>> ] diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index b4132c6816..9f99a6eb22 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -132,3 +132,6 @@ M: struct-class heap-size SYNTAX: STRUCT: parse-struct-definition define-struct-class ; +USING: vocabs vocabs.loader ; + +"prettyprint" vocab [ "classes.struct.prettyprint" require ] when From 25c34348928e1768304f01f0fb9ff7032367e4a9 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 13:16:43 -0400 Subject: [PATCH 16/38] pprint structs with tuple syntax --- basis/prettyprint/backend/backend.factor | 8 +++--- core/classes/tuple/tuple.factor | 9 +++++++ .../struct/prettyprint/prettyprint.factor | 1 - extra/classes/struct/struct.factor | 25 ++++++++++++++++--- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index 103a5a72ec..cd759efb51 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -125,7 +125,7 @@ M: pathname pprint* ] if ; inline : tuple>assoc ( tuple -- assoc ) - [ class all-slots ] [ tuple-slots ] bi zip + [ class class-slots ] [ object-slots ] bi zip [ [ initial>> ] dip = not ] assoc-filter [ [ name>> ] dip ] assoc-map ; @@ -182,10 +182,12 @@ M: hashtable >pprint-sequence >alist ; M: wrapper >pprint-sequence wrapped>> 1array ; M: callstack >pprint-sequence callstack>array ; -M: tuple >pprint-sequence - [ class ] [ tuple-slots ] bi +: class-slot-sequence ( class slots -- sequence ) [ 1array ] [ [ f 2array ] dip append ] if-empty ; +M: tuple >pprint-sequence + [ class ] [ object-slots ] bi class-slot-sequence ; + M: object pprint-narrow? drop f ; M: byte-vector pprint-narrow? drop f ; M: array pprint-narrow? drop t ; diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index 8e49e2f5f4..9964df03c0 100755 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -18,6 +18,11 @@ ERROR: not-a-tuple object ; : all-slots ( class -- slots ) superclasses [ "slots" word-prop ] map concat ; +GENERIC: class-slots ( class -- slots ) + +M: tuple-class class-slots + all-slots ; + PREDICATE: immutable-tuple-class < tuple-class ( class -- ? ) all-slots [ read-only>> ] all? ; @@ -64,6 +69,10 @@ PRIVATE> : tuple-slots ( tuple -- seq ) prepare-tuple>array drop copy-tuple-slots ; +GENERIC: object-slots ( object -- seq ) +M: tuple object-slots + tuple-slots ; + GENERIC: slots>tuple ( seq class -- tuple ) M: tuple-class slots>tuple ( seq class -- tuple ) diff --git a/extra/classes/struct/prettyprint/prettyprint.factor b/extra/classes/struct/prettyprint/prettyprint.factor index c0db8530c0..22d48a0942 100644 --- a/extra/classes/struct/prettyprint/prettyprint.factor +++ b/extra/classes/struct/prettyprint/prettyprint.factor @@ -8,4 +8,3 @@ M: struct-class see-class* pprint-; block> ; - diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 9f99a6eb22..8ae72625eb 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -2,9 +2,9 @@ USING: accessors alien alien.c-types byte-arrays classes classes.c-types classes.parser classes.tuple classes.tuple.parser classes.tuple.private combinators -combinators.smart fry generalizations kernel kernel.private -libc macros make math math.order quotations sequences slots -slots.private words ; +combinators.smart fry generalizations generic.parser kernel +kernel.private libc macros make math math.order quotations +sequences slots slots.private words ; IN: classes.struct ! struct class @@ -61,6 +61,19 @@ M: struct-class reader-quot M: struct-class writer-quot nip (writer-quot) ; +M: struct-class class-slots + "struct-slots" word-prop ; + +: object-slots-quot ( class -- quot ) + "struct-slots" word-prop + [ name>> reader-word 1quotation ] map + \ cleave [ ] 2sequence + \ output>array [ ] 2sequence ; + +: (define-object-slots-method) ( class -- ) + [ \ object-slots create-method-in ] + [ object-slots-quot ] bi define ; + ! Struct as c-type : align-offset ( offset class -- offset' ) @@ -124,7 +137,11 @@ M: struct-class heap-size make-slots dup [ check-struct-slots ] [ struct-offsets ] [ struct-align [ align ] keep ] tri (define-struct-class) - ] [ drop dup struct-prototype "prototype" set-word-prop ] 2tri ; + ] [ + drop + [ dup struct-prototype "prototype" set-word-prop ] + [ (define-object-slots-method) ] bi + ] 2tri ; : parse-struct-definition ( -- class slots ) CREATE-CLASS [ parse-tuple-slots ] { } make ; From ca592b9654711940c97a73b853ff3cf05ed6f6d5 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 15:40:06 -0400 Subject: [PATCH 17/38] extend T{ } syntax to build structs --- core/classes/tuple/parser/parser.factor | 16 +++++++++------- core/classes/tuple/tuple.factor | 9 ++++++--- core/slots/slots.factor | 5 ++++- extra/classes/struct/struct.factor | 8 ++++++++ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor index 6b106e48d9..39a5d56f71 100644 --- a/core/classes/tuple/parser/parser.factor +++ b/core/classes/tuple/parser/parser.factor @@ -87,19 +87,21 @@ ERROR: bad-literal-tuple ; : parse-slot-values ( -- values ) [ (parse-slot-values) ] { } make ; -: boa>tuple ( class slots -- tuple ) +GENERIC# boa>object 1 ( class slots -- tuple ) + +M: tuple-class boa>object swap prefix >tuple ; -: assoc>tuple ( class slots -- tuple ) - [ [ ] [ initial-values ] [ all-slots ] tri ] dip - swap [ [ slot-named offset>> 2 - ] curry dip ] curry assoc-map - [ dup ] dip update boa>tuple ; +: assoc>object ( class slots -- tuple ) + [ [ ] [ initial-values ] [ class-slots ] tri ] dip + swap [ [ slot-named* drop ] curry dip ] curry assoc-map + [ dup ] dip update boa>object ; : parse-tuple-literal-slots ( class -- tuple ) scan { { f [ unexpected-eof ] } - { "f" [ \ } parse-until boa>tuple ] } - { "{" [ parse-slot-values assoc>tuple ] } + { "f" [ \ } parse-until boa>object ] } + { "{" [ parse-slot-values assoc>object ] } { "}" [ new ] } [ bad-literal-tuple ] } case ; diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index 9964df03c0..6d0c2c8242 100755 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -55,11 +55,14 @@ M: tuple class layout-of 2 slot { word } declare ; PRIVATE> -: initial-values ( class -- slots ) +: tuple-initial-values ( class -- slots ) all-slots [ initial>> ] map ; +: initial-values ( class -- slots ) + class-slots [ initial>> ] map ; + : pad-slots ( slots class -- slots' class ) - [ initial-values over length tail append ] keep ; inline + [ tuple-initial-values over length tail append ] keep ; inline : tuple>array ( tuple -- array ) prepare-tuple>array @@ -156,7 +159,7 @@ ERROR: bad-superclass class ; dup boa-check-quot "boa-check" set-word-prop ; : tuple-prototype ( class -- prototype ) - [ initial-values ] keep over [ ] any? + [ tuple-initial-values ] keep over [ ] any? [ slots>tuple ] [ 2drop f ] if ; : define-tuple-prototype ( class -- ) diff --git a/core/slots/slots.factor b/core/slots/slots.factor index 4873a52542..7e86bd93ee 100755 --- a/core/slots/slots.factor +++ b/core/slots/slots.factor @@ -236,5 +236,8 @@ M: slot-spec make-slot : finalize-slots ( specs base -- specs ) over length iota [ + ] with map [ >>offset ] 2map ; +: slot-named* ( name specs -- offset spec/f ) + [ name>> = ] with find ; + : slot-named ( name specs -- spec/f ) - [ name>> = ] with find nip ; + slot-named* nip ; diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 8ae72625eb..29e5718def 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -47,6 +47,14 @@ MACRO: ( class -- quot: ( ... -- struct ) ) M: struct-class boa ; inline +: pad-struct-slots ( slots class -- slots' class ) + [ class-slots [ initial>> ] map over length tail append ] keep ; + +M: struct-class boa>object + swap pad-struct-slots + [ swap ] [ "struct-slots" word-prop ] bi + [ name>> setter-word execute( struct value -- struct ) ] 2each ; + ! Struct slot accessors M: struct-class reader-quot From 875284f8ab12397309a55f8354f58515a4f85e23 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 15:59:33 -0400 Subject: [PATCH 18/38] S{ } syntax for structs --- basis/prettyprint/backend/backend.factor | 6 +++--- extra/classes/struct/prettyprint/prettyprint.factor | 5 ++++- extra/classes/struct/struct.factor | 4 ++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index cd759efb51..2f87e5ab05 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -138,12 +138,12 @@ M: pathname pprint* boa-tuples? get [ pprint-object ] [ [ assoc [ pprint-slot-value ] assoc-each + dup tuple>assoc [ pprint-slot-value ] assoc-each block> - \ } pprint-word + pprint-delims nip pprint-word block> ] check-recursion ] if ; diff --git a/extra/classes/struct/prettyprint/prettyprint.factor b/extra/classes/struct/prettyprint/prettyprint.factor index 22d48a0942..b63f153b16 100644 --- a/extra/classes/struct/prettyprint/prettyprint.factor +++ b/extra/classes/struct/prettyprint/prettyprint.factor @@ -1,5 +1,5 @@ ! (c)Joe Groff bsd license -USING: classes.struct kernel prettyprint.backend +USING: classes.struct kernel prettyprint.backend prettyprint.custom prettyprint.sections see.private sequences words ; IN: classes.struct.prettyprint @@ -8,3 +8,6 @@ M: struct-class see-class* pprint-; block> ; +M: struct pprint-delims + drop \ S{ \ } ; + diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 29e5718def..4c94c826db 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -160,3 +160,7 @@ SYNTAX: STRUCT: USING: vocabs vocabs.loader ; "prettyprint" vocab [ "classes.struct.prettyprint" require ] when + +SYNTAX: S{ + POSTPONE: T{ ; + From 0109061474ff1aa0f53dc6254003f5510249ec4d Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 16:04:27 -0400 Subject: [PATCH 19/38] tests for literal struct syntax --- extra/classes/struct/struct-tests.factor | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 2c8f68c651..958a7ea55c 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -25,3 +25,6 @@ STRUCT: bar [ foo>> z>> ] } cleave ] unit-test + +[ 7654 ] [ S{ foo f 98 7654 f } y>> ] unit-test +[ 7654 ] [ S{ foo { y 7654 } } y>> ] unit-test From 287207df72062abdbfe7c320ee270bbef66d4dbf Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 12 Aug 2009 16:09:25 -0400 Subject: [PATCH 20/38] fix boa undo to work with structs --- basis/inverse/inverse.factor | 2 +- extra/classes/struct/struct-tests.factor | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/basis/inverse/inverse.factor b/basis/inverse/inverse.factor index cf97a0b2c8..2183c95f08 100755 --- a/basis/inverse/inverse.factor +++ b/basis/inverse/inverse.factor @@ -236,7 +236,7 @@ DEFER: __ "predicate" word-prop [ dupd call assure ] curry ; : slot-readers ( class -- quot ) - all-slots [ name>> reader-word 1quotation ] map [ cleave ] curry ; + class-slots [ name>> reader-word 1quotation ] map [ cleave ] curry ; : ?wrapped ( object -- wrapped ) dup wrapper? [ wrapped>> ] when ; diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 958a7ea55c..5806960332 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -1,5 +1,5 @@ USING: accessors alien.c-types classes.c-types classes.struct -combinators kernel tools.test ; +combinators inverse kernel tools.test ; IN: classes.struct.tests STRUCT: foo @@ -28,3 +28,5 @@ STRUCT: bar [ 7654 ] [ S{ foo f 98 7654 f } y>> ] unit-test [ 7654 ] [ S{ foo { y 7654 } } y>> ] unit-test + +[ 98 7654 t ] [ S{ foo f 98 7654 t } [ foo boa ] undo ] unit-test From fd02e59ea10103b9eef53d3fe03f8710d0ad90f0 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 13 Aug 2009 12:05:20 -0400 Subject: [PATCH 21/38] fix bootstrap --- core/slots/slots.factor | 1 + 1 file changed, 1 insertion(+) diff --git a/core/slots/slots.factor b/core/slots/slots.factor index 7e86bd93ee..7b117ac412 100755 --- a/core/slots/slots.factor +++ b/core/slots/slots.factor @@ -170,6 +170,7 @@ M: class initial-value* no-initial-value ; : initial-value ( class -- object ) { { [ \ f bootstrap-word over class<= ] [ f ] } + { [ \ array-capacity bootstrap-word over class<= ] [ 0 ] } { [ dup \ integer bootstrap-word class<= ] [ 0 ] } { [ float bootstrap-word over class<= ] [ 0.0 ] } { [ string bootstrap-word over class<= ] [ "" ] } From a2569ea50b99a18046cb82102d9c1d77a2a1b746 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 13 Aug 2009 12:05:46 -0400 Subject: [PATCH 22/38] make direct-*-arrays prettyprint --- basis/specialized-arrays/direct/functor/functor.factor | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/basis/specialized-arrays/direct/functor/functor.factor b/basis/specialized-arrays/direct/functor/functor.factor index e7e891fede..b49dfa35e4 100755 --- a/basis/specialized-arrays/direct/functor/functor.factor +++ b/basis/specialized-arrays/direct/functor/functor.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: functors sequences sequences.private kernel words classes math alien alien.c-types byte-arrays accessors -specialized-arrays ; +specialized-arrays prettyprint.custom ; IN: specialized-arrays.direct.functor FUNCTOR: define-direct-array ( T -- ) @@ -10,6 +10,7 @@ FUNCTOR: define-direct-array ( T -- ) A' IS ${T}-array >A' IS >${T}-array IS <${A'}> +A'{ IS ${A'}{ A DEFINES-CLASS direct-${T}-array DEFINES <${A}> @@ -30,6 +31,12 @@ M: A set-nth-unsafe underlying>> SET-NTH call ; M: A like drop dup A instance? [ >A' ] unless ; M: A new-sequence drop ; +M: A pprint-delims drop \ A'{ \ } ; + +M: A >pprint-sequence ; + +M: A pprint* pprint-object ; + INSTANCE: A sequence ;FUNCTOR From 37c6405927ccb0b386970452ebc20c651f9081d6 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 13 Aug 2009 13:28:00 -0400 Subject: [PATCH 23/38] coercers and array type relations for c-type classes --- extra/classes/c-types/c-types.factor | 81 +++++++++++++++++++++------- 1 file changed, 62 insertions(+), 19 deletions(-) diff --git a/extra/classes/c-types/c-types.factor b/extra/classes/c-types/c-types.factor index ad7f061464..fe9940ad11 100644 --- a/extra/classes/c-types/c-types.factor +++ b/extra/classes/c-types/c-types.factor @@ -1,5 +1,21 @@ USING: alien alien.c-types classes classes.predicate kernel -math math.order words ; +math math.bitwise math.order namespaces sequences words +specialized-arrays.direct.alien +specialized-arrays.direct.bool +specialized-arrays.direct.char +specialized-arrays.direct.complex-double +specialized-arrays.direct.complex-float +specialized-arrays.direct.double +specialized-arrays.direct.float +specialized-arrays.direct.int +specialized-arrays.direct.long +specialized-arrays.direct.longlong +specialized-arrays.direct.short +specialized-arrays.direct.uchar +specialized-arrays.direct.uint +specialized-arrays.direct.ulong +specialized-arrays.direct.ulonglong +specialized-arrays.direct.ushort ; IN: classes.c-types PREDICATE: char < fixnum @@ -26,44 +42,71 @@ PREDICATE: longlong < integer PREDICATE: ulonglong < integer HEX: 0 HEX: ffff,ffff,ffff,ffff between? ; -SYMBOLS: long ulong ; +UNION: single-float float ; +UNION: single-complex complex ; + +SYMBOLS: long ulong long-bits ; << "long" heap-size 8 = [ \ long integer [ HEX: -8000,0000,0000,0000 HEX: 7fff,ffff,ffff,ffff between? ] define-predicate-class \ ulong integer [ HEX: 0 HEX: ffff,ffff,ffff,ffff between? ] define-predicate-class + 64 long-bits set-global ] [ \ long integer [ HEX: -8000,0000 HEX: 7fff,ffff between? ] define-predicate-class \ ulong integer [ HEX: 0 HEX: ffff,ffff between? ] define-predicate-class + 32 long-bits set-global ] if >> -: set-class-c-type ( class c-type -- ) - "class-c-type" set-word-prop ; +: set-class-c-type ( class c-type -- ) + [ "class-c-type" set-word-prop ] + [ "class-direct-array" set-word-prop ] bi-curry* bi ; : class-c-type ( class -- c-type ) "class-c-type" word-prop ; +: class-direct-array ( class -- ) + "class-direct-array" word-prop ; -alien "void*" set-class-c-type -\ f "void*" set-class-c-type -pinned-c-ptr "void*" set-class-c-type -boolean "bool" set-class-c-type -char "char" set-class-c-type -uchar "uchar" set-class-c-type -short "short" set-class-c-type -ushort "ushort" set-class-c-type -int "int" set-class-c-type -uint "uint" set-class-c-type -long "long" set-class-c-type -ulong "ulong" set-class-c-type -longlong "longlong" set-class-c-type -ulonglong "ulonglong" set-class-c-type -float "double" set-class-c-type +alien "void*" \ set-class-c-type +\ f "void*" \ set-class-c-type +pinned-c-ptr "void*" \ set-class-c-type +boolean "bool" \ set-class-c-type +char "char" \ set-class-c-type +uchar "uchar" \ set-class-c-type +short "short" \ set-class-c-type +ushort "ushort" \ set-class-c-type +int "int" \ set-class-c-type +uint "uint" \ set-class-c-type +long "long" \ set-class-c-type +ulong "ulong" \ set-class-c-type +longlong "longlong" \ set-class-c-type +ulonglong "ulonglong" \ set-class-c-type +float "double" \ set-class-c-type +single-float "float" \ set-class-c-type +complex "complex-double" \ set-class-c-type +single-complex "complex-float" \ set-class-c-type + +char [ 8 bits 8 >signed ] "coercer" set-word-prop +uchar [ 8 bits ] "coercer" set-word-prop +short [ 16 bits 16 >signed ] "coercer" set-word-prop +ushort [ 16 bits ] "coercer" set-word-prop +int [ 32 bits 32 >signed ] "coercer" set-word-prop +uint [ 32 bits ] "coercer" set-word-prop +long [ [ bits ] [ >signed ] ] long-bits get-global prefix "coercer" set-word-prop +ulong [ bits ] long-bits get-global prefix "coercer" set-word-prop +longlong [ 64 bits 64 >signed ] "coercer" set-word-prop +ulonglong [ 64 bits ] "coercer" set-word-prop PREDICATE: c-type-class < class "class-c-type" word-prop ; +GENERIC: direct-array-of ( alien len class -- array ) + +M: c-type-class direct-array-of + class-direct-array execute( alien len -- array ) ; inline + M: c-type-class c-type class-c-type c-type ; M: c-type-class c-type-align class-c-type c-type-align ; M: c-type-class c-type-getter class-c-type c-type-getter ; From 92ac48a5bca62608cbedcb6906c4e898b447364a Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 13 Aug 2009 13:33:22 -0400 Subject: [PATCH 24/38] coercers and array type relations for c-type classes --- extra/classes/struct/struct.factor | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 4c94c826db..e2d2c33667 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -4,7 +4,7 @@ classes.c-types classes.parser classes.tuple classes.tuple.parser classes.tuple.private combinators combinators.smart fry generalizations generic.parser kernel kernel.private libc macros make math math.order quotations -sequences slots slots.private words ; +sequences slots slots.private struct-arrays words ; IN: classes.struct ! struct class @@ -117,6 +117,9 @@ M: struct-class c-type-unboxer-quot M: struct-class heap-size "struct-size" word-prop ; +M: struct-class direct-array-of + ; + ! class definition : struct-prototype ( class -- prototype ) From 6102f6eba4d8c3e9107a9ea981be354ed2e23508 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 13 Aug 2009 13:39:48 -0400 Subject: [PATCH 25/38] compile fix --- extra/classes/c-types/c-types.factor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/classes/c-types/c-types.factor b/extra/classes/c-types/c-types.factor index fe9940ad11..5082e0d2f5 100644 --- a/extra/classes/c-types/c-types.factor +++ b/extra/classes/c-types/c-types.factor @@ -52,11 +52,11 @@ SYMBOLS: long ulong long-bits ; [ \ long integer [ HEX: -8000,0000,0000,0000 HEX: 7fff,ffff,ffff,ffff between? ] define-predicate-class \ ulong integer [ HEX: 0 HEX: ffff,ffff,ffff,ffff between? ] define-predicate-class - 64 long-bits set-global + 64 \ long-bits set-global ] [ \ long integer [ HEX: -8000,0000 HEX: 7fff,ffff between? ] define-predicate-class \ ulong integer [ HEX: 0 HEX: ffff,ffff between? ] define-predicate-class - 32 long-bits set-global + 32 \ long-bits set-global ] if >> From 85e321667a5b690228aea21e0b570ba89d2e17a0 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 13 Aug 2009 16:55:22 -0400 Subject: [PATCH 26/38] union classes --- extra/classes/struct/struct-tests.factor | 9 ++++++- extra/classes/struct/struct.factor | 32 ++++++++++++++++-------- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 5806960332..8086f45ebf 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -1,5 +1,5 @@ USING: accessors alien.c-types classes.c-types classes.struct -combinators inverse kernel tools.test ; +combinators inverse kernel math tools.test ; IN: classes.struct.tests STRUCT: foo @@ -30,3 +30,10 @@ STRUCT: bar [ 7654 ] [ S{ foo { y 7654 } } y>> ] unit-test [ 98 7654 t ] [ S{ foo f 98 7654 t } [ foo boa ] undo ] unit-test + +UNION-STRUCT: float-and-bits + { f single-float } + { bits uint } ; + +[ 1.0 ] [ float-and-bits 1.0 float>bits >>bits f>> ] unit-test + diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index e2d2c33667..2a7679bb0d 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -93,6 +93,9 @@ M: struct-class class-slots [ (>>offset) ] [ class>> heap-size + ] 2bi ] reduce ; +: union-struct-offsets ( slots -- size ) + [ 0 >>offset class>> heap-size ] [ max ] map-reduce ; + : struct-align ( slots -- align ) [ class>> c-type-align ] [ max ] map-reduce ; @@ -132,33 +135,40 @@ M: struct-class direct-array-of over [ swapd [ call( value struct -- ) ] curry keep ] [ 2drop ] if ] each ; -: (define-struct-class) ( class slots size align -- ) +: (struct-word-props) ( class slots size align -- ) [ [ "struct-slots" set-word-prop ] [ define-accessors ] 2bi ] [ "struct-size" set-word-prop ] - [ "struct-align" set-word-prop ] tri-curry* tri ; + [ "struct-align" set-word-prop ] tri-curry* + [ tri ] 3curry + [ dup struct-prototype "prototype" set-word-prop ] + [ (define-object-slots-method) ] tri ; : check-struct-slots ( slots -- ) [ class>> c-type drop ] each ; -: define-struct-class ( class slots -- ) - [ drop struct f define-tuple-class ] [ +: (define-struct-class) ( class slots offsets-quot -- ) + [ drop struct f define-tuple-class ] swap '[ make-slots dup - [ check-struct-slots ] [ struct-offsets ] [ struct-align [ align ] keep ] tri - (define-struct-class) - ] [ - drop - [ dup struct-prototype "prototype" set-word-prop ] - [ (define-object-slots-method) ] bi - ] 2tri ; + [ check-struct-slots ] _ [ struct-align [ align ] keep ] tri + (struct-word-props) + ] 2bi ; inline + +: define-struct-class ( class slots -- ) + [ struct-offsets ] (define-struct-class) ; + +: define-union-struct-class ( class slots -- ) + [ union-struct-offsets ] (define-struct-class) ; : parse-struct-definition ( -- class slots ) CREATE-CLASS [ parse-tuple-slots ] { } make ; SYNTAX: STRUCT: parse-struct-definition define-struct-class ; +SYNTAX: UNION-STRUCT: + parse-struct-definition define-union-struct-class ; USING: vocabs vocabs.loader ; From 4a1b2d0d77acc70b09731c5de3ef6d2dccca9e5b Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Thu, 13 Aug 2009 17:59:38 -0400 Subject: [PATCH 27/38] classes.c-types and classes.struct docs --- extra/classes/c-types/c-types-docs.factor | 69 ++++++++++++++++++ extra/classes/c-types/c-types.factor | 1 + extra/classes/struct/struct-docs.factor | 87 +++++++++++++++++++++++ extra/classes/struct/struct-tests.factor | 1 + 4 files changed, 158 insertions(+) create mode 100644 extra/classes/c-types/c-types-docs.factor create mode 100644 extra/classes/struct/struct-docs.factor diff --git a/extra/classes/c-types/c-types-docs.factor b/extra/classes/c-types/c-types-docs.factor new file mode 100644 index 0000000000..13363f99e8 --- /dev/null +++ b/extra/classes/c-types/c-types-docs.factor @@ -0,0 +1,69 @@ +! (c)Joe Groff bsd license +USING: alien arrays classes help.markup help.syntax kernel math ; +IN: classes.c-types + +HELP: c-type-class +{ $class-description "This metaclass encompasses the " { $link "classes.c-types" } "." } ; + +HELP: char +{ $class-description "A signed one-byte integer quantity." } ; + +HELP: direct-array-of +{ $values + { "alien" c-ptr } { "len" integer } { "class" c-type-class } + { "array" "a direct array" } +} +{ $description "Constructs a direct array over " { $snippet "len" } " elements of type " { $snippet "class" } " located at the referenced location in memory." } ; + +HELP: int +{ $class-description "A signed four-byte integer quantity." } ; + +HELP: long +{ $class-description "A signed integer quantity. On 64-bit Unix platforms, this is an eight-byte quantity; on Windows and on 32-bit Unix platforms, it is four bytes." } ; + +HELP: longlong +{ $class-description "A signed eight-byte integer quantity." } ; + +HELP: short +{ $class-description "A signed two-byte integer quantity." } ; + +HELP: single-complex +{ $class-description "A single-precision complex floating point quantity." } ; + +HELP: single-float +{ $class-description "A single-precision floating point quantity." } ; + +HELP: uchar +{ $class-description "An unsigned one-byte integer quantity." } ; + +HELP: uint +{ $class-description "An unsigned four-byte integer quantity." } ; + +HELP: ulong +{ $class-description "An unsigned integer quantity. On 64-bit Unix platforms, this is an eight-byte quantity; on Windows and on 32-bit Unix platforms, it is four bytes." } ; + +HELP: ulonglong +{ $class-description "An unsigned eight-byte integer quantity." } ; + +HELP: ushort +{ $class-description "An unsigned two-byte integer quantity." } ; + +ARTICLE: "classes.c-types" "C type classes" +"The " { $vocab-link "classes.c-types" } " vocabulary defines Factor classes that correspond to C types in the FFI." +{ $subsection char } +{ $subsection uchar } +{ $subsection short } +{ $subsection ushort } +{ $subsection int } +{ $subsection uint } +{ $subsection long } +{ $subsection ulong } +{ $subsection longlong } +{ $subsection ulonglong } +{ $subsection single-float } +{ $subsection float } +{ $subsection single-complex } +{ $subsection complex } +{ $subsection pinned-c-ptr } ; + +ABOUT: "classes.c-types" diff --git a/extra/classes/c-types/c-types.factor b/extra/classes/c-types/c-types.factor index 5082e0d2f5..58aa3a1d2f 100644 --- a/extra/classes/c-types/c-types.factor +++ b/extra/classes/c-types/c-types.factor @@ -1,3 +1,4 @@ +! (c)Joe Groff bsd license USING: alien alien.c-types classes classes.predicate kernel math math.bitwise math.order namespaces sequences words specialized-arrays.direct.alien diff --git a/extra/classes/struct/struct-docs.factor b/extra/classes/struct/struct-docs.factor new file mode 100644 index 0000000000..18c012b61c --- /dev/null +++ b/extra/classes/struct/struct-docs.factor @@ -0,0 +1,87 @@ +! (c)Joe Groff bsd license +USING: alien classes help.markup help.syntax kernel libc +quotations slots ; +IN: classes.struct + +HELP: +{ $values + { "class" class } +} +{ $description "This macro implements " { $link boa } " for " { $link struct } " classes. User code does not need to call this word directly and should use " { $snippet "boa" } " instead." } ; + +HELP: +{ $values + { "class" class } + { "struct" struct } +} +{ $description "Allocates garbage-collected heap memory for a new " { $link struct } " of the specified " { $snippet "class" } ". The new struct's slots are left uninitialized; to allocate a struct with the slots initialized, call " { $link new } " or " { $link boa } " instead." } ; + +{ malloc-struct memory>struct } related-words + +HELP: STRUCT: +{ $syntax "STRUCT: class { slot type } { slot type } ... ;" } +{ $values { "class" "a new " { $link struct } " class to define" } { "slots" "a list of slot specifiers" } } +{ $description "Defines a new " { $link struct } " type. The syntax is nearly identical to " { $link POSTPONE: TUPLE: } "; however, there are some additional restrictions on struct types:" +{ $list +{ "Struct classes cannot have a superclass defined." } +{ "The slots of a struct must all have a type declared. The type must be either another struct class, or one of the " { $link "classes.c-types" } "." } +{ { $link read-only } " slots on structs are not enforced, though they may be declared." } +} } ; + +HELP: S{ +{ $syntax "S{ class slots... }" } +{ $values { "class" "a " { $link struct } " class word" } { "slots" "slot values" } } +{ $description "Marks the beginning of a literal struct. The syntax is identical to tuple literal syntax with " { $link POSTPONE: T{ } { $snippet " }" } "; in fact, " { $snippet "T{" } " and " { $snippet "S{" } " can be used interchangeably. Structs will always be printed with " { $snippet "S{" } "." } ; + +HELP: UNION-STRUCT: +{ $syntax "UNION-STRUCT: class { slot type } { slot type } ... ;" } +{ $values { "class" "a new " { $link struct } " class to define" } { "slots" "a list of slot specifiers" } } +{ $description "Defines a new " { $link struct } " type where all of the slots share the same storage. See " { $link POSTPONE: STRUCT: } " for details on the syntax." } ; + +HELP: define-struct-class +{ $values + { "class" class } { "slots" "a sequence of " { $link slot-spec } "s" } +} +{ $description "Defines a new " { $link struct } " class. This is the runtime equivalent of the " { $link POSTPONE: STRUCT: } " syntax." } ; + +HELP: define-union-struct-class +{ $values + { "class" class } { "slots" "a sequence of " { $link slot-spec } "s" } +} +{ $description "Defines a new " { $link struct } " class where all of the slots share the same storage. This is the runtime equivalent of the " { $link POSTPONE: UNION-STRUCT: } " syntax." } ; + +HELP: malloc-struct +{ $values + { "class" class } + { "struct" struct } +} +{ $description "Allocates unmanaged C heap memory for a new " { $link struct } " of the specified " { $snippet "class" } ". The new struct's slots are left uninitialized. The struct should be " { $link free } "d when it is no longer needed." } ; + +HELP: memory>struct +{ $values + { "ptr" c-ptr } { "class" class } + { "struct" struct } +} +{ $description "Constructs a new " { $link struct } " of the specified " { $snippet "class" } " at the memory location referenced by " { $snippet "ptr" } ". The referenced memory is unchanged." } ; + +HELP: struct +{ $class-description "The parent class of all struct types." } ; + +{ struct POSTPONE: STRUCT: POSTPONE: UNION-STRUCT: } related-words + +HELP: struct-class +{ $class-description "The metaclass of all " { $link struct } " classes." } ; + +ARTICLE: "classes.struct" "Struct classes" +{ $link struct } " classes are similar to " { $link tuple } "s, but their slots exhibit value semantics, and they are backed by a contiguous structured block of memory. Structs can be used for structured access to C memory or Factor byte arrays and for passing struct values in and out of the FFI. Struct types are defined using a syntax similar to tuple syntax:" +{ $subsection POSTPONE: STRUCT: } +"Structs can be allocated with " { $link new } " and " { $link boa } " like tuples. Additional words are provided for building structs from C memory and from existing buffers:" +{ $subsection malloc-struct } +{ $subsection memory>struct } +"Structs have literal syntax like tuples:" +{ $subsection POSTPONE: S{ } +"Union structs are also supported, which behave like structs but share the same memory for all the type's slots." +{ $subsection POSTPONE: UNION-STRUCT: } +; + +ABOUT: "classes.struct" diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 8086f45ebf..3c64b30b25 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -1,3 +1,4 @@ +! (c)Joe Groff bsd license USING: accessors alien.c-types classes.c-types classes.struct combinators inverse kernel math tools.test ; IN: classes.struct.tests From 4991171ca6d70dc815a1492b6398081eb109f49a Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Fri, 14 Aug 2009 07:09:37 -0400 Subject: [PATCH 28/38] compiler doesn't like new and boa being overridden so much --- extra/classes/struct/struct-docs.factor | 10 ++++++---- extra/classes/struct/struct-tests.factor | 8 ++++---- extra/classes/struct/struct.factor | 13 +++++-------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/extra/classes/struct/struct-docs.factor b/extra/classes/struct/struct-docs.factor index 18c012b61c..90247a0495 100644 --- a/extra/classes/struct/struct-docs.factor +++ b/extra/classes/struct/struct-docs.factor @@ -7,16 +7,16 @@ HELP: { $values { "class" class } } -{ $description "This macro implements " { $link boa } " for " { $link struct } " classes. User code does not need to call this word directly and should use " { $snippet "boa" } " instead." } ; +{ $description "This macro implements " { $link boa } " for " { $link struct } " classes. A struct of the given class is constructed, and its slots are initialized using values off the top of the datastack." } ; HELP: { $values { "class" class } { "struct" struct } } -{ $description "Allocates garbage-collected heap memory for a new " { $link struct } " of the specified " { $snippet "class" } ". The new struct's slots are left uninitialized; to allocate a struct with the slots initialized, call " { $link new } " or " { $link boa } " instead." } ; +{ $description "Allocates garbage-collected heap memory for a new " { $link struct } " of the specified " { $snippet "class" } ". The new struct's slots are initialized with the initial values specified in the struct definition." } ; -{ malloc-struct memory>struct } related-words +{ malloc-struct memory>struct } related-words HELP: STRUCT: { $syntax "STRUCT: class { slot type } { slot type } ... ;" } @@ -75,7 +75,9 @@ HELP: struct-class ARTICLE: "classes.struct" "Struct classes" { $link struct } " classes are similar to " { $link tuple } "s, but their slots exhibit value semantics, and they are backed by a contiguous structured block of memory. Structs can be used for structured access to C memory or Factor byte arrays and for passing struct values in and out of the FFI. Struct types are defined using a syntax similar to tuple syntax:" { $subsection POSTPONE: STRUCT: } -"Structs can be allocated with " { $link new } " and " { $link boa } " like tuples. Additional words are provided for building structs from C memory and from existing buffers:" +"Structs can be allocated with " { $link new } "- and " { $link boa } "-like constructor words. Additional words are provided for building structs from C memory and from existing buffers:" +{ $subsection } +{ $subsection } { $subsection malloc-struct } { $subsection memory>struct } "Structs have literal syntax like tuples:" diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 3c64b30b25..0d4f97a70a 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -14,11 +14,11 @@ STRUCT: bar [ 12 ] [ foo heap-size ] unit-test [ 16 ] [ bar heap-size ] unit-test -[ 123 ] [ foo new y>> ] unit-test -[ 123 ] [ bar new foo>> y>> ] unit-test +[ 123 ] [ foo y>> ] unit-test +[ 123 ] [ bar foo>> y>> ] unit-test [ 1 2 3 t ] [ - 1 2 3 t foo boa bar boa + 1 2 3 t foo bar { [ w>> ] [ foo>> x>> ] @@ -30,7 +30,7 @@ STRUCT: bar [ 7654 ] [ S{ foo f 98 7654 f } y>> ] unit-test [ 7654 ] [ S{ foo { y 7654 } } y>> ] unit-test -[ 98 7654 t ] [ S{ foo f 98 7654 t } [ foo boa ] undo ] unit-test +[ 98 7654 t ] [ S{ foo f 98 7654 t } [ foo ] undo ] unit-test UNION-STRUCT: float-and-bits { f single-float } diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 2a7679bb0d..90224c96d5 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -27,16 +27,16 @@ M: struct >c-ptr : malloc-struct ( class -- struct ) [ heap-size malloc ] keep memory>struct ; inline -: ( class -- struct ) +: (struct) ( class -- struct ) [ heap-size ] keep memory>struct ; inline -M: struct-class new +: ( class -- struct ) dup "prototype" word-prop - [ >c-ptr clone swap memory>struct ] [ ] if* ; inline + [ >c-ptr clone swap memory>struct ] [ (struct) ] if* ; inline MACRO: ( class -- quot: ( ... -- struct ) ) [ - [ \ [ ] 2sequence ] + [ \ (struct) [ ] 2sequence ] [ "struct-slots" word-prop [ length \ ndip ] @@ -44,15 +44,12 @@ MACRO: ( class -- quot: ( ... -- struct ) ) ] bi ] [ ] output>sequence ; -M: struct-class boa - ; inline - : pad-struct-slots ( slots class -- slots' class ) [ class-slots [ initial>> ] map over length tail append ] keep ; M: struct-class boa>object swap pad-struct-slots - [ swap ] [ "struct-slots" word-prop ] bi + [ (struct) swap ] [ "struct-slots" word-prop ] bi [ name>> setter-word execute( struct value -- struct ) ] 2each ; ! Struct slot accessors From 119809f6753285e4f148c00c071ad0eca43ed9d3 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Fri, 14 Aug 2009 07:29:28 -0400 Subject: [PATCH 29/38] classes.c-types doc improvements --- extra/classes/c-types/c-types-docs.factor | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/extra/classes/c-types/c-types-docs.factor b/extra/classes/c-types/c-types-docs.factor index 13363f99e8..f3d1258583 100644 --- a/extra/classes/c-types/c-types-docs.factor +++ b/extra/classes/c-types/c-types-docs.factor @@ -13,13 +13,13 @@ HELP: direct-array-of { "alien" c-ptr } { "len" integer } { "class" c-type-class } { "array" "a direct array" } } -{ $description "Constructs a direct array over " { $snippet "len" } " elements of type " { $snippet "class" } " located at the referenced location in memory." } ; +{ $description "Constructs one of the " { $link "specialized-arrays.direct" } " over " { $snippet "len" } " elements of type " { $snippet "class" } " located at the referenced location in raw memory." } ; HELP: int { $class-description "A signed four-byte integer quantity." } ; HELP: long -{ $class-description "A signed integer quantity. On 64-bit Unix platforms, this is an eight-byte quantity; on Windows and on 32-bit Unix platforms, it is four bytes." } ; +{ $class-description "A signed integer quantity. On 64-bit Unix platforms, this is an eight-byte type; on Windows and on 32-bit Unix platforms, it is four bytes." } ; HELP: longlong { $class-description "A signed eight-byte integer quantity." } ; @@ -40,7 +40,7 @@ HELP: uint { $class-description "An unsigned four-byte integer quantity." } ; HELP: ulong -{ $class-description "An unsigned integer quantity. On 64-bit Unix platforms, this is an eight-byte quantity; on Windows and on 32-bit Unix platforms, it is four bytes." } ; +{ $class-description "An unsigned integer quantity. On 64-bit Unix platforms, this is an eight-byte type; on Windows and on 32-bit Unix platforms, it is four bytes." } ; HELP: ulonglong { $class-description "An unsigned eight-byte integer quantity." } ; @@ -64,6 +64,8 @@ ARTICLE: "classes.c-types" "C type classes" { $subsection float } { $subsection single-complex } { $subsection complex } -{ $subsection pinned-c-ptr } ; +{ $subsection pinned-c-ptr } +"The vocabulary also provides a word for constructing " { $link "specialized-arrays.direct" } " of C types over raw memory:" +{ $subsection direct-array-of } ; ABOUT: "classes.c-types" From cfe8019ad1b501cdc16d549e577e8e668fc087aa Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Fri, 14 Aug 2009 07:49:48 -0400 Subject: [PATCH 30/38] force classes.c-types docs to pull in specialized-arrays.direct docs --- extra/classes/c-types/c-types-docs.factor | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/classes/c-types/c-types-docs.factor b/extra/classes/c-types/c-types-docs.factor index f3d1258583..58ebf7a063 100644 --- a/extra/classes/c-types/c-types-docs.factor +++ b/extra/classes/c-types/c-types-docs.factor @@ -1,5 +1,6 @@ ! (c)Joe Groff bsd license -USING: alien arrays classes help.markup help.syntax kernel math ; +USING: alien arrays classes help.markup help.syntax kernel math +specialized-arrays.direct ; IN: classes.c-types HELP: c-type-class From 4ea2820f2f6d03d91c023ced75219b76bf7e9716 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 18 Aug 2009 10:25:47 -0500 Subject: [PATCH 31/38] remove irrelevant undo test from classes.struct --- extra/classes/struct/struct-tests.factor | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 0d4f97a70a..9a2d3a8074 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -1,6 +1,6 @@ ! (c)Joe Groff bsd license USING: accessors alien.c-types classes.c-types classes.struct -combinators inverse kernel math tools.test ; +combinators kernel math tools.test ; IN: classes.struct.tests STRUCT: foo @@ -30,8 +30,6 @@ STRUCT: bar [ 7654 ] [ S{ foo f 98 7654 f } y>> ] unit-test [ 7654 ] [ S{ foo { y 7654 } } y>> ] unit-test -[ 98 7654 t ] [ S{ foo f 98 7654 t } [ foo ] undo ] unit-test - UNION-STRUCT: float-and-bits { f single-float } { bits uint } ; From 600bf6bcdc3b2535d0e1d8f067c7cc72b766a931 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 18 Aug 2009 10:26:45 -0500 Subject: [PATCH 32/38] don't use setter words from classes.struct boa>object, otherwise struct literals of classes in the current compilation unit won't compile --- extra/classes/struct/struct.factor | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 90224c96d5..d52c25e413 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -44,13 +44,17 @@ MACRO: ( class -- quot: ( ... -- struct ) ) ] bi ] [ ] output>sequence ; -: pad-struct-slots ( slots class -- slots' class ) +: pad-struct-slots ( values class -- values' class ) [ class-slots [ initial>> ] map over length tail append ] keep ; +: (writer-quot) ( slot -- quot ) + [ class>> c-setter ] + [ offset>> [ >c-ptr ] swap suffix ] bi prepend ; + M: struct-class boa>object swap pad-struct-slots - [ (struct) swap ] [ "struct-slots" word-prop ] bi - [ name>> setter-word execute( struct value -- struct ) ] 2each ; + [ (struct) ] [ "struct-slots" word-prop ] bi + [ [ (writer-quot) call( value struct -- ) ] with 2each ] curry keep ; ! Struct slot accessors @@ -59,10 +63,6 @@ M: struct-class reader-quot [ class>> c-type-getter-boxer ] [ offset>> [ >c-ptr ] swap suffix ] bi prepend ; -: (writer-quot) ( slot -- quot ) - [ class>> c-setter ] - [ offset>> [ >c-ptr ] swap suffix ] bi prepend ; - M: struct-class writer-quot nip (writer-quot) ; From 4d87c91d596bb1ec3b666c8bf37548379e467ef5 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Tue, 18 Aug 2009 13:10:52 -0500 Subject: [PATCH 33/38] classes.struct unit tests to check union heap-size and that structs can be passed as FFI args --- extra/classes/struct/struct-tests.factor | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 9a2d3a8074..3ab6593070 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -1,6 +1,6 @@ ! (c)Joe Groff bsd license USING: accessors alien.c-types classes.c-types classes.struct -combinators kernel math tools.test ; +combinators kernel libc math tools.test ; IN: classes.struct.tests STRUCT: foo @@ -35,4 +35,6 @@ UNION-STRUCT: float-and-bits { bits uint } ; [ 1.0 ] [ float-and-bits 1.0 float>bits >>bits f>> ] unit-test +[ 4 ] [ float-and-bits heap-size ] unit-test +[ ] [ foo malloc-struct free ] unit-test From c898593983ae0f315367be0ec630e2c6b8f64152 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 19 Aug 2009 18:53:44 -0500 Subject: [PATCH 34/38] decouple struct parsing/printing from tuple parsing/printing a bit --- basis/inverse/inverse.factor | 4 +-- basis/prettyprint/backend/backend.factor | 32 ++++++++++--------- core/classes/tuple/parser/parser.factor | 12 +++---- core/classes/tuple/tuple.factor | 18 ++--------- .../struct/prettyprint/prettyprint.factor | 21 ++++++++++-- extra/classes/struct/struct-docs.factor | 2 +- extra/classes/struct/struct.factor | 31 +++++++++--------- 7 files changed, 64 insertions(+), 56 deletions(-) diff --git a/basis/inverse/inverse.factor b/basis/inverse/inverse.factor index 39a2d5f3dc..6b1e839ca6 100755 --- a/basis/inverse/inverse.factor +++ b/basis/inverse/inverse.factor @@ -248,7 +248,7 @@ DEFER: __ "predicate" word-prop [ dupd call assure ] curry ; : slot-readers ( class -- quot ) - class-slots [ name>> reader-word 1quotation ] map [ cleave ] curry ; + all-slots [ name>> reader-word 1quotation ] map [ cleave ] curry ; : ?wrapped ( object -- wrapped ) dup wrapper? [ wrapped>> ] when ; @@ -295,4 +295,4 @@ M: no-match summary drop "Fall through in switch" ; reverse [ [ [undo] ] dip compose ] { } assoc>map recover-chain ; -MACRO: switch ( quot-alist -- ) [switch] ; \ No newline at end of file +MACRO: switch ( quot-alist -- ) [switch] ; diff --git a/basis/prettyprint/backend/backend.factor b/basis/prettyprint/backend/backend.factor index 2f87e5ab05..247067673e 100644 --- a/basis/prettyprint/backend/backend.factor +++ b/basis/prettyprint/backend/backend.factor @@ -124,29 +124,31 @@ M: pathname pprint* ] if ] if ; inline -: tuple>assoc ( tuple -- assoc ) - [ class class-slots ] [ object-slots ] bi zip +: filter-tuple-assoc ( slot,value -- name,value ) [ [ initial>> ] dip = not ] assoc-filter [ [ name>> ] dip ] assoc-map ; +: tuple>assoc ( tuple -- assoc ) + [ class all-slots ] [ tuple-slots ] bi zip filter-tuple-assoc ; + : pprint-slot-value ( name value -- ) ] bi* \ } pprint-word block> ; +: (pprint-tuple) ( opener class slots closer -- ) + ] + [ pprint-word ] + } spread block> ; + +: ?pprint-tuple ( tuple quot -- ) + [ boa-tuples? get [ pprint-object ] ] dip [ check-recursion ] curry if ; inline + : pprint-tuple ( tuple -- ) - boa-tuples? get [ pprint-object ] [ - [ - assoc [ pprint-slot-value ] assoc-each - block> - pprint-delims nip pprint-word - block> - ] check-recursion - ] if ; + [ [ \ T{ ] dip [ class ] [ tuple>assoc ] bi \ } (pprint-tuple) ] ?pprint-tuple ; M: tuple pprint* pprint-tuple ; @@ -186,7 +188,7 @@ M: callstack >pprint-sequence callstack>array ; [ 1array ] [ [ f 2array ] dip append ] if-empty ; M: tuple >pprint-sequence - [ class ] [ object-slots ] bi class-slot-sequence ; + [ class ] [ tuple-slots ] bi class-slot-sequence ; M: object pprint-narrow? drop f ; M: byte-vector pprint-narrow? drop f ; diff --git a/core/classes/tuple/parser/parser.factor b/core/classes/tuple/parser/parser.factor index 39a5d56f71..7ba850f744 100644 --- a/core/classes/tuple/parser/parser.factor +++ b/core/classes/tuple/parser/parser.factor @@ -92,19 +92,19 @@ GENERIC# boa>object 1 ( class slots -- tuple ) M: tuple-class boa>object swap prefix >tuple ; -: assoc>object ( class slots -- tuple ) - [ [ ] [ initial-values ] [ class-slots ] tri ] dip +: assoc>object ( class slots values -- tuple ) + [ [ [ initial>> ] map ] keep ] dip swap [ [ slot-named* drop ] curry dip ] curry assoc-map [ dup ] dip update boa>object ; -: parse-tuple-literal-slots ( class -- tuple ) +: parse-tuple-literal-slots ( class slots -- tuple ) scan { { f [ unexpected-eof ] } - { "f" [ \ } parse-until boa>object ] } + { "f" [ drop \ } parse-until boa>object ] } { "{" [ parse-slot-values assoc>object ] } - { "}" [ new ] } + { "}" [ drop new ] } [ bad-literal-tuple ] } case ; : parse-tuple-literal ( -- tuple ) - scan-word parse-tuple-literal-slots ; + scan-word dup all-slots parse-tuple-literal-slots ; diff --git a/core/classes/tuple/tuple.factor b/core/classes/tuple/tuple.factor index 1452abd4b4..0a437a3d69 100755 --- a/core/classes/tuple/tuple.factor +++ b/core/classes/tuple/tuple.factor @@ -18,11 +18,6 @@ ERROR: not-a-tuple object ; : all-slots ( class -- slots ) superclasses [ "slots" word-prop ] map concat ; -GENERIC: class-slots ( class -- slots ) - -M: tuple-class class-slots - all-slots ; - PREDICATE: immutable-tuple-class < tuple-class ( class -- ? ) all-slots [ read-only>> ] all? ; @@ -55,14 +50,11 @@ M: tuple class layout-of 2 slot { word } declare ; inline PRIVATE> -: tuple-initial-values ( class -- slots ) +: initial-values ( class -- slots ) all-slots [ initial>> ] map ; -: initial-values ( class -- slots ) - class-slots [ initial>> ] map ; - : pad-slots ( slots class -- slots' class ) - [ tuple-initial-values over length tail append ] keep ; inline + [ initial-values over length tail append ] keep ; inline : tuple>array ( tuple -- array ) prepare-tuple>array @@ -72,10 +64,6 @@ PRIVATE> : tuple-slots ( tuple -- seq ) prepare-tuple>array drop copy-tuple-slots ; -GENERIC: object-slots ( object -- seq ) -M: tuple object-slots - tuple-slots ; - GENERIC: slots>tuple ( seq class -- tuple ) M: tuple-class slots>tuple ( seq class -- tuple ) @@ -159,7 +147,7 @@ ERROR: bad-superclass class ; dup boa-check-quot "boa-check" set-word-prop ; : tuple-prototype ( class -- prototype ) - [ tuple-initial-values ] keep over [ ] any? + [ initial-values ] keep over [ ] any? [ slots>tuple ] [ 2drop f ] if ; : define-tuple-prototype ( class -- ) diff --git a/extra/classes/struct/prettyprint/prettyprint.factor b/extra/classes/struct/prettyprint/prettyprint.factor index b63f153b16..517aa343c6 100644 --- a/extra/classes/struct/prettyprint/prettyprint.factor +++ b/extra/classes/struct/prettyprint/prettyprint.factor @@ -3,11 +3,28 @@ USING: classes.struct kernel prettyprint.backend prettyprint.custom prettyprint.sections see.private sequences words ; IN: classes.struct.prettyprint += + [ second offset>> 0 = \ UNION-STRUCT: \ STRUCT: ? ] + [ drop \ STRUCT: ] if ; + +: struct>assoc ( struct -- assoc ) + [ class struct-slots ] [ struct-slot-values ] bi zip filter-tuple-assoc ; + +PRIVATE> + M: struct-class see-class* - pprint-; block> ; M: struct pprint-delims drop \ S{ \ } ; +M: struct >pprint-sequence + [ class ] [ struct-slot-values ] bi class-slot-sequence ; + +M: struct pprint* + [ [ \ S{ ] dip [ class ] [ struct>assoc ] bi \ } (pprint-tuple) ] ?pprint-tuple ; diff --git a/extra/classes/struct/struct-docs.factor b/extra/classes/struct/struct-docs.factor index 90247a0495..83d5859f7c 100644 --- a/extra/classes/struct/struct-docs.factor +++ b/extra/classes/struct/struct-docs.factor @@ -31,7 +31,7 @@ HELP: STRUCT: HELP: S{ { $syntax "S{ class slots... }" } { $values { "class" "a " { $link struct } " class word" } { "slots" "slot values" } } -{ $description "Marks the beginning of a literal struct. The syntax is identical to tuple literal syntax with " { $link POSTPONE: T{ } { $snippet " }" } "; in fact, " { $snippet "T{" } " and " { $snippet "S{" } " can be used interchangeably. Structs will always be printed with " { $snippet "S{" } "." } ; +{ $description "Marks the beginning of a literal struct. The syntax is identical to tuple literal syntax with " { $link POSTPONE: T{ } { $snippet " }" } "; either the assoc syntax (that is, " { $snippet "S{ class { slot value } { slot value } ... }" } ") or the simple syntax (" { $snippet "S{ class f value value ... }" } ") can be used." } ; HELP: UNION-STRUCT: { $syntax "UNION-STRUCT: class { slot type } { slot type } ... ;" } diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index d52c25e413..2b2aa49aeb 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -15,6 +15,9 @@ TUPLE: struct PREDICATE: struct-class < tuple-class \ struct subclass-of? ; +M: struct-class struct-slots + "struct-slots" word-prop ; + ! struct allocation M: struct >c-ptr @@ -38,7 +41,7 @@ MACRO: ( class -- quot: ( ... -- struct ) ) [ [ \ (struct) [ ] 2sequence ] [ - "struct-slots" word-prop + struct-slots [ length \ ndip ] [ [ name>> setter-word 1quotation ] map \ spread ] bi ] bi @@ -53,11 +56,13 @@ MACRO: ( class -- quot: ( ... -- struct ) ) M: struct-class boa>object swap pad-struct-slots - [ (struct) ] [ "struct-slots" word-prop ] bi + [ (struct) ] [ struct-slots ] bi [ [ (writer-quot) call( value struct -- ) ] with 2each ] curry keep ; ! Struct slot accessors +GENERIC: struct-slot-values ( struct -- sequence ) + M: struct-class reader-quot nip [ class>> c-type-getter-boxer ] @@ -66,18 +71,15 @@ M: struct-class reader-quot M: struct-class writer-quot nip (writer-quot) ; -M: struct-class class-slots - "struct-slots" word-prop ; - -: object-slots-quot ( class -- quot ) - "struct-slots" word-prop +: struct-slot-values-quot ( class -- quot ) + struct-slots [ name>> reader-word 1quotation ] map \ cleave [ ] 2sequence \ output>array [ ] 2sequence ; -: (define-object-slots-method) ( class -- ) - [ \ object-slots create-method-in ] - [ object-slots-quot ] bi define ; +: (define-struct-slot-values-method) ( class -- ) + [ \ struct-slot-values create-method-in ] + [ struct-slot-values-quot ] bi define ; ! Struct as c-type @@ -125,7 +127,7 @@ M: struct-class direct-array-of : struct-prototype ( class -- prototype ) [ heap-size ] [ memory>struct ] - [ "struct-slots" word-prop ] tri + [ struct-slots ] tri [ [ initial>> ] [ (writer-quot) ] bi @@ -134,14 +136,14 @@ M: struct-class direct-array-of : (struct-word-props) ( class slots size align -- ) [ - [ "struct-slots" set-word-prop ] + [ struct-slots ] [ define-accessors ] 2bi ] [ "struct-size" set-word-prop ] [ "struct-align" set-word-prop ] tri-curry* [ tri ] 3curry [ dup struct-prototype "prototype" set-word-prop ] - [ (define-object-slots-method) ] tri ; + [ (define-struct-slot-values-method) ] tri ; : check-struct-slots ( slots -- ) [ class>> c-type drop ] each ; @@ -172,5 +174,4 @@ USING: vocabs vocabs.loader ; "prettyprint" vocab [ "classes.struct.prettyprint" require ] when SYNTAX: S{ - POSTPONE: T{ ; - + scan-word dup struct-slots parse-tuple-literal-slots ; From d99a126ca4112395b08dbb1c6f19dfc39ccffd11 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 19 Aug 2009 18:54:11 -0500 Subject: [PATCH 35/38] remove a layer of indirection from classes.c-types --- extra/classes/c-types/c-types.factor | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extra/classes/c-types/c-types.factor b/extra/classes/c-types/c-types.factor index 58aa3a1d2f..0d0b26639f 100644 --- a/extra/classes/c-types/c-types.factor +++ b/extra/classes/c-types/c-types.factor @@ -62,7 +62,7 @@ SYMBOLS: long ulong long-bits ; >> : set-class-c-type ( class c-type -- ) - [ "class-c-type" set-word-prop ] + [ c-type "class-c-type" set-word-prop ] [ "class-direct-array" set-word-prop ] bi-curry* bi ; : class-c-type ( class -- c-type ) @@ -103,12 +103,12 @@ ulonglong [ 64 bits ] "coercer" set-word-prop PREDICATE: c-type-class < class "class-c-type" word-prop ; -GENERIC: direct-array-of ( alien len class -- array ) +GENERIC: direct-array-of ( alien len class -- array ) inline M: c-type-class direct-array-of class-direct-array execute( alien len -- array ) ; inline -M: c-type-class c-type class-c-type c-type ; +M: c-type-class c-type class-c-type ; M: c-type-class c-type-align class-c-type c-type-align ; M: c-type-class c-type-getter class-c-type c-type-getter ; M: c-type-class c-type-setter class-c-type c-type-setter ; From 4d95e5ef2ebe4df4d5ad0d6aec7e32708c55cac5 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 19 Aug 2009 20:21:57 -0500 Subject: [PATCH 36/38] fix up struct parsing/printing --- extra/classes/struct/prettyprint/prettyprint.factor | 5 +++-- extra/classes/struct/struct-tests.factor | 10 +++++++++- extra/classes/struct/struct.factor | 12 ++++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/extra/classes/struct/prettyprint/prettyprint.factor b/extra/classes/struct/prettyprint/prettyprint.factor index 517aa343c6..6bf62f694c 100644 --- a/extra/classes/struct/prettyprint/prettyprint.factor +++ b/extra/classes/struct/prettyprint/prettyprint.factor @@ -1,6 +1,7 @@ ! (c)Joe Groff bsd license -USING: classes.struct kernel prettyprint.backend prettyprint.custom -prettyprint.sections see.private sequences words ; +USING: accessors assocs classes classes.struct kernel math +prettyprint.backend prettyprint.custom prettyprint.sections +see.private sequences words ; IN: classes.struct.prettyprint 7654 >>y [ pprint ] with-string-writer ] with-variable ] unit-test + +[ "S{ foo f 0 7654 f }" ] +[ t boa-tuples? [ foo 7654 >>y [ pprint ] with-string-writer ] with-variable ] unit-test + diff --git a/extra/classes/struct/struct.factor b/extra/classes/struct/struct.factor index 2b2aa49aeb..675e1cf025 100644 --- a/extra/classes/struct/struct.factor +++ b/extra/classes/struct/struct.factor @@ -3,8 +3,8 @@ USING: accessors alien alien.c-types byte-arrays classes classes.c-types classes.parser classes.tuple classes.tuple.parser classes.tuple.private combinators combinators.smart fry generalizations generic.parser kernel -kernel.private libc macros make math math.order quotations -sequences slots slots.private struct-arrays words ; +kernel.private libc macros make math math.order parser +quotations sequences slots slots.private struct-arrays words ; IN: classes.struct ! struct class @@ -15,7 +15,7 @@ TUPLE: struct PREDICATE: struct-class < tuple-class \ struct subclass-of? ; -M: struct-class struct-slots +: struct-slots ( struct -- slots ) "struct-slots" word-prop ; ! struct allocation @@ -48,7 +48,7 @@ MACRO: ( class -- quot: ( ... -- struct ) ) ] [ ] output>sequence ; : pad-struct-slots ( values class -- values' class ) - [ class-slots [ initial>> ] map over length tail append ] keep ; + [ struct-slots [ initial>> ] map over length tail append ] keep ; : (writer-quot) ( slot -- quot ) [ class>> c-setter ] @@ -136,7 +136,7 @@ M: struct-class direct-array-of : (struct-word-props) ( class slots size align -- ) [ - [ struct-slots ] + [ "struct-slots" set-word-prop ] [ define-accessors ] 2bi ] [ "struct-size" set-word-prop ] @@ -174,4 +174,4 @@ USING: vocabs vocabs.loader ; "prettyprint" vocab [ "classes.struct.prettyprint" require ] when SYNTAX: S{ - scan-word dup struct-slots parse-tuple-literal-slots ; + scan-word dup struct-slots parse-tuple-literal-slots parsed ; From 767d64622dc9d1835c5a79d33f3a6eb8e68257c5 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 19 Aug 2009 20:32:49 -0500 Subject: [PATCH 37/38] test that STRUCT:s and UNION-STRUCT:s see properly --- extra/classes/struct/struct-tests.factor | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/extra/classes/struct/struct-tests.factor b/extra/classes/struct/struct-tests.factor index 80bd160292..1f8d0cc482 100644 --- a/extra/classes/struct/struct-tests.factor +++ b/extra/classes/struct/struct-tests.factor @@ -1,7 +1,7 @@ ! (c)Joe Groff bsd license USING: accessors alien.c-types classes.c-types classes.struct -combinators io.streams.string kernel libc math namespaces -prettyprint prettyprint.config tools.test ; +combinators io.streams.string kernel libc math multiline namespaces +prettyprint prettyprint.config see tools.test ; IN: classes.struct.tests STRUCT: foo @@ -46,3 +46,17 @@ UNION-STRUCT: float-and-bits [ "S{ foo f 0 7654 f }" ] [ t boa-tuples? [ foo 7654 >>y [ pprint ] with-string-writer ] with-variable ] unit-test +[ <" USING: classes.c-types classes.struct kernel ; +IN: classes.struct.tests +STRUCT: foo + { x char initial: 0 } { y int initial: 123 } + { z boolean initial: f } ; +"> ] +[ [ foo see ] with-string-writer ] unit-test + +[ <" USING: classes.c-types classes.struct ; +IN: classes.struct.tests +UNION-STRUCT: float-and-bits + { f single-float initial: 0.0 } { bits uint initial: 0 } ; +"> ] +[ [ float-and-bits see ] with-string-writer ] unit-test From 06ecb30140c5810ec40c0d793d2f5505ce0ade5e Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 19 Aug 2009 21:28:20 -0500 Subject: [PATCH 38/38] make slot initial-values check the class for an "initial-value" word prop; set this word prop on classes.c-types types --- core/slots/slots-tests.factor | 7 +++++ core/slots/slots.factor | 2 +- extra/classes/c-types/c-types.factor | 40 ++++++++++++++-------------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/core/slots/slots-tests.factor b/core/slots/slots-tests.factor index d22ca31d00..957b525cb3 100644 --- a/core/slots/slots-tests.factor +++ b/core/slots/slots-tests.factor @@ -32,3 +32,10 @@ M: protocol-slot-test-tuple (>>my-protocol-slot-test) [ sqrt ] dip (>>x) ; T{ protocol-slot-test-tuple { x 3 } } clone [ 7 + ] change-my-protocol-slot-test x>> ] unit-test + +UNION: comme-ci integer float ; +UNION: comme-ca integer float ; +comme-ca 25.5 "initial-value" set-word-prop + +[ 0 ] [ comme-ci initial-value ] unit-test +[ 25.5 ] [ comme-ca initial-value ] unit-test diff --git a/core/slots/slots.factor b/core/slots/slots.factor index 3cf9b261dc..95a854f493 100755 --- a/core/slots/slots.factor +++ b/core/slots/slots.factor @@ -166,9 +166,9 @@ M: class initial-value* no-initial-value ; : initial-value ( class -- object ) { + { [ dup "initial-value" word-prop ] [ dup "initial-value" word-prop ] } { [ \ f bootstrap-word over class<= ] [ f ] } { [ \ array-capacity bootstrap-word over class<= ] [ 0 ] } - { [ dup \ integer bootstrap-word class<= ] [ 0 ] } { [ float bootstrap-word over class<= ] [ 0.0 ] } { [ string bootstrap-word over class<= ] [ "" ] } { [ array bootstrap-word over class<= ] [ { } ] } diff --git a/extra/classes/c-types/c-types.factor b/extra/classes/c-types/c-types.factor index 0d0b26639f..e53a813825 100644 --- a/extra/classes/c-types/c-types.factor +++ b/extra/classes/c-types/c-types.factor @@ -61,33 +61,33 @@ SYMBOLS: long ulong long-bits ; ] if >> -: set-class-c-type ( class c-type -- ) +: set-class-c-type ( class initial c-type -- ) + [ "initial-value" set-word-prop ] [ c-type "class-c-type" set-word-prop ] - [ "class-direct-array" set-word-prop ] bi-curry* bi ; + [ "class-direct-array" set-word-prop ] tri-curry* tri ; : class-c-type ( class -- c-type ) "class-c-type" word-prop ; : class-direct-array ( class -- ) "class-direct-array" word-prop ; -alien "void*" \ set-class-c-type -\ f "void*" \ set-class-c-type -pinned-c-ptr "void*" \ set-class-c-type -boolean "bool" \ set-class-c-type -char "char" \ set-class-c-type -uchar "uchar" \ set-class-c-type -short "short" \ set-class-c-type -ushort "ushort" \ set-class-c-type -int "int" \ set-class-c-type -uint "uint" \ set-class-c-type -long "long" \ set-class-c-type -ulong "ulong" \ set-class-c-type -longlong "longlong" \ set-class-c-type -ulonglong "ulonglong" \ set-class-c-type -float "double" \ set-class-c-type -single-float "float" \ set-class-c-type -complex "complex-double" \ set-class-c-type -single-complex "complex-float" \ set-class-c-type +\ f f "void*" \ set-class-c-type +pinned-c-ptr f "void*" \ set-class-c-type +boolean f "bool" \ set-class-c-type +char 0 "char" \ set-class-c-type +uchar 0 "uchar" \ set-class-c-type +short 0 "short" \ set-class-c-type +ushort 0 "ushort" \ set-class-c-type +int 0 "int" \ set-class-c-type +uint 0 "uint" \ set-class-c-type +long 0 "long" \ set-class-c-type +ulong 0 "ulong" \ set-class-c-type +longlong 0 "longlong" \ set-class-c-type +ulonglong 0 "ulonglong" \ set-class-c-type +float 0.0 "double" \ set-class-c-type +single-float 0.0 "float" \ set-class-c-type +complex C{ 0.0 0.0 } "complex-double" \ set-class-c-type +single-complex C{ 0.0 0.0 } "complex-float" \ set-class-c-type char [ 8 bits 8 >signed ] "coercer" set-word-prop uchar [ 8 bits ] "coercer" set-word-prop