Changeset 1239

Timestamp:

2000-06-26T14:28:03+12:00 (24 years ago)

Author:

gwp

Message:

Replaced references to @_ in subroutine parse with a new variable @rest
because it was not working on kahikatea (perl 5.004).

File:

• trunk/gsdl/perllib/parsargv.pm (modified) (3 diffs)

trunk/gsdl/perllib/parsargv.pm

@@ -64 +64 @@
 # Returns 0 if there was an error, nonzero otherwise.
 # 
-sub parse
+
+ 
+ sub parse
 {
     my $arglist = shift;
@@ -70 +72 @@
     my %option;
 
+<<<<<<< parsargv.pm
+    my @rest = @_;
+
+    # if the last argument is the string "allow_extra_options" then options
+    # in \@rest without a corresponding SPEC will be ignored (i.e. the "$arg is
+    # not a valid option" error won't occur)\n";
+    my $allow_extra_options = pop @rest;
+    if (defined ($allow_extra_options)) {
+    if ($allow_extra_options eq "allow_extra_options") {
+        $allow_extra_options = 1;
+    } else {
+        # put it back where we got it
+        push (@rest, $allow_extra_options);
+        $allow_extra_options = 0;
+    }
+    } else {
+    $allow_extra_options = 0;
+    }
+
+    while (($spec, $var) = splice(@rest, 0, 2))
+        {
+=======
     # if the last argument is the string "allow_extra_options" then options
     # in \@_ without a corresponding SPEC will be ignored (i.e. the "$arg is
@@ -88 +112 @@
     while (($spec, $var) = splice(@_, 0, 2))
     {
+>>>>>>> 1.3
     die "Variable for $spec is not a valid type."
         unless ref($var) eq 'SCALAR' || ref($var) eq 'ARRAY';