Thread: [Lxr-commits] CVS: lxr/lib/LXR/Lang Generic.pm, 1.21, 1.22 generic.conf, 1.20, 1.21
Brought to you by:
ajlittoz
From: AdrianIssott <adr...@us...> - 2009-04-12 16:55:46
|
Update of /cvsroot/lxr/lxr/lib/LXR/Lang In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14601/lib/LXR/Lang Modified Files: Generic.pm generic.conf Log Message: Fix for bug 2755776 (Perl Reserved Words Needs Updating) * Added reserved words derived from the perlfunc and perlsyn documentation for perl v5.10.0 * Updated the regular expression in LXR::Lang::Generic to allow reserved words / symbols to start with - and not be proceeded by $ Index: Generic.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Generic.pm,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- Generic.pm 12 Apr 2009 16:10:36 -0000 1.21 +++ Generic.pm 12 Apr 2009 16:55:42 -0000 1.22 @@ -157,13 +157,11 @@ # Replace identifier by link unless it's a reserved word $$code =~ s{ - (^|[^\w\#])([\w~\#][\w]*)\b + (^|[^\$\w\#])([-\w~\#][\w]*)\b } { $1. - ( - $index->issymbol($2, $$self{'release'}) ? join($2, @{$$self{'itag'}}) : $2 - ); + ( $index->issymbol($2, $$self{'release'}) ? join($2, @{$$self{'itag'}}) : $2 ); }gex; } @@ -182,12 +180,11 @@ # Replace reserved words $$frag =~ s{ - (^|[^\w\#])([\w~\#][\w]*)\b + (^|[^\$\w\#])([-\w~\#][\w]*)\b } { $1. - ( $self->isreserved($2) ? "<span class='reserved'>$2</span>" : $2 ). - $3; + ( $self->isreserved($2) ? "<span class='reserved'>$2</span>" : $2 ); }gex; } Index: generic.conf =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/generic.conf,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- generic.conf 11 Apr 2009 11:23:43 -0000 1.20 +++ generic.conf 12 Apr 2009 16:55:42 -0000 1.21 @@ -555,7 +555,73 @@ 'langid' => '6', }, 'Perl' => { - 'reserved' => [ 'sub', ], + # The following have been derived from the perlfunc and perlsyn documentation + # for perl v5.10.0 + 'reserved' => ['-A', 'abs', 'accept', 'alarm', + 'and', 'atan2', '-b', '-B', + 'bind', 'binmode', 'bless', 'break', + '-c', '-C', 'caller', 'chdir', + 'chmod', 'chop', 'chown', 'chr', + 'chroot', 'close', 'closedir', 'connect', + 'continue', 'cos', 'crypt', '-d', + 'dbmclose', 'dbmopen', 'default', 'defined', + 'delete', 'die', 'do', 'dump', + '-e', 'each', 'else', 'elsif', + 'endgrent', 'endhostent', 'endnetent', 'endprotoent', + 'endpwent', 'endservent', 'eof', 'eval', + 'exec', 'exists', 'exit', 'exp', + '-f', 'fcntl', 'fileno', 'flock', + 'for', 'foreach', 'fork', 'format', + 'formline', '-g', 'getc', 'getgrent', + 'getgrgid', 'getgrnam', 'gethostbyaddr', 'gethostbyname', + 'gethostent', 'getlogin', 'getnetbyaddr', 'getnetbyname', + 'getnetent', 'getpeername', 'getpgrp', 'getppid', + 'getpriority', 'getprotobyname','getprotobynumber','getprotoent', + 'getpwent', 'getpwnam', 'getpwuid', 'getservbyname', + 'getservbyport','getservent', 'getsockname', 'getsockopt', + 'given', 'glob', 'gmtime', 'goto', + 'grep', 'hex', 'if', 'import', + 'index', 'int', 'ioctl', 'join', + '-k', 'keys', 'kill', '-l', + 'last', 'lc', 'lcfirst', 'length', + 'link', 'listen', 'local', 'localtime', + 'lock', 'log', 'lstat', 'm', + '-M', 'map', 'mkdir', 'msgctl', + 'msgget', 'msgrcv', 'msgsnd', 'my', + 'next', 'no', '-o', '-O', + 'oct', 'open', 'opendir', 'or', + 'ord', 'our', '-p', 'pack', + 'package', 'pipe', 'pop', 'pos', + 'print', 'printf', 'prototype', 'push', + 'q', 'qq', 'qr', 'quotemeta', + 'qw', 'qx', '-r', '-R', + 'rand', 'read', 'readdir', 'readline', + 'readlink', 'readpipe', 'recv', 'redo', + 'ref', 'rename', 'require', 'reset', + 'return', 'reverse', 'rewinddir', 'rindex', + 'rmdir', 's', '-s', '-S', + 'say', 'scalar', 'seek', 'seekdir', + 'select', 'semctl', 'semget', 'semop', + 'send', 'setgrent', 'sethostent', 'setnetent', + 'setpgrp', 'setpriority', 'setprotoent', 'setpwent', + 'setservent', 'setsockopt', 'shift', 'shmctl', + 'shmget', 'shmread', 'shmwrite', 'shutdown', + 'sin', 'sleep', 'socket', 'socketpair', + 'sort', 'splice', 'split', 'sprintf', + 'sqrt', 'srand', 'stat', 'state', + 'study', 'sub', 'substr', 'symlink', + 'syscall', 'sysopen', 'sysread', 'sysseek', + 'system', 'syswrite', '-t', '-T', + 'tell', 'telldir', 'tie', 'tied', + 'time', 'times', 'tr', 'truncate', + '-u', 'uc', 'ucfirst', 'umask', + 'undef', 'unless', 'unlink', 'unpack', + 'unshift', 'untie', 'until', 'use', + 'utime', 'values', 'vec', '-w', + '-W', 'wait', 'waitpid', 'wantarray', + 'warn', 'when', 'while', 'write', + '-x', '-X', 'y', '-z', + ], 'spec' => [ 'atom' => ('\$\W?', ''), 'atom' => ('\\\\.', ''), |