X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FLaTeX%2FTikZ%2FSet%2FPath.pm;h=11ea1064e11b2b118c8a4f0caf989fc1db7a03b9;hb=92147217516a40b35ca00c8e08939e8aa5478426;hp=319298b3bd518dd87a2a213dff4910b3247f499c;hpb=e8f0879ade07eed4f58cd52c0771f4e1ecc90b09;p=perl%2Fmodules%2FLaTeX-TikZ.git

diff --git a/lib/LaTeX/TikZ/Set/Path.pm b/lib/LaTeX/TikZ/Set/Path.pm
index 319298b..11ea106 100644
--- a/lib/LaTeX/TikZ/Set/Path.pm
+++ b/lib/LaTeX/TikZ/Set/Path.pm
@@ -15,32 +15,38 @@ Version 0.01
 
 our $VERSION = '0.01';
 
-use LaTeX::TikZ::Tools;
+use LaTeX::TikZ::Functor;
 
 use Any::Moose;
+use Any::Moose 'Util::TypeConstraints'
+               => [ qw/subtype as where find_type_constraint/ ];
 
 with qw(
  LaTeX::TikZ::Set::Op
  LaTeX::TikZ::Set::Mutable
 );
 
+subtype 'LaTeX::TikZ::Set::Path::Elements'
+     => as 'Object'
+     => where { $_->does('LaTeX::TikZ::Set::Op') };
+
 has '_ops' => (
  is       => 'ro',
- isa      => 'Maybe[ArrayRef[LaTeX::TikZ::Set::Op]]',
+ isa      => 'Maybe[ArrayRef[LaTeX::TikZ::Set::Path::Elements]]',
  init_arg => 'ops',
  default  => sub { [ ] },
 );
 
 sub ops { @{$_[0]->_ops} }
 
-my $ltso_tc = LaTeX::TikZ::Tools::type_constraint('LaTeX::TikZ::Set::Op');
+my $ltspe_tc = find_type_constraint('LaTeX::TikZ::Set::Path::Elements');
 
 sub add {
  my $set = shift;
 
- $ltso_tc->check($_) for @_;
+ $ltspe_tc->assert_valid($_) for @_;
 
- push @{$_[0]->_ops}, @_;
+ push @{$set->_ops}, @_;
 
  $set;
 }
@@ -51,12 +57,19 @@ sub path {
  join ' ', map $_->path(@_), $set->ops;
 }
 
-use LaTeX::TikZ::API path => sub {
+use LaTeX::TikZ::Interface path => sub {
  shift;
 
  __PACKAGE__->new(ops => \@_);
 };
 
+LaTeX::TikZ::Functor->default_rule(
+ (__PACKAGE__) => sub {
+  my ($functor, $set, @args) = @_;
+  $set->new(ops => [ map $_->$functor(@args), $set->ops ])
+ }
+);
+
 __PACKAGE__->meta->make_immutable;
 
 =head1 AUTHOR