diff --git a/App/lib/core/Gen/StructGenMixin.vp b/App/lib/core/Gen/StructGenMixin.vp index c140722..b50eac6 100644 --- a/App/lib/core/Gen/StructGenMixin.vp +++ b/App/lib/core/Gen/StructGenMixin.vp @@ -766,6 +766,12 @@ novirtual class StructGenMixin: bo: ast.BinOp* = ast.BinOp*(node) if self._NllMentions(bo.left, al) != 0: return 1 return self._NllMentions(bo.right, al) + if k == ast.ASTKind.BoolOp: + return self._NllListMentions(ast.BoolOp*(node).values, al) + if k == ast.ASTKind.Compare: + cp: ast.Compare* = ast.Compare*(node) + if self._NllMentions(cp.left, al) != 0: return 1 + return self._NllListMentions(cp.comparators, al) if k == ast.ASTKind.IfExp: ie: ast.IfExp* = ast.IfExp*(node) if self._NllMentions(ie.test, al) != 0: return 1 @@ -847,6 +853,12 @@ novirtual class StructGenMixin: bo: ast.BinOp* = ast.BinOp*(node) if self._NllExprUnsafe(bo.left, al) != 0: return 1 return self._NllExprUnsafe(bo.right, al) + if k == ast.ASTKind.BoolOp: + return self._NllListUnsafe(ast.BoolOp*(node).values, al) + if k == ast.ASTKind.Compare: + cp: ast.Compare* = ast.Compare*(node) + if self._NllExprUnsafe(cp.left, al) != 0: return 1 + return self._NllListUnsafe(cp.comparators, al) if k == ast.ASTKind.IfExp: ie: ast.IfExp* = ast.IfExp*(node) if self._NllExprUnsafe(ie.test, al) != 0: return 1