Siklos/blueprint-compiler
1
0
Fork 0
mirror of https://gitlab.gnome.org/jwestman/blueprint-compiler.git synced 2025-05-04 15:59:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify Translated

Browse source 
Remove the TranslatedWithContext and TranslatedWithoutContext rules and
just use Translated.
This commit is contained in:
James Westman 2023-04-29 21:48:02 -05:00
parent 779e27d7ac
commit 3c1941a17e
3 changed files with 22 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blueprintcompiler/language/__init__.py
View file

@ -39,8 +39,6 @@ from .values import (
QuotedLiteral,
StringValue,
Translated,
TranslatedWithContext,
TranslatedWithoutContext,
TypeLiteral,
Value,
)

51
blueprintcompiler/language/values.py
View file

@ -27,40 +27,27 @@ from .gobject_object import Object
from .contexts import ScopeCtx, ValueTypeCtx
class TranslatedWithoutContext(AstNode):
grammar = ["_", "(", UseQuoted("string"), Optional(","), ")"]
@property
def string(self) -> str:
return self.tokens["string"]
class TranslatedWithContext(AstNode):
grammar = [
"C_",
"(",
UseQuoted("context"),
",",
UseQuoted("string"),
Optional(","),
")",
]
@property
def string(self) -> str:
return self.tokens["string"]
@property
def translate_context(self) -> str:
return self.tokens["context"]
class Translated(AstNode):
grammar = AnyOf(TranslatedWithoutContext, TranslatedWithContext)
grammar = AnyOf(
["_", "(", UseQuoted("string"), Optional(","), ")"],
[
"C_",
"(",
UseQuoted("context"),
",",
UseQuoted("string"),
Optional(","),
")",
],
)
@property
def child(self) -> T.Union[TranslatedWithContext, TranslatedWithoutContext]:
return self.children[0]
def string(self) -> str:
return self.tokens["string"]
@property
def translate_context(self) -> T.Optional[str]:
return self.tokens["context"]
@validate()
def validate_for_type(self) -> None:
@ -382,7 +369,7 @@ class StringValue(AstNode):
@property
def string(self) -> str:
if isinstance(self.child, Translated):
return self.child.child.string
return self.child.string
else:
return self.child.value