Minor code cleanup

blueprintcompiler/language/gtk_combo_box_text.py

@@ -25,6 +25,11 @@ from .values import StringValue
 
 
 class Item(AstNode):
+    grammar = [
+        Optional([UseIdent("name"), ":"]),
+        StringValue,
+    ]
+
     @property
     def name(self) -> str:
         return self.tokens["name"]
@@ -34,25 +39,11 @@ class Item(AstNode):
         return self.children[StringValue][0]
 
 
-item = Group(
-    Item,
-    [
-        Optional(
-            [
-                UseIdent("name"),
-                ":",
-            ]
-        ),
-        StringValue,
-    ],
-)
-
-
 class ExtComboBoxItems(AstNode):
     grammar = [
         Keyword("items"),
         "[",
-        Delimited(item, ","),
+        Delimited(Item, ","),
         "]",
     ]
 

blueprintcompiler/language/gtk_file_filter.py

@@ -42,7 +42,9 @@ class Filters(AstNode):
 
 
 class FilterString(AstNode):
-    pass
+    @property
+    def item(self) -> str:
+        return self.tokens["name"]
 
 
 def create_node(tag_name: str, singular: str):

blueprintcompiler/language/gtk_layout.py

@@ -25,6 +25,7 @@ from .values import Value
 
 
 class LayoutProperty(AstNode):
+    grammar = Statement(UseIdent("name"), ":", Err(Value, "Expected a value"))
     tag_name = "property"
 
     @property
@@ -48,17 +49,11 @@ class LayoutProperty(AstNode):
         )
 
 
-layout_prop = Group(
-    LayoutProperty,
-    Statement(UseIdent("name"), ":", Err(Value, "Expected a value")),
-)
-
-
 class ExtLayout(AstNode):
     grammar = Sequence(
         Keyword("layout"),
         "{",
-        Until(layout_prop, "}"),
+        Until(LayoutProperty, "}"),
     )
 
     @validate("layout")