Changeset 2973

Timestamp:

08/25/08 23:05:34 (3 months ago)

Author:

bchoate

Message:

MT::Template::Node refactoring from Hirotaka-san. BugId:79926

Files:

• trunk/lib/MT/Builder.pm (modified) (12 diffs)
• trunk/lib/MT/CMS/Template.pm (modified) (2 diffs)
• trunk/lib/MT/Template.pm (modified) (11 diffs)
• trunk/lib/MT/Template/Node.pm (added)

trunk/lib/MT/Builder.pm

@@ -9 +9 @@
-use strict;
-use base qw( MT::ErrorHandler );
-Util qw( weaken )
+Template::Node
-
-sub NODE () { 'MT::Template::Node' }
@@ -80 +80 @@
-        #   tag name, attribute hashref, contained tokens, template text,
-        #       attributes arrayref, parent array reference
-bless [ $tag, \my %args, undef, undef, \my @args ], NODE
+NODE->new(tag => $tag, attributes => \my %args, attribute_list => \my @args)
-        while ($args =~ /
-            (?:
@@ -153 +153 @@
-                            : substr $text, $sec_start, $sec_end - $sec_start;
-                    if ($sec !~ m/<\$?MT/i) {
-[2] = [ ($sec ne '' ? ['TEXT', $sec ] : ()) ]
+childNodes([ ($sec ne '' ? NODE->new(tag => 'TEXT', nodeValue => $sec) : ()) ])
-                    }
-                    else {
-                        local $opt->{depth} = $opt->{depth} + 1;
-                        local $opt->{parent} = $rec;
-[2] = $build->compile($ctx, $sec, $opt
+childNodes($build->compile($ctx, $sec, $opt)
-                        if ( @$errors ) {
-                            my $pre_error = substr($text, 0, $sec_start);
@@ -185 +185 @@
-                        # }
-                    }
-[3] = $sec
+nodeValue($sec)
-                }
-                else {
@@ -206 +206 @@
-            }
-            else {
-[3] = ''
-
-
-weaken($rec->[5] = 
-weaken($rec->[6] = 
+nodeValue('')
+
+
+$rec->parentNode(
+$rec->template(
-        push @{ $state->{tokens} }, $rec;
-        $pos = pos $text;
@@ -257 +257 @@
-    my $text = substr ${ $_[0]->{text} }, $_[1], $_[2] - $_[1];
-    if ((defined $text) && ($text ne '')) {
-
-
-
-
+
-        push @{ $_[0]->{tokens} }, $rec;
-    }
@@ -269 +266 @@
-    my $string = '';
-    foreach my $t (@$tokens) {
-@$t
+($t->tag, $t->attributes, $t->childNodes, $t->nodeValue)
-        $string .= (" " x $depth) .  $name;
-        if (ref $args eq 'HASH') {
@@ -305 +302 @@
-
-    for my $t (@$tokens) {
-[0]
-[1]
+tag
+nodeValue
-        } else {
-            my($tokens, $tokens_else, $uncompiled);
-[0]
+tag
-            if ($cond && (exists $cond->{ $tag } && !$cond->{ $tag })) {
-                # if there's a cond for this tag and it's false,
-                # walk the children and look for an MTElse.
-                # the children of the MTElse will become $tokens
-
-
-
-
+
+
+
+
+
-                        last;
-                    }
@@ -323 +321 @@
-                next unless $tokens;
-            } else {
-
+
+
-                    # either there is no cond for this tag, or it's true,
-                    # so we want to partition the children into
-                    # those which are inside an else and those which are not.
-                    ($tokens, $tokens_else) = ([], []);
-
-
+
+
+
-                            push @$tokens_else, $sub;
-                        } else {
@@ -336 +336 @@
-                    }
-                }
-[3]
-
-[0]
+nodeValue
+
+tag
-            if ($h) {
-                $timer->pause_partial if $timer;
-[0]
+tag
-                local($ctx->{__stash}{tokens}) = ref($tokens) ? bless $tokens, 'MT::Template::Tokens' : undef;
-                local($ctx->{__stash}{tokens_else}) = ref($tokens_else) ? bless $tokens_else, 'MT::Template::Tokens' : undef;
-                local($ctx->{__stash}{uncompiled}) = $uncompiled;
-[1]} if defined $t->[1]
-[4]} if defined $t->[4]
+attributes} if defined $t->attributes
+attribute_list} if defined $t->attribute_list
-
-                # process variables
@@ -387 +387 @@
-                    my $err = $ctx->errstr;
-                    if (defined $err) {
-[0]
+tag
-                    }
-                    else {
@@ -414 +414 @@
-                if ($timer) {
-                    $timer->mark("tag_"
-[0]
+tag
-                }
-            } else {
-[0]
-[0]
+tag
+tag
-                }
-            }

trunk/lib/MT/CMS/Template.pm

@@ -145 +145 @@
-            foreach my $tag (@$includes) {
-                my $include = {};
-
+
+
-                next unless $mod;
-tag->[1]
+attr
-                next if exists $seen{$type}{$mod};
-                $seen{$type}{$mod} = 1;
@@ -208 +209 @@
-            my %seen;
-            foreach my $set (@sets) {
-[1]
+attributes
-                next unless $name;
-                next if $seen{$name};

trunk/lib/MT/Template.pm

@@ -11 +11 @@
-use MT::Util qw( weaken );
-
+use MT::Template::Node;
-sub NODE () { 'MT::Template::Node' }
-
-sub NODE_TEXT ()     { 1 }
-sub NODE_BLOCK ()    { 2 }
-sub NODE_FUNCTION () { 3 }
-
-my $resync_to_db;
@@ -188 +185 @@
-    my $str = '';
-    foreach my $token (@$tokens) {
-
-
+
+
+
-        } else {
-            my $tag = $token->[0];
-            $str .= '<mt' . $tag;
-[4]
-[1]
+attribute_list
+attributes
-                foreach my $a (@$attrs) {
-                    delete $attrh->{$a->[0]};
@@ -208 +205 @@
-            }
-            $str .= '>';
-$token->[2]
+my $childNodes = $token->childNodes
-                # container tag
- $token->[2] 
+$childNodes
-                $str .= '</mt' . $tag . '>';
-            }
@@ -552 +549 @@
-    return unless $tokens;
-    foreach my $t (@$tokens) {
-[0]
-$t->[1]->{id}
+tag
+my $id = $t->getAttribute('id')
-                my $ids = $tmpl->{__ids} ||= {};
-t->[1]->{id}
+id
-            }
-$t->[1]->{class}
+my $class = $t->getAttribute('class')
-                my $classes = $tmpl->{__classes} ||= {};
-t->[1]->{class}
+class
-            }
-
+
+
+
-        }
-    }
@@ -712 +711 @@
-    my ($id) = @_;
-    if (my $node = $tmpl->token_ids->{$id}) {
-bless $node, NODE
+$node
-    }
-    undef;
@@ -720 +719 @@
-    my $tmpl = shift;
-    my ($tag, $attr) = @_;
-
-
-
+
-}
-
@@ -728 +725 @@
-    my $tmpl = shift;
-    my ($text) = @_;
-
-
-
+
-}
-
@@ -809 +804 @@
-
-use strict;
-sub NODE_TEXT ()     { 1 }
-sub NODE_BLOCK ()    { 2 }
-sub NODE_FUNCTION () { 3 }
-
-sub getElementsByTagName {
@@ -818 +810 @@
-    $name = lc $name;
-    foreach my $t (@$tokens) {
-[0]
+tag
-            push @list, $t;
-        }
-$t->[2]
-t->[2]
+my $childNodes = $t->childNodes
+childNodes
-            push @list, @$subt if $subt;
-        }
@@ -834 +826 @@
-    $name = lc $name;
-    foreach my $t (@$tokens) {
-(ref($t->[1]) eq 'HASH') && (lc ($t->[1]{'name'} || '') eq $name)
+lc ($t->getAttribute('name') || '') eq $name
-            push @list, $t;
-        }
-$t->[2]
-t->[2]
+my $childNodes = $t->childNodes
+childNodes
-            push @list, @$subt if $subt;
-        }
@@ -844 +836 @@
-    scalar @list ? \@list : undef;
-}
-
-package MT::Template::Node;
-
-use strict;
-use MT::Util qw( weaken );
-
-sub setAttribute {
-    my $node = shift;
-    my ($attr, $val) = @_;
-    if ($attr eq 'id') {
-        # assign into ids
-        my $tmpl = $node->template;
-        my $ids = $tmpl->token_ids;
-        my $old_id = $node->getAttribute("id");
-        if ($old_id && $ids) {
-            delete $ids->{$old_id};
-        }
-    }
-    elsif ($attr eq 'class') {
-        # assign into classes
-        my $tmpl = $node->template;
-        my $classes = $tmpl->token_classes;
-        my $old_class = $node->getAttribute("class");
-        if ($old_class && $classes->{$old_class}) {
-            @{$classes->{$old_class}} = grep { $_ != $node }
-                @{$classes->{$old_class}};
-        }
-        push @{$classes->{$val} ||= []}, $node;
-    }
-    ($node->[1] ||= {})->{$attr} = $val;
-}
-
-sub template {
-    my $node = shift;
-    return $node->[6];
-}
-
-sub getAttribute {
-    my $node = shift;
-    my ($attr) = @_;
-    ($node->[1] || {})->{$attr};
-}
-
-# sub attributes {
-#     my $node = shift;
-#     return $node->[1] ||= {};
-# }
-
-sub nextSibling {
-    my $node = shift;
-    my $parent = $node->parentNode->childNodes;
-    my $max = (scalar @$parent) - 1;
-    return undef unless $max;
-    my $last = $parent->[0];
-    foreach my $n ($parent->[1..$max]) {
-        return $n if $node == $last;
-        $last = $n;
-    }
-    return $parent->[$max] if $node == $last;
-    return undef;
-}
-
-sub lastChild {
-    my $node = shift;
-    my $children = $node->childNodes or return undef;
-    @$children ? $children->[scalar @$children - 1] : undef;
-}
-
-sub firstChild {
-    my $node = shift;
-    my $children = $node->[2] or return undef;
-    @$children ? $children->[0] : undef;
-}
-
-sub previousSibling {
-    my $node = shift;
-    my $parent = $node->parentNode->childNodes;
-    my $last;
-    foreach my $n (@$parent) {
-        return $last if $node == $n;
-        $last = $n;
-    }
-    return undef;
-}
-
-sub parentNode {
-    my $node = shift;
-    weaken($node->[5] = shift) if @_;
-    $node->[5];
-}
-
-sub childNodes {
-    my $node = shift;
-    $node->[2] = shift if @_;
-    $node->[2];
-}
-
-sub ownerDocument { #template
-    my $node = shift;
-    return $node->template;
-}
-
-sub hasChildNodes {
-    my $node = shift;
-    $node->[2] && (@{$node->[2]}) ? 1 : 0;
-}
-
-sub nodeType {
-    my $node = shift;
-    if ($node->[0] eq 'TEXT') {
-        return NODE_TEXT();
-    } elsif (defined $node->[2]) {
-        return NODE_BLOCK();
-    } else {
-        return NODE_FUNCTION();
-    }
-}
-
-sub nodeName {
-    my $node = shift;
-    if ($node->[0] eq 'TEXT') {
-        return undef;
-    }
-    # normalize:
-    #    MTEntry => mt:entry
-    #    MTAPP:WIDGET => mtapp:widget
-    my $tag = lc $node->[0];
-    if (($tag !~ m/:/) && ($tag =~ m/^mt/)) {
-        $tag =~ s/^mt/mt:/;
-    }
-    return $tag;
-}
-
-# Returns text of a text node; inner text for a block tag, or undef
-# for a function tag.
-sub nodeValue {
-    my $node = shift;
-    if ($node->[0] eq 'TEXT') {
-        return $node->[1];
-    } else {
-        if (defined $node->[3]) {
-            return $node->[3];
-        }
-    }
-    return undef;
-}
-
-sub innerHTML {
-    my $node = shift;
-    if (@_) {
-        my ($text) = @_;
-        $node->[3] = $text;
-        my $builder = new MT::Builder;
-        my $ctx = MT::Template::Context->new;
-        $node->[2] = $builder->compile($ctx, $text);
-        my $tmpl = $node->ownerDocument;
-        if ($tmpl) {
-            $tmpl->reset_markers;
-            $tmpl->{reflow_flag} = 1;
-        }
-    }
-    return $node->[3];
-}
-
-# TBD: what about new nodes that are added with id elements?
-sub appendChild {
-    my $node = shift;
-    my ($new_node) = @_;
-    my $nodes = $node->childNodes;
-    push @$nodes, $new_node;
-    my $tmpl = $node->ownerDocument;
-    if ($tmpl) {
-        $tmpl->{reflow_flag} = 1;
-    }
-}
-
-sub removeChild {
-    my $node = shift;
-}
-
-*inner_html = \&innerHTML;
-*append_child = \&appendChild;
-*insert_before = \&insertBefore;
-*remove_child = \&removeChild;
-
-# trans('Index')