Added error handling for Condition

lib/SugarTrail/Template/Condition.pm

@@ -53,7 +53,6 @@ sub parse {
 
     # get name, operator, value(s)
     my ($n, $o, $v) = $string =~ m/([a-zA-Z0-9_ ]+)([<>=~+\-*@]*)(.*)/;
-    return unless $n;
 
     # cut inner spaces
     $n =~ s/\s+$//;
@@ -64,11 +63,20 @@ sub parse {
     # split vlues
     my @v = split m/\s*,\s*/, $v;
 
+    unless ($string and $n and $o and @v) {
+        $self->{error} = "syntax error: missing param name" unless $n;
+        $self->{error} = "syntax error: missing operator" unless $o;
+        $self->{error} = "syntax error: no values" unless @v;
+        $self->{error} = "syntax error: no condition string" unless $string;
+        return
+    }
+
     # assign
     $self->{n} = $n;
     $self->{o} = $o;
     $self->{v} = \@v;
 
+
     $self->{parsed}++;
 }
 
@@ -77,6 +85,8 @@ sub __match {
     my $self    = shift;
     my $params  = shift;
 
+    return if $self->{error};
+
     my $name    = $self->{n};       # what is the topic
     my $op      = $self->{o};       # what op to use
     my $have    = $self->{v};       # what we have in this step
@@ -107,8 +117,10 @@ sub __match {
 sub match {
     my $self    = shift;
     my $params  = shift;
+    $self->{error} = "";
     $self->parse();
     $self->{result} = $self->__match($params);
+    return if $self->{error};
     return $self->{result}, $self->{warnings};
 }
 

lib/SugarTrail/Template/Master.pm

@@ -81,6 +81,10 @@ sub generate_slave {
         # *   in all other cases (fail, warning), accept
         COND: foreach my $condstr (@{ $master_step->{conds} }) {
             my $c = SugarTrail::Template::Condition->new($condstr);
+            unless ($c) {
+                $self->{error} = "condition error: $c->{error}";
+                return;
+            }
             my ($r, $w) = $c->match($args);
 
             # if warnings, store them, prepare to accept and ignore result