mirror of
https://gitlab.gnome.org/jwestman/blueprint-compiler.git
synced 2025-05-04 15:59:08 -04:00
Use <> instead of () for casts & typeof
This makes it clearer that they aren't functions, and it eliminates syntactic ambiguity with closure expressions.
This commit is contained in:
parent
d6bd282e58
commit
02796fd830
10 changed files with 66 additions and 11 deletions
|
@ -159,7 +159,17 @@ class LookupOp(InfixExpr):
|
|||
|
||||
|
||||
class CastExpr(InfixExpr):
|
||||
grammar = ["as", "(", TypeName, ")"]
|
||||
grammar = [
|
||||
"as",
|
||||
AnyOf(
|
||||
["<", TypeName, Match(">").expected()],
|
||||
[
|
||||
UseExact("lparen", "("),
|
||||
TypeName,
|
||||
UseExact("rparen", ")").expected("')'"),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
||||
@context(ValueTypeCtx)
|
||||
def value_type(self):
|
||||
|
@ -183,6 +193,19 @@ class CastExpr(InfixExpr):
|
|||
f"Invalid cast. No instance of {self.lhs.type.full_name} can be an instance of {self.type.full_name}."
|
||||
)
|
||||
|
||||
@validate("lparen", "rparen")
|
||||
def upgrade_to_angle_brackets(self):
|
||||
if self.tokens["lparen"]:
|
||||
raise UpgradeWarning(
|
||||
"Use angle bracket syntax introduced in blueprint 0.8.0",
|
||||
actions=[
|
||||
CodeAction(
|
||||
"Use <> instead of ()",
|
||||
f"<{self.children[TypeName][0].as_string}>",
|
||||
)
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
class ClosureArg(AstNode):
|
||||
grammar = ExprChain
|
||||
|
|
|
@ -89,6 +89,15 @@ class TypeName(AstNode):
|
|||
if self.gir_type:
|
||||
return self.gir_type.doc
|
||||
|
||||
@property
|
||||
def as_string(self) -> str:
|
||||
if self.tokens["extern"]:
|
||||
return "$" + self.tokens["class_name"]
|
||||
elif self.tokens["namespace"]:
|
||||
return f"{self.tokens['namespace']}.{self.tokens['class_name']}"
|
||||
else:
|
||||
return self.tokens["class_name"]
|
||||
|
||||
|
||||
class ClassName(TypeName):
|
||||
@validate("namespace", "class_name")
|
||||
|
|
|
@ -74,9 +74,18 @@ class Translated(AstNode):
|
|||
class TypeLiteral(AstNode):
|
||||
grammar = [
|
||||
"typeof",
|
||||
"(",
|
||||
to_parse_node(TypeName).expected("type name"),
|
||||
Match(")").expected(),
|
||||
AnyOf(
|
||||
[
|
||||
"<",
|
||||
to_parse_node(TypeName).expected("type name"),
|
||||
Match(">").expected(),
|
||||
],
|
||||
[
|
||||
UseExact("lparen", "("),
|
||||
to_parse_node(TypeName).expected("type name"),
|
||||
UseExact("rparen", ")").expected("')'"),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
||||
@property
|
||||
|
@ -93,6 +102,19 @@ class TypeLiteral(AstNode):
|
|||
if expected_type is not None and not isinstance(expected_type, gir.TypeType):
|
||||
raise CompileError(f"Cannot convert GType to {expected_type.full_name}")
|
||||
|
||||
@validate("lparen", "rparen")
|
||||
def upgrade_to_angle_brackets(self):
|
||||
if self.tokens["lparen"]:
|
||||
raise UpgradeWarning(
|
||||
"Use angle bracket syntax introduced in blueprint 0.8.0",
|
||||
actions=[
|
||||
CodeAction(
|
||||
"Use <> instead of ()",
|
||||
f"<{self.children[TypeName][0].as_string}>",
|
||||
)
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
class QuotedLiteral(AstNode):
|
||||
grammar = UseQuoted("value")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue