From 5014f71915d8aa2be1f647613cd8b50834ac9975 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Thu, 25 Oct 2018 12:52:22 -0400 Subject: [PATCH] cleanup and sort functions --- OscCommentMacroListener.py | 15 ++++++++------- OscMacroDefinitions.py | 6 +++--- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/OscCommentMacroListener.py b/OscCommentMacroListener.py index 677111d..d7bd8f6 100644 --- a/OscCommentMacroListener.py +++ b/OscCommentMacroListener.py @@ -57,9 +57,6 @@ class OscCommentMacroListener(CommentMacroListener): def __init__(self, servers): self.osc = HogDevice(servers) - def exitDevice(self, ctx: CommentMacroParser.DeviceContext): - ctx.parentCtx.device = ctx - def enterMacro(self, ctx: CommentMacroParser.MacroContext): ctx.device = None ctx.number = None @@ -89,6 +86,12 @@ class OscCommentMacroListener(CommentMacroListener): def exitMaster(self, ctx: CommentMacroParser.MasterContext): ctx.parentCtx.master = ctx + def enterTarget(self, ctx: CommentMacroParser.TargetContext): + ctx.targets = [] + + def exitTarget(self, ctx: CommentMacroParser.TargetContext): + ctx.parentCtx.targets.extend(ctx.targets) # add to parent targets + def exitNumber(self, ctx: CommentMacroParser.NumberContext): ctx.value = num(ctx.getText()) if isinstance(ctx.parentCtx, CommentMacroParser.TargetContext): @@ -107,11 +110,9 @@ class OscCommentMacroListener(CommentMacroListener): else: logger.error("ERROR: Spans must be ranged with intigers.") - def enterTarget(self, ctx: CommentMacroParser.TargetContext): - ctx.targets = [] - def exitTarget(self, ctx: CommentMacroParser.TargetContext): - ctx.parentCtx.targets.extend(ctx.targets) # add to parent targets + def exitDevice(self, ctx: CommentMacroParser.DeviceContext): + ctx.parentCtx.device = ctx def exitNodeType(self, ctx: CommentMacroParser.NodeTypeContext): if isinstance(ctx.parentCtx, CommentMacroParser.DeviceContext): diff --git a/OscMacroDefinitions.py b/OscMacroDefinitions.py index 1bbe245..d3468c9 100644 --- a/OscMacroDefinitions.py +++ b/OscMacroDefinitions.py @@ -71,7 +71,7 @@ class HogDevice(): for i in ctx.master.targets: if isinstance(i, int) is not True: logger.warn("GO MASTER macro targets must be intigers. " - + str(i) + " is not an intigers.") + + str(i) + " is not an intigers.") continue if (i < 0): logger.warn("Master "+str(i)+" is not greater than 0.") @@ -89,7 +89,7 @@ class HogDevice(): for i in ctx.master.targets: if isinstance(i, int) is not True: logger.warn("GO MASTER macro targets must be intigers. " - + str(i) + " is not an intigers.") + + str(i) + " is not an intigers.") continue if (i < 0): logger.warn("Master "+str(i)+" is not greater than 0.") @@ -129,7 +129,7 @@ class HogDevice(): for i in ctx.master.targets: if isinstance(i, int) is not True: logger.warn("FADE MASTER macro targets must be intigers. " - + str(i) + " is not an intigers.") + + str(i) + " is not an intigers.") continue if (i < 0): logger.warn("Master "+str(i)+" is not greater than 0.")