[Lxr-commits] CVS: lxr/lib/LXR/Lang Cobol.pm, 1.5, 1.6 HTML.pm, 1.2, 1.3 Pascal.pm, 1.4, 1.5

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Lang
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11350/lib/LXR/Lang

Modified Files:
	Cobol.pm HTML.pm Pascal.pm 
Log Message:
Cobol.pm, HTML.pm, Pascal.pm: fix incorrect language-insensitive keyword detection

Index: Cobol.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Cobol.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Cobol.pm	21 Sep 2013 12:54:53 -0000	1.5
+++ Cobol.pm	8 Nov 2013 09:04:27 -0000	1.6
@@ -44,7 +44,7 @@
 	  $1.
 		( $2 eq ''
 		? $2
-		:	( $self->isreserved($2)
+		:	( $self->isreserved(uc($2))
 			? "<span class='reserved'>$2</span>"
 			:	( $index->issymbol(uc($2), $$self{'releaseid'})
 				? join($2, @{$$self{'itag'}})

Index: HTML.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/HTML.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HTML.pm	21 Sep 2013 12:54:53 -0000	1.2
+++ HTML.pm	8 Nov 2013 09:04:27 -0000	1.3
@@ -85,7 +85,7 @@
 		# Advance past keyword, so that parsing may continue without loop.
 		$source =~ s/^(\w+)//;	# Erase keyword
 		$dirname = $1;
-		$$frag =	( $self->isreserved($dirname)
+		$$frag =	( $self->isreserved(uc($dirname))
 					? "<span class='reserved'>$dirname</span>"
 					: $dirname
 					);
@@ -103,7 +103,7 @@
 	$path =~ s/&#x22/"/ig;
 	$path =~ s/&#x27/'/ig;
 
-	$$frag = 	( $self->isreserved($dirname)
+	$$frag = 	( $self->isreserved(uc($dirname))
 				? "<span class='reserved'>$dirname</span>"
 				: $dirname
 				)

Index: Pascal.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Pascal.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Pascal.pm	21 Sep 2013 12:54:53 -0000	1.4
+++ Pascal.pm	8 Nov 2013 09:04:27 -0000	1.5
@@ -110,6 +110,7 @@
 
 	my $source = $$frag;
 	my $dirname;	# uses directive name and spacing
+	my $dictname;
 	my $file;		# language include file
 	my $path;		# OS include file
 	my $link;		# link to include file
@@ -138,7 +139,8 @@
 		$dirname = $1;
 		$file    = $2;
 		$path    = $file;
-		$$frag .= 	( $self->isreserved($dirname)
+		($dictname = $dirname) =~ s/\s//g;
+		$$frag .= 	( $self->isreserved(uc($dictname))
 					? "<span class='reserved'>$dirname</span>"
 					: $dirname
 					);