For #214 - Drop given

hkoba · Dec 5, 2023 · 336a8cc · 336a8cc
1 parent 3897926
commit 336a8cc
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 38 deletions.
diff --git a/Lite/Constants.pm b/Lite/Constants.pm
@@ -84,16 +84,15 @@ sub node_body {
 
 sub node_body_slot {
   my ($self, $node) = @_;
-  given ($node->[NODE_TYPE]) {
-    when (TYPE_ELEMENT) {
-      return $node->[NODE_BODY][NODE_VALUE] if defined $node->[NODE_BODY];
-    }
-    when (TYPE_ATT_NESTED) {
-      return $node->[NODE_VALUE];
-    }
-    default {
-      die "Invalid node type for node_body_slot: $_";
-    }
+  my $type = $node->[NODE_TYPE];
+  if ($type == TYPE_ELEMENT) {
+    return $node->[NODE_BODY][NODE_VALUE] if defined $node->[NODE_BODY];
+  }
+  elsif ($type == TYPE_ATT_NESTED) {
+    return $node->[NODE_VALUE];
+  }
+  else {
+    die "Invalid node type for node_body_slot: $type";
   }
 }
 

diff --git a/Lite/LRXML.pm b/Lite/LRXML.pm
@@ -1161,13 +1161,15 @@ sub AUTOLOAD {
   (my $meth = $sub) =~ s/.*:://;
   my $sym = $YATT::Lite::LRXML::{$meth}
     or croak "No such method: $meth";
-  given ($meth) {
-    when (/ent/)  { require YATT::Lite::LRXML::ParseEntpath }
-    when (/body/) { require YATT::Lite::LRXML::ParseBody }
-    default {
-      my MY $self = $_[0];
-      die $self->synerror_at($self->{startln}, "Unknown method: %s", $meth);
-    }
+  if ($meth =~ /ent/) {
+    require YATT::Lite::LRXML::ParseEntpath
+  }
+  elsif ($meth =~ /body/) {
+    require YATT::Lite::LRXML::ParseBody
+  }
+  else {
+    my MY $self = $_[0];
+    die $self->synerror_at($self->{startln}, "Unknown method: %s", $meth);
   }
   my $code = *{$sym}{CODE}
     or croak "Can't find definition of: $meth";

diff --git a/Lite/Test/XHFTest2.pm b/Lite/Test/XHFTest2.pm
@@ -317,16 +317,15 @@ sub mkformref_if_post {
 sub mech_request {
   (my Tests $tests, my ($mech, $item)) = @_;
   my $url = $tests->item_url($item);
-  given ($tests->item_method($item)) {
-    when ('GET') {
-      return $mech->get($url);
-    }
-    when ('POST') {
-      return $mech->post($url, $item->{cf_PARAM});
-    }
-    default {
-      die "Unknown test method: $_\n";
-    }
+  my $method = $tests->item_method($item);
+  if ($method eq 'GET') {
+    return $mech->get($url);
+  }
+  elsif ($method eq 'POST') {
+    return $mech->post($url, $item->{cf_PARAM});
+  }
+  else {
+    die "Unknown test method: $method\n";
   }
 }
 

diff --git a/Lite/WebMVC0/SiteApp.pm b/Lite/WebMVC0/SiteApp.pm
@@ -600,17 +600,18 @@ sub split_path_info {
 
 sub has_forbidden_path {
   (my MY $self, my $path) = @_;
-  given ($path) {
-    when (undef) {
-      return undef;
-    }
-    when (m{\.lib(?:/|$)}) {
-      return ".lib: $path";
-    }
-    when (m{(?:^|/)\.ht|\.ytmpl$}) {
-      # XXX: basename() is just to ease testing.
-      return "filetype: " . basename($path);
-    }
+  if (not defined $path) {
+    return undef;
+  }
+  elsif ($path =~ m{\.lib(?: / | $ )}x) {
+    return ".lib: $path";
+  }
+  elsif ($path =~ m{(?:^|/)\.ht|\.ytmpl$ }x) {
+    # XXX: basename() is just to ease testing.
+    return "filetype: " . basename($path);
+  }
+  else {
+    undef;
   }
 }