Changeset 3422

Timestamp:

2002-09-11T11:35:28+12:00 (22 years ago)

Author:

jrm21

Message:

Added new languages to be checked.

Cleaned up reg exps as some whitespace isn't necessary.

Use package names as well, as some macros are duplicated in different
packages.

File:

• trunk/gsdl/macros/Chktrans.pl (modified) (3 diffs)

trunk/gsdl/macros/Chktrans.pl

@@ -3 +3 @@
 use strict;
 
-my @languages = ("chinese", "french", "german", "maori");
+my @languages = ("chinese", "french", "german", "maori", "spanish", "turkish");
 
 print "
@@ -29 +29 @@
 my $count = 0;
 my %macro;
-
+my $package="";
 while (<E>) {
     chomp;
     $line = $_;
-
-    next unless ($line =~ /^_\w+_ +\{/);
-    
-    $line =~ s/ +\{.*//;
-    $macro{$line} = 1;
+    if ($line =~ /^package\s+(\w+)/) {
+    $package="$1:";
+    next;
+    }
+    next unless ($line =~ /^_\w+_ *\{/);
+    # don't necessarily have space between macro and { - eg _macro_{content}
+    $line =~ s/_\s*\{.*/_/;
+    $macro{"$package$line"} = 1;
     $count++;
 }
@@ -61 +64 @@
     my (%lm, %lmnew, %lr, %lrnew);
     my $lc = 0;
+    $package = "";
     while (<L>) {
     chomp;
     $line = $_;
     
+    if ($line =~ /^package\s+(\w+)/) {
+        $package="$1:";
+        next;
+    }
     next unless ($line =~ /^_\w+_/);
     next unless ($line =~ /\{/);
     
-    $line =~ s/ +\{.*//;
+    $line =~ s/_\s*\{.*/_/;
     # There are four types of macro, the combos of:
     #  With or without macro country code
     #  Present or not present in %macro
     if ($line =~ /\[/) {
-        $line =~ s/ .*//;
-        if (defined($macro{$line})) {
-        $lm{$line} = $line;
+# don't need a space between macro and arg (_macro_[args])
+#       $line =~ s/\s.*//;
+        $line =~ s/\s*\[.*//;
+        my $thismacro="$package$line";
+        if (defined($macro{$thismacro})) {
+        $lm{$thismacro} = $thismacro;
         } else {
-        $lmnew{$line} = $line;
+        $lmnew{$thismacro} = $thismacro;
         }
     } else {
-        if (defined($macro{$line})) {
-        $lr{$line} = $line;
+        my $thismacro="$package$line";
+        if (defined($macro{$thismacro})) {
+        $lr{$thismacro} = $thismacro;
         } else {
-        $lrnew{$line} = $line;
+        $lrnew{$thismacro} = $thismacro;
         }
     }