texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp texi2any.pl Texinfo/Common.pm Texinf...


From: Patrice Dumas
Subject: texinfo/tp texi2any.pl Texinfo/Common.pm Texinf...
Date: Sun, 16 Dec 2012 22:14:45 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/12/16 22:14:45

Modified files:
        tp             : texi2any.pl 
        tp/Texinfo     : Common.pm Parser.pm Report.pm 
        tp/Texinfo/Convert: Converter.pm 
        tp/t/results/xtable: definfoenclose_on_table_line.pl 

Log message:
        Support for pgettext and __p to give context in translated messages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.154&r2=1.155
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.164&r2=1.165
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Parser.pm?cvsroot=texinfo&r1=1.404&r2=1.405
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Report.pm?cvsroot=texinfo&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/Converter.pm?cvsroot=texinfo&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl?cvsroot=texinfo&r1=1.19&r2=1.20

Patches:
Index: texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -b -r1.154 -r1.155
--- texi2any.pl 14 Dec 2012 23:14:45 -0000      1.154
+++ texi2any.pl 16 Dec 2012 22:14:44 -0000      1.155
@@ -215,6 +215,9 @@
     File::Spec->catdir($updir, $updir, $updir, 'tp', 'LocaleData')) {
     if (-d $locales_dir) {
       Locale::Messages::bindtextdomain ($strings_textdomain, $locales_dir);
+      # the messages in this domain are not regenerated automatically, 
+      # only when calling ./maintain/regenerate_perl_module_files.sh
+      Locale::Messages::bindtextdomain ($messages_textdomain, $locales_dir);
       $locales_dir_found = 1;
       last;
     }
@@ -225,10 +228,12 @@
 } else {
   Locale::Messages::bindtextdomain ($strings_textdomain, 
                                     File::Spec->catdir($datadir, 'locale'));
+  Locale::Messages::bindtextdomain ($messages_textdomain,
+                                    File::Spec->catdir($datadir, 'locale'));
 }
 
-Locale::Messages::bindtextdomain ($messages_textdomain, 
-                                  File::Spec->catdir($datadir, 'locale'));
+#Locale::Messages::bindtextdomain ($messages_textdomain, 
+#                                  File::Spec->catdir($datadir, 'locale'));
 
 
 # Version setting is complicated, because we cope with 
@@ -496,7 +501,8 @@
 # options for all the files
 my $parser_default_options = {'expanded_formats' => [], 
                               'values' => {'txicommandconditionals' => 1},
-                              'gettext' => \&__};
+                              'gettext' => \&__,
+                              'pgettext' => \&__p,};
 
 Texinfo::Config::_load_config($converter_default_options, $cmdline_options);
 

Index: Texinfo/Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- Texinfo/Common.pm   15 Dec 2012 17:12:56 -0000      1.164
+++ Texinfo/Common.pm   16 Dec 2012 22:14:44 -0000      1.165
@@ -97,6 +97,7 @@
   'context' => '_root',
   'expanded_formats' => [],
   'gettext' => sub {return $_[0];},
+  'pgettext' => sub {return $_[1];},
   'include_directories' => [ '.' ],
   # these are the user-added indices.  May be an array reference on names
   # or an hash reference in the same format than %index_names below

Index: Texinfo/Parser.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Parser.pm,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -b -r1.404 -r1.405
--- Texinfo/Parser.pm   15 Dec 2012 17:12:56 -0000      1.404
+++ Texinfo/Parser.pm   16 Dec 2012 22:14:45 -0000      1.405
@@ -94,11 +94,11 @@
   return $_[0];
 }
 
-sub __($$)
-{
-  my $self = shift;
-  return &{$self->{'gettext'}}(@_);
-}
+#sub __($$)
+#{
+#  my $self = shift;
+#  return &{$self->{'gettext'}}(@_);
+#}
 
 # Customization variables obeyed by the Parser, and the default values.
 our %default_customization_values = (
@@ -554,6 +554,7 @@
   my $parser = _deep_copy(\%parser_default_configuration);
   # _deep_copy doesn't handle subs
   $parser->{'gettext'} = $parser_default_configuration{'gettext'};
+  $parser->{'pgettext'} = $parser_default_configuration{'pgettext'};
 
   # called not object-oriented
   if (ref($class) eq 'HASH') {
@@ -579,6 +580,7 @@
     }
     #$parser = _deep_copy($old_parser);
     $parser->{'gettext'} = $old_parser->{'gettext'};
+    $parser->{'pgettext'} = $old_parser->{'pgettext'};
     bless $parser, $class;
     $conf = shift;
 

Index: Texinfo/Report.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Report.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- Texinfo/Report.pm   25 Sep 2012 17:46:36 -0000      1.24
+++ Texinfo/Report.pm   16 Dec 2012 22:14:45 -0000      1.25
@@ -64,6 +64,12 @@
   return &{$self->{'gettext'}}(@_);
 }
 
+sub __p($$$)
+{
+  my $self = shift;
+  return &{$self->{'pgettext'}}(@_);
+}
+
 sub new($)
 {
   my $self = shift;
@@ -71,6 +77,7 @@
   #print STDERR "REPORT NEW $self $self->{'errors_warnings'}\n";
   $self->{'errors_nrs'} = 0;
   $self->{'gettext'} = sub {return $_[0];} if (!defined($self->{'gettext'}));
+  $self->{'pgettext'} = sub {return $_[1];} if (!defined($self->{'pgettext'}));
   return $self;
 }
 

Index: Texinfo/Convert/Converter.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/Converter.pm,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- Texinfo/Convert/Converter.pm        19 Nov 2012 18:11:35 -0000      1.92
+++ Texinfo/Convert/Converter.pm        16 Dec 2012 22:14:45 -0000      1.93
@@ -259,6 +259,7 @@
                and $converter->{'structuring'}
                and $converter->{'structuring'}->{'sectioning_root'});
       $converter->{'gettext'} = $converter->{'parser'}->{'gettext'};
+      $converter->{'pgettext'} = $converter->{'parser'}->{'pgettext'};
       delete $conf->{'parser'};
     }
     foreach my $key (keys(%$conf)) {

Index: t/results/xtable/definfoenclose_on_table_line.pl
===================================================================
RCS file: 
/sources/texinfo/texinfo/tp/t/results/xtable/definfoenclose_on_table_line.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- t/results/xtable/definfoenclose_on_table_line.pl    3 Sep 2012 21:58:50 
-0000       1.19
+++ t/results/xtable/definfoenclose_on_table_line.pl    16 Dec 2012 22:14:45 
-0000      1.20
@@ -72,54 +72,16 @@
               'cmdname' => 'phi',
               'extra' => {
                 'begin' => ':',
-                'end' => ':'
-              },
-              'parent' => {},
-              'type' => 'definfoenclose_command'
-            },
-            {
-              'parent' => {},
-              'text' => '
-',
-              'type' => 'space_at_end_block_command'
-            }
-          ],
-          'parent' => {},
-          'type' => 'block_line_arg'
-        }
-      ],
-      'cmdname' => 'table',
-      'contents' => [
-        {
-          'contents' => [
-            {
-              'contents' => [
-                {
-                  'args' => [
+                'brace_command_contents' => [
+                  [
                     {
+                      'parent' => {
                       'contents' => [
                         {
                           'extra' => {
-                            'command' => {}
-                          },
-                          'parent' => {},
-                          'text' => ' ',
-                          'type' => 'empty_spaces_after_command'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => 'item'
-                        },
-                        {
-                          'parent' => {},
-                          'text' => '
-',
-                          'type' => 'spaces_at_end'
-                        }
-                      ],
-                      'parent' => {},
-                      'type' => 'misc_line_arg'
-                    }
+                              'command' => {
+                                'args' => [
+                                  {}
                   ],
                   'cmdname' => 'item',
                   'extra' => {
@@ -133,8 +95,9 @@
                     'line_nr' => 4,
                     'macro' => ''
                   },
-                  'parent' => {}
-                },
+                                'parent' => {
+                                  'contents' => [
+                                    {},
                 {
                   'args' => [
                     {
@@ -177,9 +140,9 @@
                   'parent' => {}
                 }
               ],
-              'parent' => {},
-              'type' => 'table_term'
-            },
+                                  'parent' => {
+                                    'contents' => [
+                                      {},
             {
               'contents' => [
                 {
@@ -207,6 +170,51 @@
           'parent' => {},
           'type' => 'table_entry'
         },
+                                  'type' => 'table_term'
+                                }
+                              }
+                            },
+                            'parent' => {},
+                            'text' => ' ',
+                            'type' => 'empty_spaces_after_command'
+                          },
+                          {},
+                          {
+                            'parent' => {},
+                            'text' => '
+',
+                            'type' => 'spaces_at_end'
+                          }
+                        ],
+                        'parent' => {},
+                        'type' => 'misc_line_arg'
+                      },
+                      'text' => 'item'
+                    }
+                  ],
+                  [
+                    {}
+                  ]
+                ],
+                'end' => ':'
+              },
+              'parent' => {},
+              'type' => 'definfoenclose_command'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'space_at_end_block_command'
+            }
+          ],
+          'parent' => {},
+          'type' => 'block_line_arg'
+        }
+      ],
+      'cmdname' => 'table',
+      'contents' => [
+        {},
         {
           'args' => [
             {
@@ -279,31 +287,33 @@
 $result_trees{'definfoenclose_on_table_line'}{'contents'}[1]{'parent'} = 
$result_trees{'definfoenclose_on_table_line'};
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'args'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'}{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[1]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'};
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[1][0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'contents'}[1]{'args'}[0]{'contents'}[1];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[2]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'misc_content'}[0]
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0];
-$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2];
+$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[0] = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'args'}[0]{'contents'}[1]{'extra'}{'brace_command_contents'}[0][0]{'parent'}{'contents'}[0]{'extra'}{'command'}{'parent'}{'parent'};
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'}
 = $result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];
 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'}
 = 
$result_trees{'definfoenclose_on_table_line'}{'contents'}[2]{'contents'}[1]{'args'}[0];



reply via email to

[Prev in Thread] Current Thread [Next in Thread]