Hackity in assoc consts for now

Author: MarijnS95

autogen/src/table.rs

@@ -76,9 +76,7 @@ pub fn gen_grammar_inst_table_operand_kinds(
     // Instruction table.
     let table = gen_instruction_table(instructions, ext_op_name, name);
 
-    let operand_kinds = if operand_kinds.is_empty() {
-        None
-    } else {
+    let operand_kinds = if ext_op_name.is_none() {
         Some(quote! {
             #[doc = "All operand kinds in the SPIR-V grammar."]
             #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
@@ -87,6 +85,15 @@ pub fn gen_grammar_inst_table_operand_kinds(
                 #(#elements),*
             }
         })
+    } else if operand_kinds.is_empty() {
+        None
+    } else {
+        let elements = elements.map(|e| quote!(const #e: u32 = 1337));
+        Some(quote! {
+            impl OperandKind {
+                #(#elements;)*
+            }
+        })
     };
 
     quote! {

rspirv/grammar/autogen_debuginfo.rs

@@ -2,15 +2,12 @@
 //   external/spirv.core.grammar.json.
 // DO NOT MODIFY!
 
-#[doc = "All operand kinds in the SPIR-V grammar."]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-#[allow(clippy::upper_case_acronyms)]
-pub enum OperandKind {
-    DebugInfoFlags,
-    DebugBaseTypeAttributeEncoding,
-    DebugCompositeType,
-    DebugTypeQualifier,
-    DebugOperation,
+impl OperandKind {
+    const DebugInfoFlags: u32 = 1337;
+    const DebugBaseTypeAttributeEncoding: u32 = 1337;
+    const DebugCompositeType: u32 = 1337;
+    const DebugTypeQualifier: u32 = 1337;
+    const DebugOperation: u32 = 1337;
 }
 static DEBUGINFO_INSTRUCTIONS: &[ExtendedInstruction<'static>] = &[
     ext_inst!(DebugInfoOp, DebugInfoNone, [], [], []),

rspirv/grammar/autogen_opencl_debuginfo_100.rs

@@ -2,16 +2,13 @@
 //   external/spirv.core.grammar.json.
 // DO NOT MODIFY!
 
-#[doc = "All operand kinds in the SPIR-V grammar."]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-#[allow(clippy::upper_case_acronyms)]
-pub enum OperandKind {
-    DebugInfoFlags,
-    DebugBaseTypeAttributeEncoding,
-    DebugCompositeType,
-    DebugTypeQualifier,
-    DebugOperation,
-    DebugImportedEntity,
+impl OperandKind {
+    const DebugInfoFlags: u32 = 1337;
+    const DebugBaseTypeAttributeEncoding: u32 = 1337;
+    const DebugCompositeType: u32 = 1337;
+    const DebugTypeQualifier: u32 = 1337;
+    const DebugOperation: u32 = 1337;
+    const DebugImportedEntity: u32 = 1337;
 }
 static OPENCL_DEBUGINFO_100_INSTRUCTIONS: &[ExtendedInstruction<'static>] = &[
     ext_inst!(CLDebugInfoOp, DebugInfoNone, [], [], []),