factor: add newlines to .factor files

[factor.git] / basis / alien / enums / enums.factor

diff --git a/basis/alien/enums/enums.factor b/basis/alien/enums/enums.factor
index 2056a5ad52c1730121e804be2030ecc1ff3e8f08..e9f9d44ec645648a0afa140db5090494874390b8 100644 (file)
--- a/basis/alien/enums/enums.factor
+++ b/basis/alien/enums/enums.factor
@@ -1,7 +1,7 @@
-! (c)2010 Joe Groff, Erik Charlebois bsd license
+! Copyright (C) 2010 Joe Groff, Erik Charlebois.
+! See http://factorcode.org/license.txt for BSD license.
 USING: accessors alien.c-types arrays assocs classes.singleton
-combinators delegate fry kernel macros math parser sequences
-words ;
+combinators delegate kernel math parser sequences words ;
 IN: alien.enums
 
 <PRIVATE
@@ -21,7 +21,7 @@ M: word enum>number "enum-value" word-prop ;
     { } map-as [ ] suffix '[ _ case ] ;
 PRIVATE>
 
-MACRO: number>enum ( enum-c-type -- )
+MACRO: number>enum ( enum-c-type -- quot )
     lookup-c-type members>> enum-boxer ;
 
 M: enum-c-type c-type-boxed-class drop object ;
@@ -39,8 +39,8 @@ M: enum-c-type c-type-setter
     [ first define-singleton-class ] each ;
 
 : define-enum-constructor ( word -- )
-    [ name>> "<" ">" surround create-in ] keep
-    [ number>enum ] curry ( number -- enum ) define-inline ;
+    [ name>> "<" ">" surround create-word-in ] keep
+    [ number>enum ] curry ( number -- enum ) define-declared ;
 
 PRIVATE>
 
@@ -55,3 +55,13 @@ PRIVATE>
 
 PREDICATE: enum-c-type-word < c-type-word
     "c-type" word-prop enum-c-type? ;
+
+: enum>values ( enum -- seq )
+    "c-type" word-prop members>> values ;
+
+: enum>keys ( enum -- seq )
+    "c-type" word-prop members>> keys [ name>> ] map ;
+
+: values>enum ( values enum -- seq )
+    '[ _ number>enum ] map ; inline
+