alien.enums: allow enum members to be given values based on other enum symbols' values

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

diff --git a/basis/alien/enums/enums.factor b/basis/alien/enums/enums.factor
index 18000105e7d0107a1bc7e750e9ed321a23b89d26..4ac7c24cb5c3c301985992f9b1657d3c4f8915ce 100644 (file)
--- a/basis/alien/enums/enums.factor
+++ b/basis/alien/enums/enums.factor
@@ -12,7 +12,7 @@ PRIVATE>
 
 GENERIC: enum>number ( enum -- number ) foldable
 M: integer enum>number ;
-M: symbol enum>number "enum-value" word-prop ;
+M: word enum>number "enum-value" word-prop ;
 
 <PRIVATE
 : enum-boxer ( members -- quot )
@@ -32,13 +32,10 @@ M: enum-c-type c-type-setter
 <PRIVATE
 
 : define-enum-value ( class value -- )
-    "enum-value" set-word-prop ;
+    enum>number "enum-value" set-word-prop ;
 
 : define-enum-members ( member-names -- )
-    [
-        [ first define-symbol ]
-        [ first2 define-enum-value ] bi
-    ] each ;
+    [ first define-symbol ] each ;
 
 : define-enum-constructor ( word -- )
     [ name>> "<" ">" surround create-in ] keep