mirror of
https://gitlab.gnome.org/jwestman/blueprint-compiler.git
synced 2025-05-04 15:59:08 -04:00
Implement array value
Adds ArrayValue docs, and tests for diagnostics.
This commit is contained in:
parent
f1cf70b6eb
commit
14be727777
12 changed files with 115 additions and 4 deletions
|
@ -41,6 +41,7 @@ from .imports import GtkDirective, Import
|
|||
from .types import ClassName
|
||||
from .ui import UI
|
||||
from .values import (
|
||||
ArrayValue,
|
||||
Flag,
|
||||
Flags,
|
||||
IdentLiteral,
|
||||
|
|
|
@ -22,18 +22,20 @@ from .binding import Binding
|
|||
from .common import *
|
||||
from .contexts import ValueTypeCtx
|
||||
from .gtkbuilder_template import Template
|
||||
from .values import ObjectValue, Value
|
||||
from .values import ArrayValue, ObjectValue, Value
|
||||
|
||||
|
||||
class Property(AstNode):
|
||||
grammar = Statement(UseIdent("name"), ":", AnyOf(Binding, ObjectValue, Value))
|
||||
grammar = Statement(
|
||||
UseIdent("name"), ":", AnyOf(Binding, ObjectValue, Value, ArrayValue)
|
||||
)
|
||||
|
||||
@property
|
||||
def name(self) -> str:
|
||||
return self.tokens["name"]
|
||||
|
||||
@property
|
||||
def value(self) -> T.Union[Binding, ObjectValue, Value]:
|
||||
def value(self) -> T.Union[Binding, ObjectValue, Value, ArrayValue]:
|
||||
return self.children[0]
|
||||
|
||||
@property
|
||||
|
|
|
@ -19,6 +19,8 @@
|
|||
|
||||
import typing as T
|
||||
|
||||
from blueprintcompiler.gir import ArrayType
|
||||
|
||||
from .common import *
|
||||
from .contexts import ScopeCtx, ValueTypeCtx
|
||||
from .gobject_object import Object
|
||||
|
@ -395,6 +397,54 @@ class Value(AstNode):
|
|||
return self.children[0]
|
||||
|
||||
|
||||
class ArrayValue(AstNode):
|
||||
grammar = ["[", Delimited(Value, ","), "]"]
|
||||
|
||||
@validate()
|
||||
def validate_for_type(self) -> None:
|
||||
expected_type = self.gir_type
|
||||
if expected_type is not None and not isinstance(expected_type, gir.ArrayType):
|
||||
raise CompileError(f"Cannot assign array to {expected_type.full_name}")
|
||||
|
||||
if expected_type is not None and not isinstance(
|
||||
expected_type.inner, StringType
|
||||
):
|
||||
raise CompileError("Only string arrays are supported")
|
||||
|
||||
@validate()
|
||||
def validate_invalid_newline(self) -> None:
|
||||
expected_type = self.gir_type
|
||||
if expected_type is not None and isinstance(expected_type.inner, StringType):
|
||||
errors = []
|
||||
for value in self.values:
|
||||
if isinstance(value.child, Literal) and isinstance(
|
||||
value.child.value, QuotedLiteral
|
||||
):
|
||||
quoted_literal = value.child.value
|
||||
literal_value = quoted_literal.value
|
||||
if "\n" in literal_value:
|
||||
errors.append(
|
||||
CompileError(
|
||||
"String literals inside arrays can't contain newlines",
|
||||
range=quoted_literal.range,
|
||||
)
|
||||
)
|
||||
if len(errors) > 0:
|
||||
raise MultipleErrors(errors)
|
||||
|
||||
@property
|
||||
def values(self) -> T.List[Value]:
|
||||
return self.children
|
||||
|
||||
@property
|
||||
def gir_type(self):
|
||||
return self.parent.context[ValueTypeCtx].value_type
|
||||
|
||||
@context(ValueTypeCtx)
|
||||
def child_value(self):
|
||||
return ValueTypeCtx(self.gir_type.inner)
|
||||
|
||||
|
||||
class StringValue(AstNode):
|
||||
grammar = AnyOf(Translated, QuotedLiteral)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue