From e94e89be8592a0d6cfc418d0065f0fd876cd55b4 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Thu, 25 Oct 2018 12:32:41 -0400 Subject: [PATCH] simplify parenting logic --- OscCommentMacroListener.py | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/OscCommentMacroListener.py b/OscCommentMacroListener.py index ab697c8..677111d 100644 --- a/OscCommentMacroListener.py +++ b/OscCommentMacroListener.py @@ -58,8 +58,7 @@ class OscCommentMacroListener(CommentMacroListener): self.osc = HogDevice(servers) def exitDevice(self, ctx: CommentMacroParser.DeviceContext): - if isinstance(ctx.parentCtx, CommentMacroParser.MacroContext): - ctx.parentCtx.device = ctx + ctx.parentCtx.device = ctx def enterMacro(self, ctx: CommentMacroParser.MacroContext): ctx.device = None @@ -88,30 +87,25 @@ class OscCommentMacroListener(CommentMacroListener): ctx.targets = [] def exitMaster(self, ctx: CommentMacroParser.MasterContext): - if isinstance(ctx.parentCtx, CommentMacroParser.MacroContext): - ctx.parentCtx.master = ctx + ctx.parentCtx.master = ctx def exitNumber(self, ctx: CommentMacroParser.NumberContext): ctx.value = num(ctx.getText()) if isinstance(ctx.parentCtx, CommentMacroParser.TargetContext): ctx.parentCtx.targets.append(ctx.value) - if isinstance(ctx.parentCtx, CommentMacroParser.MacroContext): - ctx.parentCtx.number = ctx - if isinstance(ctx.parentCtx, CommentMacroParser.DeviceContext): + else: ctx.parentCtx.number = ctx def exitSpan(self, ctx: CommentMacroParser.SpanContext): number1 = ctx.children[0].value number2 = ctx.children[2].value if (isinstance(number1, int) and isinstance(number2, int)): - if isinstance(ctx.parentCtx, CommentMacroParser.TargetContext): - minimum = min(number1, number2) - maximum = max(number1, number2) - for i in (range(minimum, maximum + 1)): - ctx.parentCtx.targets.append(i) + minimum = min(number1, number2) + maximum = max(number1, number2) + for i in (range(minimum, maximum + 1)): + ctx.parentCtx.targets.append(i) else: logger.error("ERROR: Spans must be ranged with intigers.") - ctx.parentCtx.targets.append(-1) def enterTarget(self, ctx: CommentMacroParser.TargetContext): ctx.targets = []