Sfoglia il codice sorgente

Report the right line number

Morten Brix Pedersen 24 anni fa
parent
commit
aedfee3672
2 ha cambiato i file con 6 aggiunte e 7 eliminazioni
  1. 1 0
      docs/Changelog
  2. 5 7
      modules/Pisg.pm

+ 1 - 0
docs/Changelog

@@ -4,6 +4,7 @@ pisg (0.31) - Mon, Dec 3rd 2001
    * More improved parsing: pisg will now complain if a configuration option
      is used, which doesn't exist in the real world.
    * Fix some documentation bugs
+   * Report the right line number when displaying parse errors in pisg.cfg
 
 pisg (0.30) - Sun, Dec 2nd 2001
    * New feature: 'show_lastseen' - will add a column in the stats to display

+ 5 - 7
modules/Pisg.pm

@@ -285,10 +285,8 @@ sub init_config
 
     if ((open(CONFIG, $self->{cfg}->{configfile}) or open(CONFIG, $self->{search_path} . "/$self->{cfg}->{configfile}"))) {
 
-        my $lineno = 0;
         while (my $line = <CONFIG>)
         {
-            $lineno++;
             next if ($line =~ /^#/);
 
             if ($line =~ /<user.*>/) {
@@ -298,7 +296,7 @@ sub init_config
                     $nick = $1;
                     add_alias($nick, $nick);
                 } else {
-                    print STDERR "Warning: No nick specified in $self->{cfg}->{configfile} on line $lineno\n";
+                    print STDERR "Warning: No nick specified in $self->{cfg}->{configfile} on line $.\n";
                     next;
                 }
 
@@ -341,7 +339,7 @@ sub init_config
                         add_url_ignore($url);
                     }
                 } else {
-                    print STDERR "Warning: no URL specified in $self->{cfg}->{configfile} on line $lineno\n";
+                    print STDERR "Warning: no URL specified in $self->{cfg}->{configfile} on line $.\n";
                 }
 
 
@@ -380,12 +378,12 @@ sub init_config
                     }
                 }
             } elsif ($line =~ /<set/) {
-                print STDERR "Warning: Malformed <set ..> line in $self->{cfg}->{configfile} on line $lineno\n";
+                print STDERR "Warning: Malformed <set ..> line in $self->{cfg}->{configfile} on line $.\n";
             } elsif ($line =~ /<channel/) {
-                print STDERR "Warning: Malformed <channel ..> line in $self->{cfg}->{configfile} on line $lineno\n";
+                print STDERR "Warning: Malformed <channel ..> line in $self->{cfg}->{configfile} on line $.\n";
             } elsif ($line =~ /\S/) {
                 $line =~ s/\n//;
-                print "Warning: Unrecognized line in $self->{cfg}->{configfile} on line $lineno: '$line'\n";
+                print "Warning: Unrecognized line in $self->{cfg}->{configfile} on line $.: '$line'\n";
             }
         }