add variant support for menus

blueprintcompiler/language/gtk_menu.py

@@ -19,7 +19,7 @@
 
 import typing as T
 
-from blueprintcompiler.language.values import StringValue
+from blueprintcompiler.language.values import StringValue, VariantValue
 
 from .common import *
 from .contexts import ValueTypeCtx
@@ -98,8 +98,12 @@ class MenuAttribute(AstNode):
         return self.tokens["name"]
 
     @property
-    def value(self) -> StringValue:
+    def value(self) -> StringValue | VariantValue:
+        if len(self.children[StringValue]) > 0:
             return self.children[StringValue][0]
+        elif len(self.children[VariantValue]) > 0:
+            return self.children[VariantValue][0]
+        raise CompilerBugError()
 
     @property
     def document_symbol(self) -> DocumentSymbol:
@@ -133,7 +137,7 @@ menu_attribute = Group(
     [
         UseIdent("name"),
         ":",
-        Err(StringValue, "Expected string or translated string"),
+        Err(AnyOf(StringValue, VariantValue), "Expected string or translated string"),
         Match(";").expected(),
     ],
 )

blueprintcompiler/language/values.py

@@ -393,7 +393,9 @@ class VariantValue(AstNode):
     @validate()
     def validate_for_type(self) -> None:
         expected_type = self.context[ValueTypeCtx].value_type
-        if (
+        if expected_type is None:
+            pass
+        elif (
             isinstance(expected_type, gir.IntType)
             or isinstance(expected_type, gir.UIntType)
             or isinstance(expected_type, gir.FloatType)
@@ -402,7 +404,7 @@ class VariantValue(AstNode):
             raise CompileError(f"Cannot convert variant to number")
         elif isinstance(expected_type, gir.StringType):
             raise CompileError("Cannot convert variant to string")
-        if isinstance(expected_type, gir.Boxed) and expected_type.full_name == "GLib.Variant":
+        elif isinstance(expected_type, gir.Boxed) and expected_type.full_name == "GLib.Variant":
             pass
         else:
             raise CompileError(f"Cannot convert variant into {expected_type.full_name}")

blueprintcompiler/outputs/xml/__init__.py

@@ -85,6 +85,7 @@ class XmlOutput(OutputFormat):
             if isinstance(child, Menu):
                 self._emit_menu(child, xml)
             elif isinstance(child, MenuAttribute):
+                if isinstance(child.value, StringValue):
                     xml.start_tag(
                         "attribute",
                         name=child.name,
@@ -92,6 +93,15 @@ class XmlOutput(OutputFormat):
                     )
                     xml.put_text(child.value.string)
                     xml.end_tag()
+                elif isinstance(child.value, VariantValue):
+                    xml.start_tag(
+                        "attribute",
+                        name=child.name,
+                        type=child.value.var_type,
+                    )
+                    xml.put_text(child.value.var_value)
+                    xml.end_tag()
+
             else:
                 raise CompilerBugError()
         xml.end_tag()

variant-test.blp

@@ -1,5 +1,15 @@
 using Gtk 4.0;
 
+menu root {
+  submenu {
+    name: "one";
+    item {
+      action: "app.foo_bar";
+      target: variant<"s">("\"one\"");
+    }
+  }
+}
+
 Button {
   action-name: "app.shave_yak";
   action-target: variant<"y">("8");