Shlomi Fish avatar Shlomi Fish committed 2b97489

Remove ampersands in subroutine calls.

Comments (0)

Files changed (1)

src/wml_backend/p1_ipp/ipp.src

     "N|nosynclines",
     "n|inputfile=s",
     "o|outputfile=s"  )) {
-    &usage;
+    usage();
 }
 #   Adjust the -M flags
 if ($opt_M !~ m%^(-|[MD]*)$% && (! @ARGV)) {
     push(@ARGV,$opt_M);
     $opt_M = '';
 }
-&usage if (! @ARGV);
+usage() if (! @ARGV);
 push(@opt_I, '.');
 
 #
 }
 $MAP = {};
 foreach $file (@opt_m) {
-    &read_mapfile($MAP, $file);
+    read_mapfile($MAP, $file);
 }
 
 
             $file = $replace;
         }
         elsif ($type eq 'W') {
-            &warning("$file: $text");
+            warning("$file: $text");
             $file = $replace;
         }
         else {
-            &error("$file: $text");
+            error("$file: $text");
         }
     }
     return $file;
             closedir DIR;
             foreach (@ls) {
                 next if (m|/\.+$| or m|^\.+$|);
-                $out .= &ProcessFile($mode, $delimiter, "$dirname/$_$ext", "", $level, $noid, %arg);
+                $out .= ProcessFile($mode, $delimiter, "$dirname/$_$ext", "", $level, $noid, %arg);
                 $found = 1;
             }
             last if $found;
             closedir DIR;
             foreach (@ls) {
                 next if (m|/\.+$| or m|^\.+$|);
-                $out .= &ProcessFile($mode, $delimiter, "$dirname/$_$ext", "", $level, $noid, %arg);
+                $out .= ProcessFile($mode, $delimiter, "$dirname/$_$ext", "", $level, $noid, %arg);
                 $found = 1;
             }
             last if $found;
                 $arg{'IPP_NEXT'} = ($_ eq '' ? '' : $dirname . "/$_$ext");
                 next if $arg{'IPP_THIS'} eq '';
 
-                $out .= &ProcessFile($mode, $delimiter, $arg{'IPP_THIS'}, "", $level, $noid, %arg);
+                $out .= ProcessFile($mode, $delimiter, $arg{'IPP_THIS'}, "", $level, $noid, %arg);
             }
             delete $arg{'IPP_NEXT'};
             delete $arg{'IPP_THIS'};
         $pattern =~ s/\./\\./g;
         $pattern =~ s/\*/.*/g;
         $pattern =~ s/\?/./g;
-        return &PatternProcess($mode, $delimiter, $dirname, $pattern, $ext, $level, $noid, %arg);
+        return PatternProcess($mode, $delimiter, $dirname, $pattern, $ext, $level, $noid, %arg);
     }
 
     #
             $found = 1;
         }
     }
-    &error("file not found: $file") if not $found;
+    error("file not found: $file") if not $found;
 
     #
     #   stop if file was still included some time before
     #
     if (not $noid) {
-        $id = &CanonPath($file);
+        $id = CanonPath($file);
         if ($mode eq 'use') {
             return '' if (exists $INCLUDES{$id});
         }
     #
     $realname = $file if $realname eq '';
     $in = new IO::File;
-    &verbose($level, "|");
-    &verbose($level, "+-- $file");
+    verbose($level, "|");
+    verbose($level, "+-- $file");
     $in->open("<$file") || error("cannot load $file: $!");
     $line   = 0;
     $out    = '';
                 }
                 elsif ($op eq ':\?') {
                     #   Indicate Error if Unset
-                    $l =~ s/$subst/exists $arg{$name} ? $1.$arg{$name} : $1.&error($str)/e;
+                    $l =~ s/$subst/exists $arg{$name} ? $1.$arg{$name} : $1.error($str)/e;
                 }
                 elsif ($op eq ':-') {
                     #   Use Default Values
         if (($cmd, $incfile, $args) = ($l =~ m/^#(use|include|depends)\s+(\S+)(.*)$/)) {
             #   set arguments
             %argO = %arg;
-            &setargs(\%arg, $args);
+            setargs(\%arg, $args);
 
             #   do possible argument mapping
-            $incfile = &mapfile($incfile);
+            $incfile = mapfile($incfile);
 
             #   determine raw filename and type
             if ($incfile =~ m|^(\S+?)::(\S+)$|) {
                 $incfile = $2;
             }
             else {
-                &error("Unknown file-argument syntax: ``$incfile''");
+                error("Unknown file-argument syntax: ``$incfile''");
             }
 
             #   now recurse down
-            $out .= &ProcessFile($cmd, $type, $incfile, "", $level+1, 0, %arg);
+            $out .= ProcessFile($cmd, $type, $incfile, "", $level+1, 0, %arg);
             $out .= "<__file__ $realname /><__line__ $line />" .
                     "<protect pass=2><:# line $line \"$realname\":></protect>\n"
                         if not $opt_N and not $arg{'IPP_NOSYNCLINES'};
         $arg{$1} = 1;
     }
     else {
-        &error("Bad argument to option `D': $str");
+        error("Bad argument to option `D': $str");
     }
 }
 
     }
 }
 $tmp->close() || error("cannot close $tmpfile: $!");
-$outbuf .= &ProcessFile('include', "'", $tmpfile, "", 0, 1, %arg);
+$outbuf .= ProcessFile('include', "'", $tmpfile, "", 0, 1, %arg);
 unlink($tmpfile);
 
 #
     #   apply prolog filters
     foreach $p (@opt_P) {
         $rc = system("$p <$tmpfile >$tmpfile.f && mv $tmpfile.f $tmpfile 2>/dev/null");
-        &error("Prolog Filter `$p' failed") if ($rc != 0);
+        error("Prolog Filter `$p' failed") if ($rc != 0);
     }
 
     #   process file via IPP filter
-    $outbuf .= &ProcessFile('include', "'", $tmpfile,
+    $outbuf .= ProcessFile('include', "'", $tmpfile,
         ($opt_n eq '' ? $file : $opt_n), 0, 1, %arg);
 
     #   cleanup
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.