From 22b2408ba258a1e769baad1773495f99a4486710 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Sat, 3 Dec 2011 19:56:37 +0100 Subject: [PATCH] client/example: More succint type testing --- client/example.pl | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/client/example.pl b/client/example.pl index 4b80043..7c589a0 100755 --- a/client/example.pl +++ b/client/example.pl @@ -40,27 +40,15 @@ sub tick($) { my ($type, $value) = ($1, $2); if ($type eq 'tick') { - if ($value =~ /\D/) { - print "[ee] type tick wrong value\n"; - print $value . "\n"; - exit(-1); - } + $value =~ /^\d+$/ or die "[ee] type tick wrong value ($value)\n"; $state{tick} = $value; } elsif ($type eq 'energy') { - if ($value =~ /\D/) { - print "[ee] type energy wrong value\n"; - print $value . "\n"; - exit(-1); - } + $value =~ /^\d+$/ or die "[ee] type energy wrong value ($value)\n"; $state{energy} = $value; } elsif ($type eq 'visual') { - if ($value !~ /^([^ ][^ ] )+([^ ][^ ])$/) { - print "[ee] type visual wrong value\n"; - print $value . "\n"; - exit(-1); - } + $value =~ /^([^ ][^ ] )+([^ ][^ ])$/ or die "[ee] type visual wrong value ($value)\n"; $state{visual} = [ split(" ", $value) ]; } }