texinfo-commits
[Top][All Lists]
Advanced

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

[5240] Accept the same character in @value as in @set.


From: Patrice Dumas
Subject: [5240] Accept the same character in @value as in @set.
Date: Sat, 16 Mar 2013 00:31:31 +0000

Revision: 5240
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5240
Author:   pertusus
Date:     2013-03-16 00:31:30 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
Accept the same character in @value as in @set.

Modified Paths:
--------------
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/50value.t

Added Paths:
-----------
    trunk/tp/t/results/value/not_only_characters.pl

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2013-03-14 23:23:11 UTC (rev 5239)
+++ trunk/tp/Texinfo/Parser.pm  2013-03-16 00:31:30 UTC (rev 5240)
@@ -4155,7 +4155,8 @@
         if ($command eq 'value') {
           $line =~ s/^\s*// 
              if ($self->{'IGNORE_SPACE_AFTER_BRACED_COMMAND_NAME'});
-          if ($line =~ s/^{([\w\-]+)}//) {
+          # REVALUE
+          if ($line =~ s/^{([\w\-][^\s{\\}~`\^+"<>|@]*)}//) {
             my $value = $1;
             if (exists($self->{'values'}->{$value})) {
               if (!defined($self->{'values'}->{$value})) {

Modified: trunk/tp/t/50value.t
===================================================================
--- trunk/tp/t/50value.t        2013-03-14 23:23:11 UTC (rev 5239)
+++ trunk/tp/t/50value.t        2013-03-16 00:31:30 UTC (rev 5240)
@@ -10,6 +10,11 @@
 
 @value{a-_5b} After value.
 '],
+['not_only_characters',
+'@set -e_\'::; hh
+
+Say @value{-e_\'::;}.
+'],
 ['bad_syntax','
 @set
 @set 

Added: trunk/tp/t/results/value/not_only_characters.pl
===================================================================
--- trunk/tp/t/results/value/not_only_characters.pl                             
(rev 0)
+++ trunk/tp/t/results/value/not_only_characters.pl     2013-03-16 00:31:30 UTC 
(rev 5240)
@@ -0,0 +1,74 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'not_only_characters'} = {
+  'contents' => [
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => '-e_\'::;',
+          'type' => 'misc_arg'
+        },
+        {
+          'parent' => {},
+          'text' => 'hh',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'set',
+      'extra' => {
+        'arg_line' => ' -e_\'::; hh
+',
+        'misc_args' => [
+          '-e_\'::;',
+          'hh'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => 'Say hh.
+'
+        }
+      ],
+      'parent' => {},
+      'type' => 'paragraph'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'not_only_characters'}{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'not_only_characters'}{'contents'}[0];
+$result_trees{'not_only_characters'}{'contents'}[0]{'args'}[1]{'parent'} = 
$result_trees{'not_only_characters'}{'contents'}[0];
+$result_trees{'not_only_characters'}{'contents'}[0]{'parent'} = 
$result_trees{'not_only_characters'};
+$result_trees{'not_only_characters'}{'contents'}[1]{'parent'} = 
$result_trees{'not_only_characters'};
+$result_trees{'not_only_characters'}{'contents'}[2]{'contents'}[0]{'parent'} = 
$result_trees{'not_only_characters'}{'contents'}[2];
+$result_trees{'not_only_characters'}{'contents'}[2]{'parent'} = 
$result_trees{'not_only_characters'};
+
+$result_texis{'not_only_characters'} = '@set -e_\'::; hh
+
+Say hh.
+';
+
+
+$result_texts{'not_only_characters'} = '
+Say hh.
+';
+
+$result_errors{'not_only_characters'} = [];
+
+
+1;




reply via email to

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