refactor values of bare numbers

OscCommentMacroListener.py

@@ -25,9 +25,9 @@ def num(string):
 
 
 def _master_go(self, ctx):
-    if ctx.number is not None:
+    if ctx.number.value is not None:
         print("GO MASTER doesn't support goto.  "
-              + "Cue number " + str(ctx.number) + " will be ignored.")
+              + "Cue number " + str(ctx.number.value) + " will be ignored.")
 
     if (len(ctx.master.targets) == 0):
         print("Main GO")
@@ -69,7 +69,7 @@ def _master_halt(self, ctx):
 
 
 def _master_fade(self, ctx):
-    level = ctx.number
+    level = ctx.number.value
     if (level < 0 or level > 100):
         print("Level must be between 0 and 100.")
         return -1
@@ -93,7 +93,7 @@ def _master_fade(self, ctx):
 
 
 def _master_fade_grand(self, ctx):
-    level = ctx.number
+    level = ctx.number.value
     if (level < 0 or level > 100):
         print("Level must be between 0 and 100.")
         return -1
@@ -103,11 +103,11 @@ def _master_fade_grand(self, ctx):
     return 1
 
 
-def _master_choose(self, expr):
-    if (expr.number < 0):
+def _master_choose(self, ctx):
+    if (ctx.number.value < 0):
         print("Master must be greater than 0.")
         return -1
-    master = str(expr.number)
+    master = str(ctx.number.value)
     print("Choose Master " + master)
     button_press(self.server.osc, "/hog/hardware/choose/" + master)
     return 1
@@ -212,15 +212,15 @@ class OscCommentMacroListener(CommentMacroListener):
             ctx.parentCtx.master = ctx
 
     def exitNumber(self, ctx: CommentMacroParser.NumberContext):
-        number = num(ctx.getText())
+        ctx.value = num(ctx.getText())
         if isinstance(ctx.parentCtx, CommentMacroParser.TargetContext):
-            ctx.parentCtx.targets.append(number)
+            ctx.parentCtx.targets.append(ctx.value)
         if isinstance(ctx.parentCtx, CommentMacroParser.MacroContext):
-            ctx.parentCtx.number = number
+            ctx.parentCtx.number = ctx
 
     def exitSpan(self, ctx: CommentMacroParser.SpanContext):
-        number1 = num(ctx.children[0].getText())
-        number2 = num(ctx.children[2].getText())
+        number1 = ctx.children[0].value
+        number2 = ctx.children[2].value
         if isinstance(ctx.parentCtx, CommentMacroParser.TargetContext):
             for i in (range(min(number1, number2), max(number1, number2) + 1)):
                 ctx.parentCtx.targets.append(i)