[8441] parsetexi update

[gavinsmith0123]

Revision: 8441
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8441
Author:   gavin
Date:     2018-10-29 14:05:29 -0400 (Mon, 29 Oct 2018)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/Texinfo/XS/parsetexi/api.c
    trunk/tp/Texinfo/XS/parsetexi/end_line.c
    trunk/tp/Texinfo/XS/parsetexi/handle_commands.c
    trunk/tp/Texinfo/XS/parsetexi/macro.c

Modified: trunk/tp/Texinfo/XS/parsetexi/api.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/api.c 2018-10-28 11:31:57 UTC (rev 8440)
+++ trunk/tp/Texinfo/XS/parsetexi/api.c 2018-10-29 18:05:29 UTC (rev 8441)
@@ -386,7 +386,7 @@
               break;
               }
             case extra_integer:
-              { /* A simple string. */
+              { /* A simple integer. */
               int value = (int) f;
               STORE(newSViv (value));
               break;

Modified: trunk/tp/Texinfo/XS/parsetexi/end_line.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/end_line.c    2018-10-28 11:31:57 UTC (rev 
8440)
+++ trunk/tp/Texinfo/XS/parsetexi/end_line.c    2018-10-29 18:05:29 UTC (rev 
8441)
@@ -1850,7 +1850,6 @@
         }
       else
         {
-          // pop and check context stack
           pop_context (); /* ct_line */;
 
           current = current->parent;
@@ -1857,13 +1856,12 @@
 
           if ((misc_args = lookup_extra (misc_cmd, "misc_args")))
             {
-              char *s;
               add_extra_element (current, "columnfractions", misc_cmd);
-              asprintf (&s, "%d", misc_args->value->contents.number);
-              add_extra_string (current, "max_columns", s);
+              add_extra_integer (current, "max_columns",
+                                 misc_args->value->contents.number);
             }
           else
-              add_extra_string_dup (current, "max_columns", "0");
+            add_extra_integer (current, "max_columns", 0);
 
           before_item = new_element (ET_before_item);
           add_to_element_contents (current, before_item);
@@ -1925,7 +1923,6 @@
   return current;
 }
 
-/* 2610 */
 /* Actions to be taken when a whole line of input has been processed */
 ELEMENT *
 end_line (ELEMENT *current)
@@ -1932,7 +1929,6 @@
 {
   ELEMENT *current_old = current; /* Used at very end of function */
 
-  // 2621
   /* If empty line, start a new paragraph. */
   if (last_contents_child (current)
       && last_contents_child (current)->type == ET_empty_line)

Modified: trunk/tp/Texinfo/XS/parsetexi/handle_commands.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-28 11:31:57 UTC 
(rev 8440)
+++ trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-29 18:05:29 UTC 
(rev 8441)
@@ -211,16 +211,16 @@
                     }
                   else /* 4505 @item or @headitem */
                     {
-                      ELEMENT *row; char *s;
+                      ELEMENT *row;
 
                       debug ("ROW");
                       row = new_element (ET_row);
                       add_to_element_contents (parent, row);
 
-                      /* FIXME:The "row_number" extra value,
-                         isn't actually used anywhere. */
-                      asprintf (&s, "%d", parent->contents.number-1);
-                      add_extra_string (row, "row_number", s);
+                      /* Note that the "row_number" extra value,
+                         isn't actually used anywhere at present. */
+                      add_extra_integer (row, "row_number",
+                                         parent->contents.number - 1);
 
                       misc = new_element (ET_NONE);
                       misc->cmd = cmd;
@@ -230,9 +230,8 @@
                       if (counter_value (&count_cells, parent) != -1)
                         counter_pop (&count_cells);
                       counter_push (&count_cells, row, 1);
-                      asprintf (&s, "%d",
-                                counter_value (&count_cells, row));
-                      add_extra_string (current, "cell_number", s);
+                      add_extra_integer (current, "cell_number",
+                                         counter_value (&count_cells, row));
                     }
                 }
               current = begin_preformatted (current);

Modified: trunk/tp/Texinfo/XS/parsetexi/macro.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/macro.c       2018-10-28 11:31:57 UTC (rev 
8440)
+++ trunk/tp/Texinfo/XS/parsetexi/macro.c       2018-10-29 18:05:29 UTC (rev 
8441)
@@ -524,7 +524,6 @@
     {
       line = p;
       line++;
-      /* FIXME: In the Perl version formfeed is excluded for some reason. */
       line += strspn (line, whitespace_chars);
       arguments = expand_macro_arguments (macro, &line, cmd);
     }