From 5b50090b65ada2ec718b0bacfeebef2a023e771a Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Tue, 2 May 2023 09:28:42 -0500
Subject: [PATCH] Minor code cleanup

---
 .../language/gtk_combo_box_text.py            | 21 ++++++-------------
 blueprintcompiler/language/gtk_file_filter.py |  4 +++-
 blueprintcompiler/language/gtk_layout.py      |  9 ++------
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/blueprintcompiler/language/gtk_combo_box_text.py b/blueprintcompiler/language/gtk_combo_box_text.py
index d55481d..5725041 100644
--- a/blueprintcompiler/language/gtk_combo_box_text.py
+++ b/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, ","),
         "]",
     ]
 
diff --git a/blueprintcompiler/language/gtk_file_filter.py b/blueprintcompiler/language/gtk_file_filter.py
index 668568e..daf0679 100644
--- a/blueprintcompiler/language/gtk_file_filter.py
+++ b/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):
diff --git a/blueprintcompiler/language/gtk_layout.py b/blueprintcompiler/language/gtk_layout.py
index 7616e57..cceb6c6 100644
--- a/blueprintcompiler/language/gtk_layout.py
+++ b/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")