texinfo-commits
[Top][All Lists]
Advanced

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

[7226] change error message for large arg to @U


From: gavinsmith0123
Subject: [7226] change error message for large arg to @U
Date: Tue, 14 Jun 2016 19:01:28 +0000 (UTC)

Revision: 7226
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7226
Author:   gavin
Date:     2016-06-14 19:01:28 +0000 (Tue, 14 Jun 2016)
Log Message:
-----------
change error message for large arg to @U

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/results/coverage/invalid_U.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-06-14 18:08:32 UTC (rev 7225)
+++ trunk/ChangeLog     2016-06-14 19:01:28 UTC (rev 7226)
@@ -1,5 +1,12 @@
 2016-06-14  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/Parser.pm (_parse_texi) <@U>: Change the error 
+       message given when argument exceeds size of integer.  (This is 
+       for consistency with the C implementation which may have a 
+       different size of integer.)
+
+2016-06-14  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Parser.pm (_parse_texi) <closed raw block command>: 
        Do not call _start_empty_line_after_command, and add an 
        'empty_line_after_command' element.  This led to an inconsistent 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2016-06-14 18:08:32 UTC (rev 7225)
+++ trunk/tp/Texinfo/Parser.pm  2016-06-14 19:01:28 UTC (rev 7226)
@@ -5292,12 +5292,10 @@
                 if ($@) {
                   # leave clue in case something else went wrong.
                   warn "address@hidden hex($arg) eval failed: address@hidden" 
if ($self->{'DEBUG'});
-                  $self->line_error(
-      sprintf($self->__("argument for address@hidden exceeds size of integer: 
%s"), $arg),
-                    $line_nr);
-
+                  # argument likely exceeds size of integer
+                }
                 # ok, value can be given to hex(), so try it.
-                } elsif (hex($arg) > 0x10FFFF) {
+                if ($@ or hex($arg) > 0x10FFFF) {
                   $self->line_error(
     sprintf($self->__("argument for address@hidden exceeds Unicode maximum 
0x10FFFF: %s"),
             $arg),

Modified: trunk/tp/t/results/coverage/invalid_U.pl
===================================================================
--- trunk/tp/t/results/coverage/invalid_U.pl    2016-06-14 18:08:32 UTC (rev 
7225)
+++ trunk/tp/t/results/coverage/invalid_U.pl    2016-06-14 19:01:28 UTC (rev 
7226)
@@ -285,12 +285,12 @@
     'type' => 'warning'
   },
   {
-    'error_line' => ':1: argument for @U exceeds size of integer: 9999999999999
+    'error_line' => ':1: argument for @U exceeds Unicode maximum 0x10FFFF: 
9999999999999
 ',
     'file_name' => '',
     'line_nr' => 1,
     'macro' => '',
-    'text' => 'argument for @U exceeds size of integer: 9999999999999',
+    'text' => 'argument for @U exceeds Unicode maximum 0x10FFFF: 
9999999999999',
     'type' => 'error'
   },
   {




reply via email to

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