Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-22 11:47:30 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused obj attribute from AssignmentExpression (#3145)

Browse Source
This commit is contained in:
Otto Winter 2022-02-09 14:56:42 +01:00 committed by GitHub
parent b48490badc
commit 35e6a13cd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
esphome/cpp_generator.py
View File

@ -62,14 +62,13 @@ class RawExpression(Expression):
class AssignmentExpression(Expression): class AssignmentExpression(Expression):
__slots__ = ("type", "modifier", "name", "rhs", "obj") __slots__ = ("type", "modifier", "name", "rhs")
def __init__(self, type_, modifier, name, rhs, obj): def __init__(self, type_, modifier, name, rhs):
self.type = type_ self.type = type_
self.modifier = modifier self.modifier = modifier
self.name = name self.name = name
self.rhs = safe_exp(rhs) self.rhs = safe_exp(rhs)
self.obj = obj
def __str__(self): def __str__(self):
if self.type is None: if self.type is None:
@ -427,8 +426,8 @@ class LineComment(Statement):
class ProgmemAssignmentExpression(AssignmentExpression): class ProgmemAssignmentExpression(AssignmentExpression):
__slots__ = () __slots__ = ()
def __init__(self, type_, name, rhs, obj): def __init__(self, type_, name, rhs):
super().__init__(type_, "", name, rhs, obj) super().__init__(type_, "", name, rhs)
def __str__(self): def __str__(self):
return f"static const {self.type} {self.name}[] PROGMEM = {self.rhs}" return f"static const {self.type} {self.name}[] PROGMEM = {self.rhs}"
@ -437,8 +436,8 @@ class ProgmemAssignmentExpression(AssignmentExpression):
class StaticConstAssignmentExpression(AssignmentExpression): class StaticConstAssignmentExpression(AssignmentExpression):
__slots__ = () __slots__ = ()
def __init__(self, type_, name, rhs, obj): def __init__(self, type_, name, rhs):
super().__init__(type_, "", name, rhs, obj) super().__init__(type_, "", name, rhs)
def __str__(self): def __str__(self):
return f"static const {self.type} {self.name}[] = {self.rhs}" return f"static const {self.type} {self.name}[] = {self.rhs}"
@ -447,7 +446,7 @@ class StaticConstAssignmentExpression(AssignmentExpression):
def progmem_array(id_, rhs) -> "MockObj": def progmem_array(id_, rhs) -> "MockObj":
rhs = safe_exp(rhs) rhs = safe_exp(rhs)
obj = MockObj(id_, ".") obj = MockObj(id_, ".")
assignment = ProgmemAssignmentExpression(id_.type, id_, rhs, obj) assignment = ProgmemAssignmentExpression(id_.type, id_, rhs)
CORE.add(assignment) CORE.add(assignment)
CORE.register_variable(id_, obj) CORE.register_variable(id_, obj)
return obj return obj
@ -456,7 +455,7 @@ def progmem_array(id_, rhs) -> "MockObj":
def static_const_array(id_, rhs) -> "MockObj": def static_const_array(id_, rhs) -> "MockObj":
rhs = safe_exp(rhs) rhs = safe_exp(rhs)
obj = MockObj(id_, ".") obj = MockObj(id_, ".")
assignment = StaticConstAssignmentExpression(id_.type, id_, rhs, obj) assignment = StaticConstAssignmentExpression(id_.type, id_, rhs)
CORE.add(assignment) CORE.add(assignment)
CORE.register_variable(id_, obj) CORE.register_variable(id_, obj)
return obj return obj
@ -484,7 +483,7 @@ def variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
obj = MockObj(id_, ".") obj = MockObj(id_, ".")
if type_ is not None: if type_ is not None:
id_.type = type_ id_.type = type_
assignment = AssignmentExpression(id_.type, "", id_, rhs, obj) assignment = AssignmentExpression(id_.type, "", id_, rhs)
CORE.add(assignment) CORE.add(assignment)
CORE.register_variable(id_, obj) CORE.register_variable(id_, obj)
return obj return obj
@ -507,7 +506,7 @@ def new_variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj
id_.type = type_ id_.type = type_
decl = VariableDeclarationExpression(id_.type, "", id_) decl = VariableDeclarationExpression(id_.type, "", id_)
CORE.add_global(decl) CORE.add_global(decl)
assignment = AssignmentExpression(None, "", id_, rhs, obj) assignment = AssignmentExpression(None, "", id_, rhs)
CORE.add(assignment) CORE.add(assignment)
CORE.register_variable(id_, obj) CORE.register_variable(id_, obj)
return obj return obj
@ -529,7 +528,7 @@ def Pvariable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
id_.type = type_ id_.type = type_
decl = VariableDeclarationExpression(id_.type, "*", id_) decl = VariableDeclarationExpression(id_.type, "*", id_)
CORE.add_global(decl) CORE.add_global(decl)
assignment = AssignmentExpression(None, None, id_, rhs, obj) assignment = AssignmentExpression(None, None, id_, rhs)
CORE.add(assignment) CORE.add(assignment)
CORE.register_variable(id_, obj) CORE.register_variable(id_, obj)
return obj return obj

8
tests/unit_tests/test_cpp_generator.py
View File

@ -13,9 +13,9 @@ class TestExpressions:
"target, expected", "target, expected",
( (
(cg.RawExpression("foo && bar"), "foo && bar"), (cg.RawExpression("foo && bar"), "foo && bar"),
(cg.AssignmentExpression(None, None, "foo", "bar", None), 'foo = "bar"'), (cg.AssignmentExpression(None, None, "foo", "bar"), 'foo = "bar"'),
(cg.AssignmentExpression(ct.float_, "*", "foo", 1, None), "float *foo = 1"), (cg.AssignmentExpression(ct.float_, "*", "foo", 1), "float *foo = 1"),
(cg.AssignmentExpression(ct.float_, "", "foo", 1, None), "float foo = 1"), (cg.AssignmentExpression(ct.float_, "", "foo", 1), "float foo = 1"),
(cg.VariableDeclarationExpression(ct.int32, "*", "foo"), "int32_t *foo"), (cg.VariableDeclarationExpression(ct.int32, "*", "foo"), "int32_t *foo"),
(cg.VariableDeclarationExpression(ct.int32, "", "foo"), "int32_t foo"), (cg.VariableDeclarationExpression(ct.int32, "", "foo"), "int32_t foo"),
(cg.ParameterExpression(ct.std_string, "foo"), "std::string foo"), (cg.ParameterExpression(ct.std_string, "foo"), "std::string foo"),
@ -274,7 +274,7 @@ class TestStatements:
"// Help help\n// I'm being repressed", "// Help help\n// I'm being repressed",
), ),
( (
cg.ProgmemAssignmentExpression(ct.uint16, "foo", "bar", None), cg.ProgmemAssignmentExpression(ct.uint16, "foo", "bar"),
'static const uint16_t foo[] PROGMEM = "bar"', 'static const uint16_t foo[] PROGMEM = "bar"',
), ),
), ),