diff --git a/CommentMacro.g4 b/CommentMacro.g4 index cd19c97..30ff890 100644 --- a/CommentMacro.g4 +++ b/CommentMacro.g4 @@ -39,41 +39,41 @@ statement : macro (':' macro)* NEWLINE? ; macro - : 'GM' ( t=target | '*' ) (dev=device)? #MasterGo - | 'GM' ( t=target | '*' ) '/' n=number (dev=device)? #MasterGoto - | 'HM' ( t=target | '*' ) (dev=device)? #MasterHalt - | 'AM' ( t=target | '*' ) (dev=device)? #MasterAssert - | 'RM' ( t=target | '*' ) (dev=device)? #MasterRelease - | 'RA' (dev=device)? #ReleaseAll - | 'RO' (dev=device)? #ReleaseOthers - | 'FM' ( t=target | '*' ) '/' n=number (f=time)? (dev=device)? #MasterFade - | 'FGM' n=number (f=time)? (dev=device)? #FadeGrandMaster - | 'CM' n=number (dev=device)? #MasterChoose - | 'GL' t=target (dev=device)? #ListGo - | 'GL' t=target '/' n=number (dev=device)? #ListGoto - | 'HL' t=target (dev=device)? #ListHalt - | 'AL' t=target (dev=device)? #ListAssert - | 'RL' t=target (dev=device)? #ListRelese - | 'GB' t=target (dev=device)? #BatchGo - | 'HB' t=target (dev=device)? #BatchHalt - | 'AB' t=target (dev=device)? #BatchAssert - | 'RB' t=target (dev=device)? #BatchRelease - | 'GS' t=target (dev=device)? #SceneGo - | 'HS' t=target (dev=device)? #SceneHalt - | 'AS' t=target (dev=device)? #SceneAssert - | 'RS' t=target (dev=device)? #SceneRelease - | 'CP' n=number (dev=device)? #PageChange - | 'CP' '+' (dev=device)? #PageNext - | 'CP' '-' (dev=device)? #PagePrev - | 'RV' n=number (dev=device)? #RecallView - | 'RN' dev=device #NodeReset - | 'GK' t=target (dev=device)? #MacroGo - | 'HK' t=target (dev=device)? #MacroHalt - | 'RK' t=target (dev=device)? #MacroStop + : 'GM' ( target | '*' ) device? #MasterGo + | 'GM' ( target | '*' ) '/' number device? #MasterGoto + | 'HM' ( target | '*' ) device? #MasterHalt + | 'AM' ( target | '*' ) device? #MasterAssert + | 'RM' ( target | '*' ) device? #MasterRelease + | 'RA' device? #ReleaseAll + | 'RO' device? #ReleaseOthers + | 'FM' ( target | '*' ) '/' n=number time? device? #MasterFade + | 'FGM' number time? device? #FadeGrandMaster + | 'CM' number device? #MasterChoose + | 'GL' target device? #ListGo + | 'GL' target '/' number device? #ListGoto + | 'HL' target device? #ListHalt + | 'AL' target device? #ListAssert + | 'RL' target device? #ListRelese + | 'GB' target device? #BatchGo + | 'HB' target device? #BatchHalt + | 'AB' target device? #BatchAssert + | 'RB' target device? #BatchRelease + | 'GS' target device? #SceneGo + | 'HS' target device? #SceneHalt + | 'AS' target device? #SceneAssert + | 'RS' target device? #SceneRelease + | 'CP' number device? #PageChange + | 'CP' '+' device? #PageNext + | 'CP' '-' device? #PagePrev + | 'RV' number device? #RecallView + | 'RN' device #NodeReset + | 'GK' target device? #MacroGo + | 'HK' target device? #MacroHalt + | 'RK' target device? #MacroStop ; -time : TIME n=number ; -device : ntype=nodeType n=number ; +time : TIME number ; +device : nodeType number ; nodeType : WHOLEHOG diff --git a/CommentMacroParser.py b/CommentMacroParser.py index 11e2f30..0911880 100644 --- a/CommentMacroParser.py +++ b/CommentMacroParser.py @@ -383,8 +383,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -407,8 +405,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -431,9 +427,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.n = None # NumberContext - self.dev = None # DeviceContext self.copyFrom(ctx) def number(self): @@ -459,9 +452,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.n = None # NumberContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -487,8 +477,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -511,8 +499,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.n = None # NumberContext - self.dev = None # DeviceContext self.copyFrom(ctx) def number(self): @@ -535,8 +521,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -559,8 +543,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -583,8 +565,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.n = None # NumberContext - self.dev = None # DeviceContext self.copyFrom(ctx) def number(self): @@ -607,8 +587,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -631,7 +609,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.dev = None # DeviceContext self.copyFrom(ctx) def device(self): @@ -651,7 +628,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.dev = None # DeviceContext self.copyFrom(ctx) def device(self): @@ -671,8 +647,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -695,8 +669,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -719,7 +691,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.dev = None # DeviceContext self.copyFrom(ctx) def device(self): @@ -739,8 +710,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -763,8 +732,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -787,10 +754,7 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext self.n = None # NumberContext - self.f = None # TimeContext - self.dev = None # DeviceContext self.copyFrom(ctx) def number(self): @@ -819,8 +783,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -843,8 +805,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -867,8 +827,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -891,8 +849,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -915,8 +871,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -939,8 +893,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -963,9 +915,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.n = None # NumberContext - self.f = None # TimeContext - self.dev = None # DeviceContext self.copyFrom(ctx) def number(self): @@ -991,8 +940,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -1015,8 +962,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -1039,8 +984,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.n = None # NumberContext - self.dev = None # DeviceContext self.copyFrom(ctx) def number(self): @@ -1063,7 +1006,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.dev = None # DeviceContext self.copyFrom(ctx) def device(self): @@ -1083,7 +1025,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.dev = None # DeviceContext self.copyFrom(ctx) def device(self): @@ -1103,8 +1044,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, ctx:ParserRuleContext): # actually a CommentMacroParser.MacroContext super().__init__(parser) - self.t = None # TargetContext - self.dev = None # DeviceContext self.copyFrom(ctx) def target(self): @@ -1143,7 +1082,7 @@ class CommentMacroParser ( Parser ): token = self._input.LA(1) if token in [CommentMacroParser.NUMBER]: self.state = 40 - localctx.t = self.target() + self.target() pass elif token in [CommentMacroParser.CURRENT]: self.state = 41 @@ -1157,7 +1096,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 44 - localctx.dev = self.device() + self.device() pass @@ -1172,7 +1111,7 @@ class CommentMacroParser ( Parser ): token = self._input.LA(1) if token in [CommentMacroParser.NUMBER]: self.state = 48 - localctx.t = self.target() + self.target() pass elif token in [CommentMacroParser.CURRENT]: self.state = 49 @@ -1184,13 +1123,13 @@ class CommentMacroParser ( Parser ): self.state = 52 self.match(CommentMacroParser.T__2) self.state = 53 - localctx.n = self.number() + self.number() self.state = 55 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 54 - localctx.dev = self.device() + self.device() pass @@ -1205,7 +1144,7 @@ class CommentMacroParser ( Parser ): token = self._input.LA(1) if token in [CommentMacroParser.NUMBER]: self.state = 58 - localctx.t = self.target() + self.target() pass elif token in [CommentMacroParser.CURRENT]: self.state = 59 @@ -1219,7 +1158,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 62 - localctx.dev = self.device() + self.device() pass @@ -1234,7 +1173,7 @@ class CommentMacroParser ( Parser ): token = self._input.LA(1) if token in [CommentMacroParser.NUMBER]: self.state = 66 - localctx.t = self.target() + self.target() pass elif token in [CommentMacroParser.CURRENT]: self.state = 67 @@ -1248,7 +1187,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 70 - localctx.dev = self.device() + self.device() pass @@ -1263,7 +1202,7 @@ class CommentMacroParser ( Parser ): token = self._input.LA(1) if token in [CommentMacroParser.NUMBER]: self.state = 74 - localctx.t = self.target() + self.target() pass elif token in [CommentMacroParser.CURRENT]: self.state = 75 @@ -1277,7 +1216,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 78 - localctx.dev = self.device() + self.device() pass @@ -1292,7 +1231,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 82 - localctx.dev = self.device() + self.device() pass @@ -1307,7 +1246,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 86 - localctx.dev = self.device() + self.device() pass @@ -1322,7 +1261,7 @@ class CommentMacroParser ( Parser ): token = self._input.LA(1) if token in [CommentMacroParser.NUMBER]: self.state = 90 - localctx.t = self.target() + self.target() pass elif token in [CommentMacroParser.CURRENT]: self.state = 91 @@ -1340,7 +1279,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if _la==CommentMacroParser.TIME: self.state = 96 - localctx.f = self.time() + self.time() self.state = 100 @@ -1348,7 +1287,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 99 - localctx.dev = self.device() + self.device() pass @@ -1359,13 +1298,13 @@ class CommentMacroParser ( Parser ): self.state = 102 self.match(CommentMacroParser.T__9) self.state = 103 - localctx.n = self.number() + self.number() self.state = 105 self._errHandler.sync(self) _la = self._input.LA(1) if _la==CommentMacroParser.TIME: self.state = 104 - localctx.f = self.time() + self.time() self.state = 108 @@ -1373,7 +1312,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 107 - localctx.dev = self.device() + self.device() pass @@ -1384,13 +1323,13 @@ class CommentMacroParser ( Parser ): self.state = 110 self.match(CommentMacroParser.T__10) self.state = 111 - localctx.n = self.number() + self.number() self.state = 113 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 112 - localctx.dev = self.device() + self.device() pass @@ -1401,13 +1340,13 @@ class CommentMacroParser ( Parser ): self.state = 115 self.match(CommentMacroParser.T__11) self.state = 116 - localctx.t = self.target() + self.target() self.state = 118 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 117 - localctx.dev = self.device() + self.device() pass @@ -1418,17 +1357,17 @@ class CommentMacroParser ( Parser ): self.state = 120 self.match(CommentMacroParser.T__11) self.state = 121 - localctx.t = self.target() + self.target() self.state = 122 self.match(CommentMacroParser.T__2) self.state = 123 - localctx.n = self.number() + self.number() self.state = 125 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 124 - localctx.dev = self.device() + self.device() pass @@ -1439,13 +1378,13 @@ class CommentMacroParser ( Parser ): self.state = 127 self.match(CommentMacroParser.T__12) self.state = 128 - localctx.t = self.target() + self.target() self.state = 130 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 129 - localctx.dev = self.device() + self.device() pass @@ -1456,13 +1395,13 @@ class CommentMacroParser ( Parser ): self.state = 132 self.match(CommentMacroParser.T__13) self.state = 133 - localctx.t = self.target() + self.target() self.state = 135 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 134 - localctx.dev = self.device() + self.device() pass @@ -1473,13 +1412,13 @@ class CommentMacroParser ( Parser ): self.state = 137 self.match(CommentMacroParser.T__14) self.state = 138 - localctx.t = self.target() + self.target() self.state = 140 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 139 - localctx.dev = self.device() + self.device() pass @@ -1490,13 +1429,13 @@ class CommentMacroParser ( Parser ): self.state = 142 self.match(CommentMacroParser.T__15) self.state = 143 - localctx.t = self.target() + self.target() self.state = 145 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 144 - localctx.dev = self.device() + self.device() pass @@ -1507,13 +1446,13 @@ class CommentMacroParser ( Parser ): self.state = 147 self.match(CommentMacroParser.T__16) self.state = 148 - localctx.t = self.target() + self.target() self.state = 150 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 149 - localctx.dev = self.device() + self.device() pass @@ -1524,13 +1463,13 @@ class CommentMacroParser ( Parser ): self.state = 152 self.match(CommentMacroParser.T__17) self.state = 153 - localctx.t = self.target() + self.target() self.state = 155 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 154 - localctx.dev = self.device() + self.device() pass @@ -1541,13 +1480,13 @@ class CommentMacroParser ( Parser ): self.state = 157 self.match(CommentMacroParser.T__18) self.state = 158 - localctx.t = self.target() + self.target() self.state = 160 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 159 - localctx.dev = self.device() + self.device() pass @@ -1558,13 +1497,13 @@ class CommentMacroParser ( Parser ): self.state = 162 self.match(CommentMacroParser.T__19) self.state = 163 - localctx.t = self.target() + self.target() self.state = 165 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 164 - localctx.dev = self.device() + self.device() pass @@ -1575,13 +1514,13 @@ class CommentMacroParser ( Parser ): self.state = 167 self.match(CommentMacroParser.T__20) self.state = 168 - localctx.t = self.target() + self.target() self.state = 170 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 169 - localctx.dev = self.device() + self.device() pass @@ -1592,13 +1531,13 @@ class CommentMacroParser ( Parser ): self.state = 172 self.match(CommentMacroParser.T__21) self.state = 173 - localctx.t = self.target() + self.target() self.state = 175 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 174 - localctx.dev = self.device() + self.device() pass @@ -1609,13 +1548,13 @@ class CommentMacroParser ( Parser ): self.state = 177 self.match(CommentMacroParser.T__22) self.state = 178 - localctx.t = self.target() + self.target() self.state = 180 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 179 - localctx.dev = self.device() + self.device() pass @@ -1626,13 +1565,13 @@ class CommentMacroParser ( Parser ): self.state = 182 self.match(CommentMacroParser.T__23) self.state = 183 - localctx.n = self.number() + self.number() self.state = 185 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 184 - localctx.dev = self.device() + self.device() pass @@ -1649,7 +1588,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 189 - localctx.dev = self.device() + self.device() pass @@ -1666,7 +1605,7 @@ class CommentMacroParser ( Parser ): _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 194 - localctx.dev = self.device() + self.device() pass @@ -1677,13 +1616,13 @@ class CommentMacroParser ( Parser ): self.state = 197 self.match(CommentMacroParser.T__26) self.state = 198 - localctx.n = self.number() + self.number() self.state = 200 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 199 - localctx.dev = self.device() + self.device() pass @@ -1694,7 +1633,7 @@ class CommentMacroParser ( Parser ): self.state = 202 self.match(CommentMacroParser.T__27) self.state = 203 - localctx.dev = self.device() + self.device() pass elif la_ == 29: @@ -1703,13 +1642,13 @@ class CommentMacroParser ( Parser ): self.state = 204 self.match(CommentMacroParser.T__28) self.state = 205 - localctx.t = self.target() + self.target() self.state = 207 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 206 - localctx.dev = self.device() + self.device() pass @@ -1720,13 +1659,13 @@ class CommentMacroParser ( Parser ): self.state = 209 self.match(CommentMacroParser.T__29) self.state = 210 - localctx.t = self.target() + self.target() self.state = 212 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 211 - localctx.dev = self.device() + self.device() pass @@ -1737,13 +1676,13 @@ class CommentMacroParser ( Parser ): self.state = 214 self.match(CommentMacroParser.T__30) self.state = 215 - localctx.t = self.target() + self.target() self.state = 217 self._errHandler.sync(self) _la = self._input.LA(1) if (((_la) & ~0x3f) == 0 and ((1 << _la) & ((1 << CommentMacroParser.WHOLEHOG) | (1 << CommentMacroParser.DP8K) | (1 << CommentMacroParser.IOP))) != 0): self.state = 216 - localctx.dev = self.device() + self.device() pass @@ -1762,7 +1701,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): super().__init__(parent, invokingState) self.parser = parser - self.n = None # NumberContext def TIME(self): return self.getToken(CommentMacroParser.TIME, 0) @@ -1794,7 +1732,7 @@ class CommentMacroParser ( Parser ): self.state = 221 self.match(CommentMacroParser.TIME) self.state = 222 - localctx.n = self.number() + self.number() except RecognitionException as re: localctx.exception = re self._errHandler.reportError(self, re) @@ -1808,8 +1746,6 @@ class CommentMacroParser ( Parser ): def __init__(self, parser, parent:ParserRuleContext=None, invokingState:int=-1): super().__init__(parent, invokingState) self.parser = parser - self.ntype = None # NodeTypeContext - self.n = None # NumberContext def nodeType(self): return self.getTypedRuleContext(CommentMacroParser.NodeTypeContext,0) @@ -1840,9 +1776,9 @@ class CommentMacroParser ( Parser ): try: self.enterOuterAlt(localctx, 1) self.state = 224 - localctx.ntype = self.nodeType() + self.nodeType() self.state = 225 - localctx.n = self.number() + self.number() except RecognitionException as re: localctx.exception = re self._errHandler.reportError(self, re) diff --git a/OscCommentMacroListener.py b/OscCommentMacroListener.py index 2259688..723c8f7 100644 --- a/OscCommentMacroListener.py +++ b/OscCommentMacroListener.py @@ -67,16 +67,16 @@ class HogDevice(): # send python-osc messages def send(self, device, msg): if device is None: - osc = list(self.servers.values())[0] + osc = list(self.servers.values())[0] # first configured server else: - if (device.ntype.getText().lower() != 'h'): + if (device.nodeType().getText().lower() != 'h'): logger.error("ERROR: Only Hog type devices are supported.") return else: try: - osc = self.servers[device.n.value] + osc = self.servers[device.number().value] except KeyError: - logger.error("ERROR: Net# " + str(device.n.value) + + logger.error("ERROR: Net# " + str(device.number().value) + " not found.") return try: @@ -122,11 +122,11 @@ class OscCommentMacroListener(CommentMacroListener): logger.error("ERROR: Spans must be ranged with intigers.") def exitMasterGo(self, ctx: CommentMacroParser.MasterGoContext): - if ctx.t is None: + if ctx.target() is None: logger.info("Main GO") - self.osc.button_press(ctx.dev, "/hog/hardware/maingo") + self.osc.button_press(ctx.device(), "/hog/hardware/maingo") return - for i in ctx.t.targets: + for i in ctx.target().targets: if isinstance(i, int) is not True: logger.warn("GO MASTER macro targets must be intigers. " + str(i) + " is not an intigers.") @@ -136,14 +136,14 @@ class OscCommentMacroListener(CommentMacroListener): continue master = str(i) logger.info("GO on master " + master) - self.osc.button_press(ctx.dev, "/hog/hardware/go/" + master) + self.osc.button_press(ctx.device(), "/hog/hardware/go/" + master) def exitMasterHalt(self, ctx: CommentMacroParser.MasterHaltContext): - if ctx.t is None: + if ctx.target() is None: logger.info("Main HALT") - self.osc.button_press(ctx.dev, "/hog/hardware/mainhalt") + self.osc.button_press(ctx.device(), "/hog/hardware/mainhalt") return - for i in ctx.t.targets: + for i in ctx.target().targets: if isinstance(i, int) is not True: logger.warn("GO MASTER macro targets must be intigers. " + str(i) + " is not an intigers.") @@ -153,31 +153,31 @@ class OscCommentMacroListener(CommentMacroListener): continue master = str(i) logger.info("HALT on master " + master) - self.osc.button_press(ctx.dev, "/hog/hardware/pause/" + master) + self.osc.button_press(ctx.device(), "/hog/hardware/pause/" + master) def exitMasterAssert(self, ctx: CommentMacroParser.MasterAssertContext): - if ctx.t is None: + if ctx.target()is None: logger.error("ERROR: limited to asserting current master only.") return logger.info("ASSERT on current master.") - self.osc.button_press(ctx.dev, "/hog/hardware/assert") + self.osc.button_press(ctx.device(), "/hog/hardware/assert") def exitMasterRelease(self, ctx: CommentMacroParser.MasterReleaseContext): - if ctx.t is None: + if ctx.target()is None: logger.error("ERROR: limited to releasing current master only.") return logger.info("RELEASE on current master.") - self.osc.button_press(ctx.dev, "/hog/hardware/release") + self.osc.button_press(ctx.device(), "/hog/hardware/release") def exitMasterFade(self, ctx: CommentMacroParser.MasterFadeContext): - if ctx.t is None: + if ctx.target()is None: logger.error("ERROR: limited to fading current master only.") return - level = ctx.n.value + level = ctx.number().value if (level < 0 or level > 100): logger.error("Level must be between 0 and 100.") return - for i in ctx.t.targets: + for i in ctx.target().targets: if isinstance(i, int) is not True: logger.warn("FADE MASTER macro targets must be intigers. " + str(i) + " is not an intigers.") @@ -188,91 +188,91 @@ class OscCommentMacroListener(CommentMacroListener): master = str(i) logger.info("Fade Master "+master+" to "+str(level)+"%") level *= 255 / 100 # percent in Macro, 0>255 in OSC - self.osc.send_message(ctx.dev, + self.osc.send_message(ctx.device(), "/hog/hardware/fader/" + master, level) def exitFadeGrandMaster(self, ctx: CommentMacroParser.FadeGrandMasterContext): - level = ctx.n.value + level = ctx.number().value if (level < 0 or level > 100): logger.error("Level must be between 0 and 100.") return logger.info("Fading Grand Master to " + str(level) + "%") level *= 255 / 100 # percent in Macro, 0>255 in OSC - self.osc.send_message(ctx.dev, "/hog/hardware/fader/0", level) + self.osc.send_message(ctx.device(), "/hog/hardware/fader/0", level) def exitMasterChoose(self, ctx: CommentMacroParser.MasterChooseContext): - if (ctx.n.value < 0): + if (ctx.number().value < 0): logger.error("Master must be greater than 0.") return - master = str(ctx.n.value) + master = str(ctx.number().value) logger.info("Choose Master " + master) - self.osc.button_press(ctx.dev, "/hog/hardware/choose/" + master) + self.osc.button_press(ctx.device(), "/hog/hardware/choose/" + master) def exitReleaseAll(self, ctx: CommentMacroParser.ReleaseAllContext): logger.info("Release All") - self.osc.send_message(ctx.dev, "/hog/hardware/pig", + self.osc.send_message(ctx.device(), "/hog/hardware/pig", self.osc.buttonDOWN) - self.osc.button_press(ctx.dev, "/hog/hardware/release") - self.osc.send_message(ctx.dev, "/hog/hardware/pig", + self.osc.button_press(ctx.device(), "/hog/hardware/release") + self.osc.send_message(ctx.device(), "/hog/hardware/pig", self.osc.buttonUP) def exitListGo(self, ctx: CommentMacroParser.ListGoContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Go on List " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/go/0", i) + self.osc.send_message(ctx.device(), "/hog/playback/go/0", i) def exitListGoto(self, ctx: CommentMacroParser.ListGotoContext): - for i in ctx.t.targets: - list = str(i) + "." + str(ctx.n.value) + for i in ctx.target().targets: + list = str(i) + "." + str(ctx.number().value) logger.info("Go on List " + str(list)) - self.osc.send_message(ctx.dev, "/hog/playback/go/0", list) + self.osc.send_message(ctx.device(), "/hog/playback/go/0", list) def exitListHalt(self, ctx: CommentMacroParser.ListHaltContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Halting List " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/halt/0", i) + self.osc.send_message(ctx.device(), "/hog/playback/halt/0", i) def exitListRelese(self, ctx: CommentMacroParser.ListReleseContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Releasing List " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/release/0", i) + self.osc.send_message(ctx.device(), "/hog/playback/release/0", i) def exitSceneGo(self, ctx: CommentMacroParser.SceneGoContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Go on Scene " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/go/1", i) + self.osc.send_message(ctx.device(), "/hog/playback/go/1", i) def exitSceneHalt(self, ctx: CommentMacroParser.SceneHaltContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Halt Scene " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/halt/1", i) + self.osc.send_message(ctx.device(), "/hog/playback/halt/1", i) def exitSceneRelease(self, ctx: CommentMacroParser.SceneReleaseContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Release Scene " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/release/1", i) + self.osc.send_message(ctx.device(), "/hog/playback/release/1", i) def exitMacroGo(self, ctx: CommentMacroParser.MacroGoContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Go on Macro " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/go/2", i) + self.osc.send_message(ctx.device(), "/hog/playback/go/2", i) def exitMacroHalt(self, ctx: CommentMacroParser.MacroHaltContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Pause Macro " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/halt/2", i) + self.osc.send_message(ctx.device(), "/hog/playback/halt/2", i) def exitMacroStop(self, ctx: CommentMacroParser.MacroStopContext): - for i in ctx.t.targets: + for i in ctx.target().targets: logger.info("Stop Macro " + str(i)) - self.osc.send_message(ctx.dev, "/hog/playback/release/2", i) + self.osc.send_message(ctx.device(), "/hog/playback/release/2", i) def exitPageNext(self, ctx: CommentMacroParser.PageNextContext): logger.info("Next Page") - self.osc.button_press(ctx.dev, "/hog/hardware/nextpage") + self.osc.button_press(ctx.device(), "/hog/hardware/nextpage") def exitPagePrev(self, ctx: CommentMacroParser.PagePrevContext): logger.info("Prev Page") - self.osc.button_press(ctx.dev, "/hog/hardware/backpage") + self.osc.button_press(ctx.device(), "/hog/hardware/backpage")