Cope with macros with numerals in their names.

1 files changed, 3 insertions, 3 deletions

diff --git a/bin/custodian-enqueue b/bin/custodian-enqueue
index 9a261b7..3a03db7 100755
--- a/bin/custodian-enqueue
+++ b/bin/custodian-enqueue
@@ -188,7 +188,7 @@ class MonitorConfig
     #
     #  Get the name
     #
-    name = $1.dup if ( line =~ /^([A-Z_]+)\s+/ )
+    name = $1.dup if ( line =~ /^([1-2A-Z_]+)\s+/ )
 
 
     #
@@ -253,7 +253,7 @@ class MonitorConfig
   # Is the given string of text a macro?
   #
   def is_macro?( name )
-    !@MACROS[name].nil?
+    !(@MACROS[name]).nil?
   end
 
 
@@ -289,7 +289,7 @@ class MonitorConfig
     #
     #  Look for macro definitions, inline
     #
-    if ( line =~ /^([A-Z]_+)\s+are\s+fetched\s+from\s+([^\s]+)\.?/ )
+    if ( line =~ /^([0-9A-Z]_+)\s+are\s+fetched\s+from\s+([^\s]+)\.?/ )
       define_macro( line )
 
     elsif ( line =~ /^([0-9A-Z_]+)\s+(is|are)\s+/ )