mirror of
https://github.com/esphome/esphome.git
synced 2026-09-16 09:38:42 +00:00
Merge branch 'storage_class_optimize' into integration
This commit is contained in:
@@ -337,7 +337,7 @@ def lv_Pvariable(type, name) -> MockObj:
|
||||
"""
|
||||
if isinstance(name, str):
|
||||
name = ID(name, True, type)
|
||||
decl = VariableDeclarationExpression(type, "*", name)
|
||||
decl = VariableDeclarationExpression(type, "*", name, static=True)
|
||||
CORE.add_global(decl)
|
||||
var = MockObj(name, "->")
|
||||
CORE.register_variable(name, var)
|
||||
@@ -353,7 +353,7 @@ def lv_variable(type, name) -> MockObj:
|
||||
"""
|
||||
if isinstance(name, str):
|
||||
name = ID(name, True, type)
|
||||
decl = VariableDeclarationExpression(type, "", name)
|
||||
decl = VariableDeclarationExpression(type, "", name, static=True)
|
||||
CORE.add_global(decl)
|
||||
var = MockObj(name, ".")
|
||||
CORE.register_variable(name, var)
|
||||
|
||||
@@ -133,7 +133,7 @@ async def to_code(config):
|
||||
value_type,
|
||||
)
|
||||
var = MockObj(varid, ".")
|
||||
decl = VariableDeclarationExpression(varid.type, "", varid)
|
||||
decl = VariableDeclarationExpression(varid.type, "", varid, static=True)
|
||||
add_global(decl)
|
||||
CORE.register_variable(varid, var)
|
||||
|
||||
|
||||
@@ -51,15 +51,19 @@ class AssignmentExpression(Expression):
|
||||
|
||||
|
||||
class VariableDeclarationExpression(Expression):
|
||||
__slots__ = ("type", "modifier", "name")
|
||||
__slots__ = ("type", "modifier", "name", "static")
|
||||
|
||||
def __init__(self, type_, modifier, name):
|
||||
def __init__(
|
||||
self, type_: "MockObj", modifier: str, name: ID, *, static: bool = False
|
||||
) -> None:
|
||||
self.type = type_
|
||||
self.modifier = modifier
|
||||
self.name = name
|
||||
self.static = static
|
||||
|
||||
def __str__(self):
|
||||
return f"{self.type} {self.modifier}{self.name}"
|
||||
def __str__(self) -> str:
|
||||
prefix = "static " if self.static else ""
|
||||
return f"{prefix}{self.type} {self.modifier}{self.name}"
|
||||
|
||||
|
||||
class ExpressionList(Expression):
|
||||
@@ -522,7 +526,7 @@ def new_variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj
|
||||
obj = MockObj(id_, ".")
|
||||
if type_ is not None:
|
||||
id_.type = type_
|
||||
decl = VariableDeclarationExpression(id_.type, "", id_)
|
||||
decl = VariableDeclarationExpression(id_.type, "", id_, static=True)
|
||||
CORE.add_global(decl)
|
||||
assignment = AssignmentExpression(None, "", id_, rhs)
|
||||
CORE.add(assignment)
|
||||
@@ -544,7 +548,7 @@ def Pvariable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
|
||||
obj = MockObj(id_, "->")
|
||||
if type_ is not None:
|
||||
id_.type = type_
|
||||
decl = VariableDeclarationExpression(id_.type, "*", id_)
|
||||
decl = VariableDeclarationExpression(id_.type, "*", id_, static=True)
|
||||
CORE.add_global(decl)
|
||||
assignment = AssignmentExpression(None, None, id_, rhs)
|
||||
CORE.add(assignment)
|
||||
|
||||
Reference in New Issue
Block a user