Changeset 104 for trunk

Timestamp:

06/14/07 16:25:52 (17 years ago)

Author:

kdeugau

Message:

/trunk

Expand %if logic support to basic multi-operator support

(%a == "value"

%a == "othervalue")

File:

• trunk/debbuild (modified) (1 diff)

trunk/debbuild

@@ -490 +490 @@
 
         $expr =~ s/\s+//g;
-        $expr =~ s/^(\w+)/"$1"/ if $expr !~ /^['"]\w['"]/;
-        $expr =~ s/(\w+)$/"$1"/ if $expr !~ /['"]\w['"]$/;
+
+# For Great w00tness!  New and Improved multilayered logic handling.
+
+        my @bits = split /\b/, $expr;
+        $expr = '';
+        foreach my $bit (@bits) {
+          next if $bit eq '"';
+          $bit =~ s/"//g;
+          $expr .= qq("$bit") if $bit =~ /^\w+$/;
+          $expr .= $bit if $bit !~ /^\w+$/;
+        }
 
         # Done in this order so we don't cascade incorrectly.  Yes, those spaces ARE correct in the replacements!
-        $expr =~ s/==/ eq /;
-        $expr =~ s/!=/ ne /;
-        $expr =~ s/<=>/ cmp /;
-        $expr =~ s/<=/ le /;
-        $expr =~ s/>=/ ge /;
-        $expr =~ s/</ lt /;
-        $expr =~ s/>/ gt /;
+        $expr =~ s/==/ eq /g;
+        $expr =~ s/!=/ ne /g;
+        $expr =~ s/<=>/ cmp /g;
+        $expr =~ s/<=/ le /g;
+        $expr =~ s/>=/ ge /g;
+        $expr =~ s/</ lt /g;
+        $expr =~ s/>/ gt /g;
 
         # Turn it into something that eval's to a number.  Maybe not needed?  O_o