[svn:parrot] r10781 - in trunk: lib/Parrot/Configure t/configure

[jhoblitt]

Author: jhoblitt
Date: Thu Dec 29 20:20:44 2005
New Revision: 10781

Modified:
   trunk/lib/Parrot/Configure/Step.pm
   trunk/t/configure/step.t
Log:
remove the ':add' & ':rem' complexities from integrate() & prompt() -- unused

Modified: trunk/lib/Parrot/Configure/Step.pm
==============================================================================
--- trunk/lib/Parrot/Configure/Step.pm  (original)
+++ trunk/lib/Parrot/Configure/Step.pm  Thu Dec 29 20:20:44 2005
@@ -63,23 +63,12 @@ sub integrate
 {
     my ($orig, $new) = @_;
 
-    unless (defined $new) {
-
-        # Rather than sprinkling "if defined(...)", everywhere,
-        # config/inter/progs.pl just passes in potentially undefined
-        # strings.  Just pass back the original in that case.  Don't
-        # bother warning.  --AD, 12 Sep 2005
-        # warn "String to be integrated in to '$orig' undefined";
-        return $orig;
-    }
-
-    while ($new =~ s/:add\{([^}]+)\}//) {
-        $orig .= $1;
-    }
-
-    while ($new =~ s/:rem\{([^}]+)\}//) {
-        $orig =~ s/\Q$1\E//;
-    }
+    # Rather than sprinkling "if defined(...)", everywhere,
+    # config/inter/progs.pl just passes in potentially undefined
+    # strings.  Just pass back the original in that case.  Don't
+    # bother warning.  --AD, 12 Sep 2005
+    # warn "String to be integrated in to '$orig' undefined";
+    return $orig unless defined $new;
 
     if ($new =~ /\S/) {
         $orig = $new;
@@ -103,14 +92,6 @@ sub prompt
 
     chomp(my $input = <STDIN>);
 
-    while ($input =~ s/:add\{([^}]+)\}//) {
-        $value .= $1;
-    }
-
-    while ($input =~ s/:rem\{([^}]+)\}//) {
-        $value =~ s/\Q$1\E//;
-    }
-
     if ($input) {
         $value = $input;
     }

Modified: trunk/t/configure/step.t
==============================================================================
--- trunk/t/configure/step.t    (original)
+++ trunk/t/configure/step.t    Thu Dec 29 20:20:44 2005
@@ -36,7 +36,6 @@ can_ok(__PACKAGE__, @Parrot::Configure::
 
 # integrate()
 
-# XXX should the other 'features' of integrate() be tested or simply removed?
 is(integrate(undef, undef), undef, "integrate(undef, undef)");
 is(integrate(undef, 1), 1, "integrate(undef, 1)");
 is(integrate(1, undef), 1, "integrate(1, undef)");