From a1357e1f4a6abaa15d8956a10eaa4c60f79ae792 Mon Sep 17 00:00:00 2001 From: Ralf Ertzinger Date: Wed, 8 Jun 2011 08:27:22 +0200 Subject: [PATCH] JSArrayParser: dispense with the fallback crap, just return a JSJSONArrayParser or die if that does not work --- videosite/JSArrayParser.pm | 34 ++-------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/videosite/JSArrayParser.pm b/videosite/JSArrayParser.pm index 37452fe..bbc60de 100644 --- a/videosite/JSArrayParser.pm +++ b/videosite/JSArrayParser.pm @@ -23,38 +23,8 @@ sub new { # Try to find a child object which is available and return that. - # See if videosite::JSJSONArrayParser is available - eval { - require videosite::JSJSONArrayParser; - }; - - unless($@) { - # Available. Return a JSJSONArrayParser object - return videosite::JSJSONArrayParser->new(%params); - } - - # See if videosite::JSLexArrayParser is available - eval { - require videosite::JSLexArrayParser; - }; - - unless($@) { - # Available. Return a JSLexArrayParser object - return videosite::JSLexArrayParser->new(%params); - } - - # See if JSSimleArrayParser is available - eval { - require videosite::JSSimpleArrayParser; - }; - - unless ($@) { - # Available. Return a JSSimpleArrayParser object - return videosite::JSSimpleArrayParser->new(%params); - } - - # Nothing available. Return ourselves. - return bless($self, $class); + require videosite::JSJSONArrayParser; + return videosite::JSJSONArrayParser->new(%params); } sub parse { -- 1.8.3.1