Implement enums in terms of Variant

Author: alexcrichton

phases/ephemeral/docs.md

@@ -22,14 +22,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#clockid" name="clockid"></a> `clockid`: Enum(`u32`)
+## <a href="#clockid" name="clockid"></a> `clockid`: Variant
 Identifiers for clocks.
 
 Size: 4
 
 Alignment: 4
 
-### Variants
+### Variant cases
 - <a href="#clockid.realtime" name="clockid.realtime"></a> `realtime`
 The clock measuring real time. Time value zero corresponds with
 1970-01-01T00:00:00Z.
@@ -40,7 +40,7 @@ real time, whose value cannot be adjusted and which cannot have negative
 clock jumps. The epoch of this clock is undefined. The absolute time
 value of this clock therefore has no meaning.
 
-## <a href="#errno" name="errno"></a> `errno`: Enum(`u16`)
+## <a href="#errno" name="errno"></a> `errno`: Variant
 Error codes returned by functions.
 Not all of these error codes are returned by the functions provided by this
 API; some are used in higher-level library layers, and others are provided
@@ -50,7 +50,7 @@ Size: 2
 
 Alignment: 2
 
-### Variants
+### Variant cases
 - <a href="#errno.success" name="errno.success"></a> `success`
 No error occurred. System call completed successfully.
 
@@ -463,14 +463,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#whence" name="whence"></a> `whence`: Enum(`u8`)
+## <a href="#whence" name="whence"></a> `whence`: Variant
 The position relative to which to set the offset of the file descriptor.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#whence.set" name="whence.set"></a> `set`
 Seek relative to start-of-file.
 
@@ -501,14 +501,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#filetype" name="filetype"></a> `filetype`: Enum(`u8`)
+## <a href="#filetype" name="filetype"></a> `filetype`: Variant
 The type of a file descriptor or file.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#filetype.unknown" name="filetype.unknown"></a> `unknown`
 The type of the file descriptor or file is unknown or is different from any of the other types specified.
 
@@ -564,14 +564,14 @@ The length of the name of the directory entry.
 
 Offset: 20
 
-## <a href="#advice" name="advice"></a> `advice`: Enum(`u8`)
+## <a href="#advice" name="advice"></a> `advice`: Variant
 File or memory access pattern advisory information.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#advice.normal" name="advice.normal"></a> `normal`
 The application has no advice to give on its behavior with respect to the specified data.
 
@@ -805,14 +805,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#eventtype" name="eventtype"></a> `eventtype`: Enum(`u8`)
+## <a href="#eventtype" name="eventtype"></a> `eventtype`: Variant
 Type of a subscription to an event or its occurrence.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#eventtype.clock" name="eventtype.clock"></a> `clock`
 The time value of clock [`subscription_clock::id`](#subscription_clock.id) has
 reached timestamp [`subscription_clock::timeout`](#subscription_clock.timeout).
@@ -1051,14 +1051,14 @@ Disables further receive operations.
 - <a href="#sdflags.wr" name="sdflags.wr"></a> `wr`
 Disables further send operations.
 
-## <a href="#preopentype" name="preopentype"></a> `preopentype`: Enum(`u8`)
+## <a href="#preopentype" name="preopentype"></a> `preopentype`: Variant
 Identifiers for preopened capabilities.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#preopentype.dir" name="preopentype.dir"></a> `dir`
 A pre-opened directory.
 

phases/ephemeral/witx/typenames.witx

@@ -18,7 +18,7 @@
 
 ;;; Identifiers for clocks.
 (typename $clockid
-  (enum u32
+  (enum (@witx tag u32)
     ;;; The clock measuring real time. Time value zero corresponds with
     ;;; 1970-01-01T00:00:00Z.
     $realtime
@@ -35,7 +35,7 @@
 ;;; API; some are used in higher-level library layers, and others are provided
 ;;; merely for alignment with POSIX.
 (typename $errno
-  (enum u16
+  (enum (@witx tag u16)
     ;;; No error occurred. System call completed successfully.
     $success
     ;;; Argument list too long.
@@ -312,7 +312,7 @@
 
 ;;; The position relative to which to set the offset of the file descriptor.
 (typename $whence
-  (enum u8
+  (enum (@witx tag u8)
     ;;; Seek relative to start-of-file.
     $set
     ;;; Seek relative to current position.
@@ -336,7 +336,7 @@
 
 ;;; The type of a file descriptor or file.
 (typename $filetype
-  (enum u8
+  (enum (@witx tag u8)
     ;;; The type of the file descriptor or file is unknown or is different from any of the other types specified.
     $unknown
     ;;; The file descriptor or file refers to a block device inode.
@@ -374,7 +374,7 @@
 
 ;;; File or memory access pattern advisory information.
 (typename $advice
-  (enum u8
+  (enum (@witx tag u8)
     ;;; The application has no advice to give on its behavior with respect to the specified data.
     $normal
     ;;; The application expects to access the specified data sequentially from lower offsets to higher offsets.
@@ -527,7 +527,7 @@
 
 ;;; Type of a subscription to an event or its occurrence.
 (typename $eventtype
-  (enum u8
+  (enum (@witx tag u8)
     ;;; The time value of clock `subscription_clock::id` has
     ;;; reached timestamp `subscription_clock::timeout`.
     $clock
@@ -675,7 +675,7 @@
 
 ;;; Identifiers for preopened capabilities.
 (typename $preopentype
-  (enum u8
+  (enum (@witx tag u8)
     ;;; A pre-opened directory.
     $dir
   )

phases/old/snapshot_0/docs.md

@@ -19,14 +19,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#clockid" name="clockid"></a> `clockid`: Enum(`u32`)
+## <a href="#clockid" name="clockid"></a> `clockid`: Variant
 Identifiers for clocks.
 
 Size: 4
 
 Alignment: 4
 
-### Variants
+### Variant cases
 - <a href="#clockid.realtime" name="clockid.realtime"></a> `realtime`
 The clock measuring real time. Time value zero corresponds with
 1970-01-01T00:00:00Z.
@@ -43,7 +43,7 @@ The CPU-time clock associated with the current process.
 - <a href="#clockid.thread_cputime_id" name="clockid.thread_cputime_id"></a> `thread_cputime_id`
 The CPU-time clock associated with the current thread.
 
-## <a href="#errno" name="errno"></a> `errno`: Enum(`u16`)
+## <a href="#errno" name="errno"></a> `errno`: Variant
 Error codes returned by functions.
 Not all of these error codes are returned by the functions provided by this
 API; some are used in higher-level library layers, and others are provided
@@ -53,7 +53,7 @@ Size: 2
 
 Alignment: 2
 
-### Variants
+### Variant cases
 - <a href="#errno.success" name="errno.success"></a> `success`
 No error occurred. System call completed successfully.
 
@@ -455,14 +455,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#whence" name="whence"></a> `whence`: Enum(`u8`)
+## <a href="#whence" name="whence"></a> `whence`: Variant
 The position relative to which to set the offset of the file descriptor.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#whence.cur" name="whence.cur"></a> `cur`
 Seek relative to current position.
 
@@ -493,14 +493,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#filetype" name="filetype"></a> `filetype`: Enum(`u8`)
+## <a href="#filetype" name="filetype"></a> `filetype`: Variant
 The type of a file descriptor or file.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#filetype.unknown" name="filetype.unknown"></a> `unknown`
 The type of the file descriptor or file is unknown or is different from any of the other types specified.
 
@@ -553,14 +553,14 @@ The type of the file referred to by this directory entry.
 
 Offset: 20
 
-## <a href="#advice" name="advice"></a> `advice`: Enum(`u8`)
+## <a href="#advice" name="advice"></a> `advice`: Variant
 File or memory access pattern advisory information.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#advice.normal" name="advice.normal"></a> `normal`
 The application has no advice to give on its behavior with respect to the specified data.
 
@@ -755,14 +755,14 @@ Size: 8
 
 Alignment: 8
 
-## <a href="#eventtype" name="eventtype"></a> `eventtype`: Enum(`u8`)
+## <a href="#eventtype" name="eventtype"></a> `eventtype`: Variant
 Type of a subscription to an event or its occurrence.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#eventtype.clock" name="eventtype.clock"></a> `clock`
 The time value of clock [`subscription_clock::id`](#subscription_clock.id) has
 reached timestamp [`subscription_clock::timeout`](#subscription_clock.timeout).
@@ -945,14 +945,14 @@ Size: 4
 
 Alignment: 4
 
-## <a href="#signal" name="signal"></a> `signal`: Enum(`u8`)
+## <a href="#signal" name="signal"></a> `signal`: Variant
 Signal condition.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#signal.none" name="signal.none"></a> `none`
 No signal. Note that POSIX has special semantics for `kill(pid, 0)`,
 so this value is reserved.
@@ -1124,14 +1124,14 @@ Disables further receive operations.
 - <a href="#sdflags.wr" name="sdflags.wr"></a> `wr`
 Disables further send operations.
 
-## <a href="#preopentype" name="preopentype"></a> `preopentype`: Enum(`u8`)
+## <a href="#preopentype" name="preopentype"></a> `preopentype`: Variant
 Identifiers for preopened capabilities.
 
 Size: 1
 
 Alignment: 1
 
-### Variants
+### Variant cases
 - <a href="#preopentype.dir" name="preopentype.dir"></a> `dir`
 A pre-opened directory.
 

phases/old/snapshot_0/witx/typenames.witx

@@ -15,7 +15,7 @@
 
 ;;; Identifiers for clocks.
 (typename $clockid
-  (enum u32
+  (enum (@witx tag u32)
     ;;; The clock measuring real time. Time value zero corresponds with
     ;;; 1970-01-01T00:00:00Z.
     $realtime
@@ -36,7 +36,7 @@
 ;;; API; some are used in higher-level library layers, and others are provided
 ;;; merely for alignment with POSIX.
 (typename $errno
-  (enum u16
+  (enum (@witx tag u16)
     ;;; No error occurred. System call completed successfully.
     $success
     ;;; Argument list too long.
@@ -304,7 +304,7 @@
 
 ;;; The position relative to which to set the offset of the file descriptor.
 (typename $whence
-  (enum u8
+  (enum (@witx tag u8)
     ;;; Seek relative to current position.
     $cur
     ;;; Seek relative to end-of-file.
@@ -325,7 +325,7 @@
 
 ;;; The type of a file descriptor or file.
 (typename $filetype
-  (enum u8
+  (enum (@witx tag u8)
     ;;; The type of the file descriptor or file is unknown or is different from any of the other types specified.
     $unknown
     ;;; The file descriptor or file refers to a block device inode.
@@ -361,7 +361,7 @@
 
 ;;; File or memory access pattern advisory information.
 (typename $advice
-  (enum u8
+  (enum (@witx tag u8)
     ;;; The application has no advice to give on its behavior with respect to the specified data.
     $normal
     ;;; The application expects to access the specified data sequentially from lower offsets to higher offsets.
@@ -481,7 +481,7 @@
 
 ;;; Type of a subscription to an event or its occurrence.
 (typename $eventtype
-  (enum u8
+  (enum (@witx tag u8)
     ;;; The time value of clock `subscription_clock::id` has
     ;;; reached timestamp `subscription_clock::timeout`.
     $clock
@@ -593,7 +593,7 @@
 
 ;;; Signal condition.
 (typename $signal
-  (enum u8
+  (enum (@witx tag u8)
     ;;; No signal. Note that POSIX has special semantics for `kill(pid, 0)`,
     ;;; so this value is reserved.
     $none
@@ -724,7 +724,7 @@
 
 ;;; Identifiers for preopened capabilities.
 (typename $preopentype
-  (enum u8
+  (enum (@witx tag u8)
     ;;; A pre-opened directory.
     $dir
   )