New upstream version 2020.12.07

[deb_pkgs/scowl.git] / src / add-affixes

diff --git a/src/add-affixes b/src/add-affixes
index 814e35f8e76086ab54a3e5ebb0716ec0e84e02d3..aaeff6b355acb9b632acc8a7498c2f2e3531b708 100755 (executable)
--- a/src/add-affixes
+++ b/src/add-affixes
@@ -37,7 +37,7 @@ my %possessive_cross;
 while (<F>) {
   s/\r?\n$// or die;
   # (flags, base word, part of speach, infl forms)
-  my ($d,$w,$p,$a) = /^([-@\+]?)(\w+) (.).*: ?(.*)$/ or die "Bad line: >$_<";
+  my ($d,$w,$p,$a) = /^([-@\+\!]*)(\w+) (.).*: ?(.*)$/ or die "Bad line: >$_<";
   $d =~ tr/+//d;
   $possessive{$w} = "$w\'s\n" if $p eq 'N' && ($d eq '' || $use_all);
   next if $use_all;
@@ -73,7 +73,7 @@ while (<F>) {
   next unless $q eq '' || $use_all >= 2;
   my @a = split /, | \| /, $a;
   @a = grep {my ($word,$tags,$level)
-                = /^([A-Za-z\']+)([~<!?]*)(| [\d.]+)(| {\S+})$/ or die $_;
+                = /^([A-Za-z\']+)([~<!?]*)(| [\d.]+)(| \{\S+\})$/ or die $_;
             $_ = $word;
             $tags !~ /~|\?|!</ && $level <= $inc_level} @a;
   @a = grep {not $remove{"$w:$p:$_"}} @a;