[6216] parsetexi empty value expansion at end of line

[Gavin D. Smith]

Revision: 6216
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6216
Author:   gavin
Date:     2015-04-09 19:40:48 +0000 (Thu, 09 Apr 2015)
Log Message:
-----------
parsetexi empty value expansion at end of line

Modified Paths:
--------------
    trunk/parsetexi/end_line.c
    trunk/parsetexi/handle_commands.c
    trunk/parsetexi/input.c
    trunk/parsetexi/parser.c

Modified: trunk/parsetexi/end_line.c
===================================================================
--- trunk/parsetexi/end_line.c  2015-04-09 17:40:36 UTC (rev 6215)
+++ trunk/parsetexi/end_line.c  2015-04-09 19:40:48 UTC (rev 6216)
@@ -109,7 +109,7 @@
       while (strchr (whitespace_chars, *q))
         q--;
 
-      if (q > p)
+      if (q >= p)
         ADD_ARG(p, q - p + 1); /* value */
       else
         ADD_ARG("", 0);

Modified: trunk/parsetexi/handle_commands.c
===================================================================
--- trunk/parsetexi/handle_commands.c   2015-04-09 17:40:36 UTC (rev 6215)
+++ trunk/parsetexi/handle_commands.c   2015-04-09 19:40:48 UTC (rev 6216)
@@ -179,7 +179,7 @@
       if (cmd == CM_item || cmd == CM_itemx
           || cmd == CM_headitem || cmd == CM_tab)
         {
-          ELEMENT *misc, *parent;
+          ELEMENT *misc = 0, *parent;
 
           /* @itemize or @enumerate */ // 4443
           if ((parent = item_container_parent (current)))
@@ -446,7 +446,7 @@
       // open a new element (which we shall later remove).
 
       debug ("CONDITIONAL %s", command_name(cmd));
-      if (cmd != CM_ifnotinfo) // && cmd != CM_iftex) // TODO
+      if (cmd != CM_ifnotinfo && cmd != CM_iftex) // TODO
         push_conditional_stack (cmd); // Not ignored
       else
         {

Modified: trunk/parsetexi/input.c
===================================================================
--- trunk/parsetexi/input.c     2015-04-09 17:40:36 UTC (rev 6215)
+++ trunk/parsetexi/input.c     2015-04-09 19:40:48 UTC (rev 6216)
@@ -71,10 +71,7 @@
       free (new);
 
       if (t.text[t.end - 1] == '\n')
-        {
-          t.text[t.end - 1] = '\0';
-          break;
-        }
+        break;
     }
 
   if (t.end > 0)

Modified: trunk/parsetexi/parser.c
===================================================================
--- trunk/parsetexi/parser.c    2015-04-09 17:40:36 UTC (rev 6215)
+++ trunk/parsetexi/parser.c    2015-04-09 19:40:48 UTC (rev 6216)
@@ -595,6 +595,7 @@
 
   enum command_id cmd = CM_NONE;
 
+  /********* BLOCK_raw or (ignored) BLOCK_conditional ******************/
   /* If in raw block, or ignored conditional block. */
   // 3727
   if (command_flags(current) & CF_block
@@ -781,7 +782,7 @@
             {
               cmd = lookup_command (command);
               if (!cmd)
-                ;//line_errorf ("unknown command `%s'", command); // 4877
+                line_errorf ("unknown command `%s'", command); // 4877
             }
           free (command);
         }
@@ -898,11 +899,10 @@
 
                   line++; /* past '}' */
                   input_push_text (strdup (line));
-                  line = strchr (line, '\0');
                   input_push_text (strdup (value));
-                  retval = 0;
+                  line = new_line ();
+                  retval = 1;
                   goto funexit;
-                  //return;
                 }
             }
           else