For [GH #117] - Introduce $vfs_item->item_key.

* change keys for actions in `$folder->{Item}` to use `"do\0$name"`. These match to item_key.

Author: hkoba

Lite/CGen/Perl.pm

@@ -124,7 +124,7 @@ use YATT::Lite::Constants;
     (my MY $self, my Action $action) = @_;
     # XXX: 改行の調整が必要。
     my @src = ($self->sync_curline($action->{cf_startln})
-               , "sub $$action{cf_name} {");
+               , "sub do_$$action{cf_name} {");
     my $src = $self->{curtmpl}->source_substr
       ($action->{cf_bodypos}, $action->{cf_bodylen});
 

Lite/Core.pm

@@ -46,7 +46,9 @@ use YATT::Lite::Breakpoint ();
       , -constants => [[public => 0]]
       , [Widget => -fields => [qw(tree var_dict has_required_arg)]
 	 , [Page => (), -constants => [[public => 1]]]]
-      , [Action => (), -constants => [[public => 1]]]
+      , [Action => (), -constants => [[public => 1],
+                                      [item_category => 'do'],
+                                    ]]
       , [Data => ()]]
 
      , [Template => -base => MY->File
@@ -72,18 +74,18 @@ use YATT::Lite::Breakpoint ();
     (my Part $part) = @_;
     $part->{cf_name};
   }
-  sub YATT::Lite::Core::Action::public_name {
-    (my Action $action) = @_;
-    substr($action->{cf_name}, 3);
-  }
   sub YATT::Lite::Core::Part::method_name {...}
   sub YATT::Lite::Core::Widget::method_name {
     (my Widget $widget) = @_;
     "render_$widget->{cf_name}";
   }
   sub YATT::Lite::Core::Action::method_name {
     (my Action $action) = @_;
-    $action->{cf_name};
+    "do_$action->{cf_name}";
+  }
+  sub YATT::Lite::Core::Action::item_key {
+    (my Action $action) = @_;
+    "do\0$action->{cf_name}";
   }
 
   sub YATT::Lite::Core::Part::configure_folder {
@@ -356,6 +358,7 @@ sub synerror {
 
     if (UNIVERSAL::isa($self->{root}, Template)) {
       # Special case.
+      # XXX: Should add action tests for this case.
       $tmpl = $self->{root};
 
       $part = $tmpl->{Item}{$partName}
@@ -387,7 +390,7 @@ sub synerror {
   }
 
   sub _itemKey_page { shift; ($_[0], "render_$_[0]") }
-  sub _itemKey_action { shift; ("do_$_[0]") x 2; }
+  sub _itemKey_action { shift; ("do\0$_[0]", "do_$_[0]"); }
 
   #
   # Action name => sub {}
@@ -403,7 +406,7 @@ sub synerror {
 
     *{globref($root->{cf_entns}, $action_name)} = $sub;
 
-    $root->{Item}{$action_name}
+    $root->{Item}{"do\0$name"}
       = $self->Action->new(name => $action_name, kind => 'action'
 			   , folder => $root
 			   , startln => $lineno

Lite/LRXML.pm

@@ -552,18 +552,10 @@ sub build {
      , folder => $self->{template}
      , startpos => $self->{startpos}, @_);
 }
-# 今度はこっちが今一ね。
+
 sub build_widget { shift->Widget->new(@_) }
 sub build_page { shift->Page->new(@_) }
-sub build_action {
-  (my MY $self, my (%opts)) = @_;
-
-  # XXX: This is a workaround to have renderers and actions
-  # in the same hash table $template->{Item}.
-  $opts{name} = "do_$opts{name}";
-
-  $self->Action->new(%opts);
-}
+sub build_action { shift->Action->new(@_) }
 sub build_data { shift->Data->new(@_) }
 
 #========================================
@@ -676,15 +668,16 @@ sub namespace {
 #========================================
 sub add_part {
   (my MY $self, my Template $tmpl, my Part $part) = @_;
-  if (defined $tmpl->{Item}{$part->{cf_name}}) {
+  my $itemKey = $part->item_key;
+  if (defined $tmpl->{Item}{$itemKey}) {
     die $self->synerror_at($self->{startln}, q{Conflicting part name! '%s'}, $part->{cf_name});
   }
   if ($tmpl->{partlist} and my Part $prev = $tmpl->{partlist}[-1]) {
     $prev->{cf_endln} = $self->{endln};
   }
   $part->{cf_startln} = $self->{startln};
   $part->{cf_bodyln} = $self->{endln};
-  push @{$tmpl->{partlist}}, $tmpl->{Item}{$part->{cf_name}} = $part;
+  push @{$tmpl->{partlist}}, $tmpl->{Item}{$itemKey} = $part;
 }
 
 sub add_text {

Lite/VFS.pm

@@ -20,7 +20,7 @@ require File::Basename;
   sub MY () {__PACKAGE__}
   use YATT::Lite::Types
     ([Item => -fields => [qw(cf_name cf_public cf_type)]
-      , -constants => [[can_generate_code => 0]]
+      , -constants => [[can_generate_code => 0], [item_category => '']]
       , [Folder => -fields => [qw(Item cf_path cf_parent cf_base
 				  cf_entns)]
 	 , -eval => q{use YATT::Lite::Util qw(cached_in);}
@@ -32,6 +32,10 @@ require File::Basename;
 	    , -alias => 'vfs_dir']]]);
 
   sub YATT::Lite::VFS::Item::after_create {}
+  sub YATT::Lite::VFS::Item::item_key {
+    (my Item $item) = @_;
+    $item->{cf_name};
+  }
   sub YATT::Lite::VFS::Folder::configure_parent {
     my MY $self = shift;
     # 循環参照対策
@@ -466,8 +470,9 @@ require File::Basename;
 	(data => {}, name => $name, parent => $folder);
     }
     # XXX: path を足すと、memory 動作の時に困る
-    $folder->{Item}{$lastName} = $vfs->create
-	(data => $data, name => $lastName, parent => $folder);
+    my Item $item = $vfs->create
+      (data => $data, name => $lastName, parent => $folder);
+    $folder->{Item}{$item->item_key} = $item;
   }
   #========================================
   sub root {(my VFS $vfs) = @_; $vfs->{root}}