===================================================================
RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo/Entry.pm,v
retrieving revision 1.21
retrieving revision 1.23
diff -u -r1.21 -r1.23
--- todotxt/Text-Todo/lib/Text/Todo/Entry.pm	2010/01/18 00:19:55	1.21
+++ todotxt/Text-Todo/lib/Text/Todo/Entry.pm	2010/01/18 03:04:48	1.23
@@ -1,20 +1,27 @@
 package Text::Todo::Entry;
 
-# $AFresh1: Entry.pm,v 1.20 2010/01/12 20:09:02 andrew Exp $
+# $AFresh1: Entry.pm,v 1.22 2010/01/18 02:46:48 andrew Exp $
 
 use warnings;
 use strict;
 use Carp;
 
-use Class::Std;
+use Class::Std::Utils;
 use List::Util qw/ first /;
 
 use version; our $VERSION = qv('0.0.1');
 
 {
-    my ( %text_of, %tags_of, %priority_of, %completion_status_of,
-        %known_tags_of, ) : ATTR;
 
+    my @attr_refs = \(
+        my %text_of,
+
+        my %tags_of,
+        my %priority_of,
+        my %completion_status_of,
+        my %known_tags_of,
+    );
+
     # XXX Should the completion (x) be case sensitive?
     my $priority_completion_regex = qr{
         ^ \s*
@@ -22,9 +29,12 @@
         (?i:\( ([A-Z]) \)   \s*)?
     }xms;
 
-    sub BUILD {
-        my ( $self, $ident, $options ) = @_;
+    sub new {
+        my ( $class, $options ) = @_;
 
+        my $self = bless anon_scalar(), $class;
+        my $ident = ident($self);
+
         if ( !ref $options ) {
             $options = { text => $options };
         }
@@ -212,6 +222,13 @@
         return $completion_status_of{$ident};
     }
 
+    sub DESTROY {
+        my ($self) = @_;
+        my $ident = ident $self;
+        foreach my $attr_ref (@attr_refs) {
+            delete $attr_ref->{$ident};
+        }
+    }
 }
 1;    # Magic true value required at end of module
 __END__
@@ -226,7 +243,7 @@
 Since the $VERSION can't be automatically included, 
 here is the RCS Id instead, you'll have to look up $VERSION.
 
-    $Id: Entry.pm,v 1.21 2010/01/18 00:19:55 andrew Exp $
+    $Id: Entry.pm,v 1.23 2010/01/18 03:04:48 andrew Exp $
 
 
 =head1 SYNOPSIS
@@ -252,7 +269,7 @@
 
 =head1 INTERFACE 
 
-=head2 BUILD
+=head2 new
 
 Creates an entry that can be manipulated.