[Lxr-commits] CVS: lxr/lib/LXR/Lang Make.pm,1.3,1.4

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

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

Modified Files:
	Make.pm 
Log Message:
Make.pm: minor code improvement

Index: Make.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Make.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Make.pm	21 Sep 2013 12:54:53 -0000	1.3
+++ Make.pm	8 Nov 2013 09:06:26 -0000	1.4
@@ -66,7 +66,6 @@
 	my ($self, $frag, $dir) = @_;
 
 	my $source = $$frag;
-	my $dirname;	# uses directive name and spacing
 	my $file;		# language include file
 	my $path;		# OS include file
 	my $target = '[s-]?include\s+';	# directive pattern
@@ -80,9 +79,8 @@
 			# Guard against syntax error or variant
 			# Advance past keyword, so that parsing may continue without loop.
 			$source =~ s/^(\S+)//;	# Erase keyword
-			$dirname = $1;
-			if (length($dirname) > 0) {
-				$$frag .= "<span class='reserved'>$dirname</span>";
+			if (length($1) > 0) {
+				$$frag .= "<span class='reserved'>$1</span>";
 			}
 			&LXR::SimpleParse::requeuefrag($source);
 			return;
@@ -92,14 +90,9 @@
 		# Following are only for whitespace separators.
 		$target = '\s+';
 
-		$dirname = $1;
 		$file    = $2;
-
 		$path    = $file;
-		$$frag .= 	( $self->isreserved($dirname)
-					? "<span class='reserved'>$dirname</span>"
-					: $dirname
-					);
+		$$frag .= 	"<span class='reserved'>$1</span>";
 
 		# Check start of comment
 		if ('#' eq substr($file, 0, 1)) {