[8425] parsetexi update

[gavinsmith0123]

Revision: 8425
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8425
Author:   gavin
Date:     2018-10-27 08:40:39 -0400 (Sat, 27 Oct 2018)
Log Message:
-----------
parsetexi update

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

Modified: trunk/tp/Texinfo/XS/parsetexi/api.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/api.c 2018-10-27 12:26:31 UTC (rev 8424)
+++ trunk/tp/Texinfo/XS/parsetexi/api.c 2018-10-27 12:40:39 UTC (rev 8425)
@@ -42,10 +42,8 @@
 }
 
 void
-reset_parser (void)
+reset_parser_except_conf (void)
 {
-  debug ("!!!!!!!!!!!!!!!! RESETTING THE PARSER !!!!!!!!!!!!!!!!!!!!!");
-
   wipe_indices (); /* do before destroying tree to check route_not_in_tree */
   if (Root)
     {
@@ -60,17 +58,25 @@
   reset_context_stack ();
   reset_region_stack ();
   reset_floats ();
-  clear_expanded_formats ();
   wipe_global_info ();
   reset_internal_xrefs ();
   reset_labels ();
   input_reset_input_stack ();
   free_small_strings ();
-  reset_conf ();
 
   current_node = current_section = current_part = 0;
 }
 
+void
+reset_parser (void)
+{
+  debug ("!!!!!!!!!!!!!!!! RESETTING THE PARSER !!!!!!!!!!!!!!!!!!!!!");
+
+  reset_parser_except_conf ();
+  clear_expanded_formats ();
+  reset_conf ();
+}
+
 /* Set ROOT to root of tree obtained by parsing FILENAME. */
 void
 parse_file (char *filename)
@@ -90,8 +96,7 @@
 void
 parse_string (char *string)
 {
-  if (Root)
-    destroy_element_and_children (Root);
+  reset_parser_except_conf ();
   input_push_text (strdup (string), 0);
   Root = parse_texi (new_element (ET_root_line));
 }
@@ -100,8 +105,7 @@
 void
 parse_text (char *string)
 {
-  if (Root)
-    destroy_element_and_children (Root);
+  reset_parser_except_conf ();
   input_push_text_with_line_nos (strdup (string), 1);
   Root = parse_texi (new_element (ET_text_root));
 }

Modified: trunk/tp/Texinfo/XS/parsetexi/api.h
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/api.h 2018-10-27 12:26:31 UTC (rev 8424)
+++ trunk/tp/Texinfo/XS/parsetexi/api.h 2018-10-27 12:40:39 UTC (rev 8425)
@@ -8,6 +8,7 @@
 int num_contents_children (ELEMENT *e);
 int num_args_children (ELEMENT *e);
 void reset_parser (void);
+void reset_parser_except_conf (void);
 
 /* In parser.c */
 void set_documentlanguage (char *);
@@ -15,14 +16,6 @@
 //HV *build_global_info (void);
 //HV *build_global_info2 (void);
 
-/* Defined in dump_perl.c */
-char *dump_tree_to_string_1 (void);
-char *dump_tree_to_string_2 (void);
-char *dump_tree_to_string_25 (void);
-char *dump_tree_to_string_3 (void);
-char *dump_root_element_1 (void);
-char *dump_root_element_2 (void);
-
 /* In input.c */
 void add_include_directory (char *filename);
 

Modified: trunk/tp/Texinfo/XS/parsetexi/handle_commands.c
===================================================================
--- trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-27 12:26:31 UTC 
(rev 8424)
+++ trunk/tp/Texinfo/XS/parsetexi/handle_commands.c     2018-10-27 12:40:39 UTC 
(rev 8425)
@@ -686,7 +686,6 @@
 }
 
 
-          /* TODO: Allow user to change which formats are true. */
 struct expanded_format {
     char *format;
     int expandedp;