[7450] parsetexi update

[gavinsmith0123]

Revision: 7450
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7450
Author:   gavin
Date:     2016-10-14 06:02:02 +0000 (Fri, 14 Oct 2016)
Log Message:
-----------
parsetexi update

Modified Paths:
--------------
    trunk/tp/parsetexi/def.c
    trunk/tp/parsetexi/end_line.c
    trunk/tp/parsetexi/separator.c

Modified: trunk/tp/parsetexi/def.c
===================================================================
--- trunk/tp/parsetexi/def.c    2016-10-12 18:45:20 UTC (rev 7449)
+++ trunk/tp/parsetexi/def.c    2016-10-14 06:02:02 UTC (rev 7450)
@@ -81,7 +81,7 @@
 {
   char *text;
   ELEMENT *spaces = 0;
-  int space_len;
+  int space_len = 0;
   ELEMENT *ret;
 
   *spaces_out = 0;
@@ -389,15 +389,17 @@
                   add_to_def_args_extra (def_args, "arg", e);
                   p += len;
                 }
-              len = strspn (p, "[](),");
-              if (len == 0)
+              if (!*p)
                 break;
-
-              e = new_element (ET_delimiter);
-              e->parent_type = route_not_in_tree;
-              text_append_n (&e->text, p, len);
-              add_to_def_args_extra (def_args, "delimiter", e);
-              p += len;
+              while (*p && strchr ("[](),", *p))
+                {
+                  e = new_element (ET_delimiter);
+                  e->parent_type = route_not_in_tree;
+                  text_append_n (&e->text, p++, 1);
+                  add_to_def_args_extra (def_args, "delimiter", e);
+                }
+              if (!*p)
+                break;
             }
           destroy_element (arg);
         }
@@ -435,7 +437,7 @@
               next_is_type = 0;
             }
           else
-            next_is_type = 0;
+            next_is_type = 1;
         }
     }
 

Modified: trunk/tp/parsetexi/end_line.c
===================================================================
--- trunk/tp/parsetexi/end_line.c       2016-10-12 18:45:20 UTC (rev 7449)
+++ trunk/tp/parsetexi/end_line.c       2016-10-14 06:02:02 UTC (rev 7450)
@@ -2120,6 +2120,7 @@
             {
               ELEMENT *index_contents = new_element (ET_NONE);
               ELEMENT *e;
+              int translation_used = 0, i;
 
               // 2824
               if (class)
@@ -2139,9 +2140,11 @@
                       add_to_contents_as_array (index_contents, e);
 
                       add_to_contents_as_array (index_contents, class);
+                      translation_used = 1;
                     }
                   else if (def_command == CM_defivar
-                           || def_command == CM_deftypeivar)
+                           || def_command == CM_deftypeivar
+                           || def_command == CM_deftypecv)
                     {
                       /* NAME of CLASS */
                       add_to_contents_as_array (index_contents, name);
@@ -2152,12 +2155,22 @@
                       add_to_contents_as_array (index_contents, e);
 
                       add_to_contents_as_array (index_contents, class);
+                      translation_used = 1;
                     }
                 }
               index_contents->parent_type = route_not_in_tree;
 
               if (index_contents->contents.number == 0)
                 add_to_contents_as_array (index_contents, index_entry);
+              if (translation_used)
+                {
+                  for (i = 0; i < index_contents->contents.number; i++)
+                    {
+                      index_contents->contents.list[i]->parent = 0;
+                      /* These elements appear in both the main tree
+                         and in the index information. */
+                    }
+                }
 
               enter_index_entry (def_command,
                                  original_def_command,

Modified: trunk/tp/parsetexi/separator.c
===================================================================
--- trunk/tp/parsetexi/separator.c      2016-10-12 18:45:20 UTC (rev 7449)
+++ trunk/tp/parsetexi/separator.c      2016-10-14 06:02:02 UTC (rev 7450)
@@ -81,8 +81,6 @@
                     command_data(current->cmd).data);
       counter_dec (&count_remaining_args);
 
-      // TODO 4899 definfoenclose
-
       arg = new_element (ET_NONE);
       add_to_element_args (current, arg);
       current = arg;