Finished condition processing, first run

lib/SugarTrail/Template/Master.pm

@@ -9,6 +9,7 @@ use strict;
 use warnings;
 use Carp;
 use SugarTrail::Template::Slave;
+use SugarTrail::Template::Condition;
 
 sub new {
     my $class = shift;
@@ -43,9 +44,15 @@ sub _parse_body {
     $self->{steps} = [];
     foreach (split "\n", $self->{body}) {
         chomp; s/ *$//;
-        my ($line, $cond) = $_ =~ m/^(.*?)(\{(.*)\})?$/;
+        my @conds;
+        my ($line, $cond_block) = $_ =~ m/^(.*?)(\{(.*)\})?$/;
         $line =~ s/ *$//;
-        push @{ $self->{steps} }, { line => $line, cond => $cond };
+        if ($cond_block) {
+            $cond_block =~ s/\}$//;
+            $cond_block =~ s/^\{//;
+            @conds = split m/\s*;\s*/, $cond_block;
+        }
+        push @{ $self->{steps} }, { line => $line, conds => \@conds };
     }
     return scalar @{ $self->{steps} };
 }
@@ -58,13 +65,13 @@ sub generate_slave {
 
     my @lines;
 
-    STEP: foreach (@{ $self->{steps} }) {
-        unless ($_->{cond}) {
-            push @lines, $_->{line};
-            next STEP;
-        } else {
-            push @lines, $_->{line} if &matches($_->{cond}, $args);
+    STEP: foreach my $step (@{ $self->{steps} }) {
+        my $accept = 1;
+        COND: foreach my $condstr (@{ $step->{conds} }) {
+            my $c = SugarTrail::Template::Condition->new($condstr);
+            unless ($c->match($args)) { $accept = 0; last COND; }
         }
+        push @lines, $step->{line} if $accept;
     }
 
     $slave->{meta}->{'Stm'} = $self->{stm};
@@ -75,13 +82,6 @@ sub generate_slave {
     return $slave;
 }
 
-# skel: matches if cond has m
-sub matches {
-    my $cond = shift;
-    my $args = shift;
-    $cond =~ m/m/;
-}
-
 # skel: returns time (might be useful in absence of VCS)
 sub get_current_revision {
     return time;

t/data/strepo/release/rc.stm

@@ -15,6 +15,6 @@ This is the release client protocol.  Here the body starts...
     > result is OK
 3. Some XP thing        {os==wxx}
 3. Some Win7 thing      {os=~w7*}
-4. Some amd64 thing     {arch==amd64}
+4. Some amd64 thing     {arch==amd64;proto==pop3}
 
 Some final comments.