Add properties to AST types

I want to have a cleaner API that relies less on the specifics of the
grammar and parser.
This commit is contained in:
James Westman 2023-01-09 21:55:14 -06:00
parent 0b7dbaf90d
commit 6938267952
No known key found for this signature in database
GPG key ID: CE2DBA0ADB654EA6
4 changed files with 34 additions and 10 deletions

View file

@ -39,6 +39,10 @@ class Menu(AstNode):
def tag(self) -> str:
return self.tokens["tag"]
@property
def items(self) -> T.List[T.Union["Menu", "MenuAttribute"]]:
return self.children
@validate("menu")
def has_id(self):
if self.tokens["tag"] == "menu" and self.tokens["id"] is None:

View file

@ -22,7 +22,7 @@ from .. import gir
from .imports import GtkDirective, Import
from .gtkbuilder_template import Template
from .gobject_object import Object
from .gtk_menu import menu
from .gtk_menu import menu, Menu
from .common import *
@ -64,6 +64,24 @@ class UI(AstNode):
return gir_ctx
@property
def using(self) -> T.List[Import]:
return self.children[Import]
@property
def gtk_decl(self) -> GtkDirective:
return self.children[GtkDirective][0]
@property
def contents(self) -> T.List[T.Union[Object, Template, Menu]]:
return [
child
for child in self.children
if isinstance(child, Object)
or isinstance(child, Template)
or isinstance(child, Menu)
]
@property
def objects_by_id(self):
return {

View file

@ -203,6 +203,10 @@ class Flag(AstNode):
class FlagsValue(Value):
grammar = [Flag, "|", Delimited(Flag, "|")]
@property
def flags(self) -> T.List[Flag]:
return self.children
@validate()
def parent_is_bitfield(self):
type = self.parent.value_type

View file

@ -14,12 +14,10 @@ class XmlOutput(OutputFormat):
def _emit_ui(self, ui: UI, xml: XmlEmitter):
xml.start_tag("interface")
for x in ui.children:
if isinstance(x, GtkDirective):
self._emit_gtk_directive(x, xml)
elif isinstance(x, Import):
pass
elif isinstance(x, Template):
self._emit_gtk_directive(ui.gtk_decl, xml)
for x in ui.contents:
if isinstance(x, Template):
self._emit_template(x, xml)
elif isinstance(x, Object):
self._emit_object(x, xml)
@ -74,7 +72,7 @@ class XmlOutput(OutputFormat):
def _emit_menu(self, menu: Menu, xml: XmlEmitter):
xml.start_tag(menu.tag, id=menu.id)
for child in menu.children:
for child in menu.items:
if isinstance(child, Menu):
self._emit_menu(child, xml)
elif isinstance(child, MenuAttribute):
@ -167,7 +165,7 @@ class XmlOutput(OutputFormat):
xml.put_text(value.value)
elif isinstance(value, FlagsValue):
xml.put_text(
"|".join([str(flag.value or flag.name) for flag in value.children])
"|".join([str(flag.value or flag.name) for flag in value.flags])
)
elif isinstance(value, TranslatedStringValue):
raise CompilerBugError("translated values must be handled in the parent")
@ -177,7 +175,7 @@ class XmlOutput(OutputFormat):
raise CompilerBugError()
def _emit_expression(self, expression: ExprChain, xml: XmlEmitter):
self._emit_expression_part(expression.children[-1], xml)
self._emit_expression_part(expression.last, xml)
def _emit_expression_part(self, expression: Expr, xml: XmlEmitter):
if isinstance(expression, IdentExpr):