Merge branch 'main' into 'main'

compile: fix flag values Closes #180 See merge request jwestman/blueprint-compiler!220
Merge branch blueprint-compiler:main into main
2025-05-04 15:59:08 -04:00 · 2025-03-02 15:26:47 +00:00 · 2025-03-02 15:26:42 +00:00 · 2024-12-18 17:46:26 +00:00 · 2024-12-18 17:46:26 +00:00 · 2024-12-18 17:46:26 +00:00
2 changed files with 3 additions and 3 deletions
--- a/blueprintcompiler/language/values.py
+++ b/blueprintcompiler/language/values.py
@ -225,12 +225,12 @@ class Flag(AstNode):
        return self.tokens["value"]

    @property
-    def value(self) -> T.Optional[int]:
+    def value(self) -> T.Optional[str]:
        type = self.context[ValueTypeCtx].value_type
        if not isinstance(type, Enumeration):
            return None
        elif member := type.members.get(self.name):
-            return member.value
+            return member.nick
        else:
            return None

--- a/tests/samples/flags.ui
+++ b/tests/samples/flags.ui
@ -7,7 +7,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
  <requires lib="gtk" version="4.0"/>
  <object class="GApplication">
-    <property name="flags">1|4</property>
+    <property name="flags">is-service|handles-open</property>
  </object>
  <object class="GtkEventControllerScroll">
    <property name="flags">1</property>
Author	SHA1	Message	Date
kotontrion	f5ffa0660d	Merge branch 'main' into 'main' compile: fix flag values Closes #180 See merge request jwestman/blueprint-compiler!220	2025-03-02 15:26:47 +00:00
kotontrion	c1fbcef6d0	Merge branch blueprint-compiler:main into main	2025-03-02 15:26:42 +00:00
kotontrion	e07da3c339	flags: use nick instead of name	2024-12-18 17:46:26 +00:00
kotontrion	2ae41020ab	Fix flag return value type	2024-12-18 17:46:26 +00:00
kotontrion	f48b840cfa	compile: fix flag values gtk builder does not support combining interger values with \| in flags properties, so the short names are used instead.	2024-12-18 17:46:26 +00:00