From 9a7cd432f73ee5d69fb1f1837d01b806c8d3b0a1 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Wed, 14 Nov 2012 13:44:48 +0000 Subject: Cope with macros with numerals in their names. --- bin/custodian-enqueue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') 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+/ ) -- cgit v1.2.1