From 8087b2919926e04ba879abdf199fddaa9cabffd6 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 23 Jan 2004 19:26:11 +0000 Subject: [PATCH] Make the parser slightly more robust against comments and other uses of the keywords. --- src/registry/registerRecordDeviceDriver.pl | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/registry/registerRecordDeviceDriver.pl b/src/registry/registerRecordDeviceDriver.pl index 8c65d364b..d316b1741 100755 --- a/src/registry/registerRecordDeviceDriver.pl +++ b/src/registry/registerRecordDeviceDriver.pl @@ -18,25 +18,22 @@ $numberRegistrar = 0; open(INP,"$file") or die "$! opening file"; while() { - if( /recordtype/) { - /recordtype\s*\(\s*(\w+)/; + next if /^\s*#/; + if (/\brecordtype\s*\(\s*(\w+)/) { $recordType[$numberRecordType++] = $1; } - if( /device/) { - /device\s*\(\s*(\s*\w+)\W+\w+\W+(\w+)/; + elsif (/\bdevice\s*\(\s*(\s*\w+)\W+\w+\W+(\w+)/) { $deviceRecordType[$numberDeviceSupport] = $1; $deviceSupport[$numberDeviceSupport] = $2; $numberDeviceSupport++; } - if( /driver/) { - /driver\s*\(\s*(\w+)/; + elsif (/\bdriver\s*\(\s*(\w+)/) { $driverSupport[$numberDriverSupport++] = $1; } - if( /registrar/) { - /registrar\s*\(\s*(\w+)/; + elsif (/\bregistrar\s*\(\s*(\w+)/) { $registrar[$numberRegistrar++] = $1; } - if (/variable\s*\(\s*(\w+)\s*,\s*(\w+)/) { + elsif (/\bvariable\s*\(\s*(\w+)\s*,\s*(\w+)/) { $varType{$1} = $2; push @variables, $1; }