remove unnecessary (Any $)

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator / Object.pm

diff --git a/lib/SQL/Translator/Object.pm b/lib/SQL/Translator/Object.pm
index 6236cea..e6970ec 100644 (file)
--- a/lib/SQL/Translator/Object.pm
+++ b/lib/SQL/Translator/Object.pm
@@ -1,31 +1,29 @@
 use MooseX::Declare;
-class SQL::Translator::Object {
+class SQL::Translator::Object with SQL::Translator::Object::Compat {
     use Tie::IxHash;
     use MooseX::MultiMethods;
     use MooseX::Types::Moose qw(Any ArrayRef HashRef Str);
 
     has '_comments' => (
         traits => ['Array'],
-        is => 'rw',
         isa => ArrayRef,
         handles => {
+            _comments           => 'elements',
             add_comment         => 'push',
             remove_last_comment => 'pop',
         },
         default => sub { [] },
-        auto_deref => 1,
     );
 
     has '_options' => (
         traits => ['Array'],
-        is => 'rw',
         isa => ArrayRef,
         handles => {
+            _options           => 'elements',
             add_option         => 'push',
             remove_last_option => 'pop',
         },
         default => sub { [] },
-        auto_deref => 1,
     );
 
     has '_extra' => (
@@ -40,18 +38,22 @@ class SQL::Translator::Object {
             add_extra    => 'set',
         },
         default => sub { {} },
-        auto_deref => 1,
+    );
+
+    has '_error' => (
+        is => 'rw',
+        isa => Str
     );
 
     multi method comments(Str $comment) { $self->add_comment($comment); $self->comments }
     multi method comments(ArrayRef $comments) { $self->add_comment($_) for @$comments; $self->comments }
-    multi method comments(Any $) { wantarray ? @{$self->_comments} : join "\n", $self->_comments }
+    multi method comments { wantarray ? $self->_comments : join "\n", $self->_comments }
 
     multi method options(Str $option) { $self->add_option($option); $self->options }
     multi method options(ArrayRef $options) { $self->add_option($_) for @$options; $self->options }
-    multi method options(Any $) { wantarray ? @{$self->_options} : $self->_options }
+    multi method options { wantarray ? $self->_options : $self->_options }
 
-    multi method extra(Str $extra) { $self->get_extra($extra); $self->extra }
-    multi method extra(HashRef $extra) { $self->_extra($extra); $self->extra }
-    multi method extra(Any $) { wantarray ? %{$self->_extra} : $self->_extra }
+    multi method extra(Str $extra) { $self->get_extra($extra) }
+    multi method extra(HashRef $extra) { $self->add_extra($_, $extra->{$_}) for keys %$extra; $self->extra }
+    multi method extra { wantarray ? %{$self->_extra} : $self->_extra }
 }