Fix an old-style function definition to ANSI C

diff --git a/src/parse.c b/src/parse.c
index 9e4ab45..4cc4596 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "3.0.2"
+#define YYBISON_VERSION "3.0.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -1203,6 +1203,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
       case N:                               \
         yyformat = S;                       \
       break
+    default: /* Avoid compiler warnings. */
       YYCASE_(0, YY_("syntax error"));
       YYCASE_(1, YY_("syntax error, unexpected %s"));
       YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1530,7 +1531,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 141 "parse.y" /* yacc.c:1646  */
+#line 141 "parse.y" /* yacc.c:1648  */
     { /* add default rule */
                        int def_rule;
 
@@ -1557,162 +1558,162 @@ yyreduce:
 
                        add_action( ";\n\tYY_BREAK]]\n" );
                        }
-#line 1550 "parse.c" /* yacc.c:1646  */
+#line 1551 "parse.c" /* yacc.c:1648  */
     break;
 
   case 3:
-#line 170 "parse.y" /* yacc.c:1646  */
+#line 170 "parse.y" /* yacc.c:1648  */
     { /* initialize for processing rules */
 
                        /* Create default DFA start condition. */
                        scinstal( "INITIAL", false );
                        }
-#line 1560 "parse.c" /* yacc.c:1646  */
+#line 1561 "parse.c" /* yacc.c:1648  */
     break;
 
   case 4:
-#line 178 "parse.y" /* yacc.c:1646  */
+#line 178 "parse.y" /* yacc.c:1648  */
     {
  insert_after(2, "</AST_Section1_StartConditions>");
  sprintf(piece_temp, "<AST_Section1_StartConditions exclusive=\"%s\">", xcluflg ? "true" : "false");
  insert_before(1, piece_temp);
  }
-#line 1570 "parse.c" /* yacc.c:1646  */
+#line 1571 "parse.c" /* yacc.c:1648  */
     break;
 
   case 5:
-#line 184 "parse.y" /* yacc.c:1646  */
+#line 184 "parse.y" /* yacc.c:1648  */
     {
  insert_after(1, "</AST_Section1_Options>");
  insert_before(1, "<AST_Section1_Options>");
  }
-#line 1579 "parse.c" /* yacc.c:1646  */
+#line 1580 "parse.c" /* yacc.c:1648  */
     break;
 
   case 7:
-#line 190 "parse.y" /* yacc.c:1646  */
+#line 190 "parse.y" /* yacc.c:1648  */
     { synerr( _("unknown error processing section 1") ); }
-#line 1585 "parse.c" /* yacc.c:1646  */
+#line 1586 "parse.c" /* yacc.c:1648  */
     break;
 
   case 8:
-#line 194 "parse.y" /* yacc.c:1646  */
+#line 194 "parse.y" /* yacc.c:1648  */
     {
                        check_options();
                        scon_stk = allocate_integer_array( lastsc + 1 );
                        scon_stk_ptr = 0;
                        }
-#line 1595 "parse.c" /* yacc.c:1646  */
+#line 1596 "parse.c" /* yacc.c:1648  */
     break;
 
   case 9:
-#line 202 "parse.y" /* yacc.c:1646  */
+#line 202 "parse.y" /* yacc.c:1648  */
     { xcluflg = false; }
-#line 1601 "parse.c" /* yacc.c:1646  */
+#line 1602 "parse.c" /* yacc.c:1648  */
     break;
 
   case 10:
-#line 205 "parse.y" /* yacc.c:1646  */
+#line 205 "parse.y" /* yacc.c:1648  */
     { xcluflg = true; }
-#line 1607 "parse.c" /* yacc.c:1646  */
+#line 1608 "parse.c" /* yacc.c:1648  */
     break;
 
   case 11:
-#line 209 "parse.y" /* yacc.c:1646  */
+#line 209 "parse.y" /* yacc.c:1648  */
     { scinstal( nmstr, xcluflg ); }
-#line 1613 "parse.c" /* yacc.c:1646  */
+#line 1614 "parse.c" /* yacc.c:1648  */
     break;
 
   case 12:
-#line 212 "parse.y" /* yacc.c:1646  */
+#line 212 "parse.y" /* yacc.c:1648  */
     { scinstal( nmstr, xcluflg ); }
-#line 1619 "parse.c" /* yacc.c:1646  */
+#line 1620 "parse.c" /* yacc.c:1648  */
     break;
 
   case 13:
-#line 215 "parse.y" /* yacc.c:1646  */
+#line 215 "parse.y" /* yacc.c:1648  */
     { synerr( _("bad start condition list") ); }
-#line 1625 "parse.c" /* yacc.c:1646  */
+#line 1626 "parse.c" /* yacc.c:1648  */
     break;
 
   case 17:
-#line 226 "parse.y" /* yacc.c:1646  */
+#line 226 "parse.y" /* yacc.c:1648  */
     {
                        outfilename = xstrdup(nmstr);
                        did_outfilename = 1;
  insert_after(2, "</AST_Section1_Options_OutFile>");
  insert_before(0,"<AST_Section1_Options_OutFile>");
                        }
-#line 1636 "parse.c" /* yacc.c:1646  */
+#line 1637 "parse.c" /* yacc.c:1648  */
     break;
 
   case 18:
-#line 233 "parse.y" /* yacc.c:1646  */
+#line 233 "parse.y" /* yacc.c:1648  */
     { extra_type = xstrdup(nmstr); /*}*/
  insert_after(2, "</AST_Section1_Options_ExtraType>");
  insert_before(0, "<AST_Section1_Options_ExtraType>");
  }
-#line 1645 "parse.c" /* yacc.c:1646  */
+#line 1646 "parse.c" /* yacc.c:1648  */
     break;
 
   case 19:
-#line 238 "parse.y" /* yacc.c:1646  */
+#line 238 "parse.y" /* yacc.c:1648  */
     { prefix = xstrdup(nmstr);
                           if (strchr(prefix, '[') || strchr(prefix, ']'))
                               flexerror(_("Prefix must not contain [ or ]")); /*}*/
  insert_after(2, "</AST_Section1_Options_Prefix>");
  insert_before(0, "<AST_Section1_Options_Prefix>");
  }
-#line 1656 "parse.c" /* yacc.c:1646  */
+#line 1657 "parse.c" /* yacc.c:1648  */
     break;
 
   case 20:
-#line 245 "parse.y" /* yacc.c:1646  */
+#line 245 "parse.y" /* yacc.c:1648  */
     { yyclass = xstrdup(nmstr); /*}*/
  insert_after(2, "</AST_Section1_Options_YYClass>");
  insert_before(0, "<AST_Section1_Options_YYClass>");
  }
-#line 1665 "parse.c" /* yacc.c:1646  */
+#line 1666 "parse.c" /* yacc.c:1648  */
     break;
 
   case 21:
-#line 250 "parse.y" /* yacc.c:1646  */
+#line 250 "parse.y" /* yacc.c:1648  */
     { headerfilename = xstrdup(nmstr); /*}*/
  insert_after(2, "</AST_Section1_Options_HeaderFile>");
  insert_before(0, "<AST_Section1_Options_HeaderFile>");
  }
-#line 1674 "parse.c" /* yacc.c:1646  */
+#line 1675 "parse.c" /* yacc.c:1648  */
     break;
 
   case 22:
-#line 255 "parse.y" /* yacc.c:1646  */
+#line 255 "parse.y" /* yacc.c:1648  */
     { tablesext = true; tablesfilename = xstrdup(nmstr); /*}*/
  insert_after(2, "</AST_Section1_Options_TablesFile>");
  insert_before(0, "<AST_Section1_Options_TablesFile>");
  }
-#line 1683 "parse.c" /* yacc.c:1646  */
+#line 1684 "parse.c" /* yacc.c:1648  */
     break;
 
   case 23:
-#line 262 "parse.y" /* yacc.c:1646  */
+#line 262 "parse.y" /* yacc.c:1648  */
     { scon_stk_ptr = (yyvsp[-3]); /*}*/
  insert_after(4, "</AST_Section2_Rule>");
  insert_before(1, "<AST_Section2_Rule>");
  }
-#line 1692 "parse.c" /* yacc.c:1646  */
+#line 1693 "parse.c" /* yacc.c:1648  */
     break;
 
   case 24:
-#line 267 "parse.y" /* yacc.c:1646  */
+#line 267 "parse.y" /* yacc.c:1648  */
     { scon_stk_ptr = (yyvsp[-3]); /*}*/
  insert_after(4, "</AST_Section2_CompoundRule>");
  insert_before(1, "<AST_Section2_CompoundRule>");
  }
-#line 1701 "parse.c" /* yacc.c:1646  */
+#line 1702 "parse.c" /* yacc.c:1648  */
     break;
 
   case 26:
-#line 275 "parse.y" /* yacc.c:1646  */
+#line 275 "parse.y" /* yacc.c:1648  */
     {
                        /* Initialize for a parse of one rule. */
                        trlcontxt = variable_trail_rule = varlength = false;
@@ -1723,11 +1724,11 @@ yyreduce:
 
                        new_rule();
                        }
-#line 1716 "parse.c" /* yacc.c:1646  */
+#line 1717 "parse.c" /* yacc.c:1648  */
     break;
 
   case 27:
-#line 288 "parse.y" /* yacc.c:1646  */
+#line 288 "parse.y" /* yacc.c:1648  */
     {
                        pat = (yyvsp[0]);
                        finish_rule( pat, variable_trail_rule,
@@ -1764,11 +1765,11 @@ yyreduce:
  insert_after(1, "</AST_Section2_Rule_FLexRule>");
  insert_before(0, "<AST_Section2_Rule_FLexRule bol=\"true\">");
                        }
-#line 1757 "parse.c" /* yacc.c:1646  */
+#line 1758 "parse.c" /* yacc.c:1648  */
     break;
 
   case 28:
-#line 326 "parse.y" /* yacc.c:1646  */
+#line 326 "parse.y" /* yacc.c:1648  */
     {
                        pat = (yyvsp[0]);
                        finish_rule( pat, variable_trail_rule,
@@ -1793,11 +1794,11 @@ yyreduce:
  insert_after(0, "</AST_Section2_Rule_FLexRule>");
  insert_before(0, "<AST_Section2_Rule_FLexRule bol=\"false\">");
                        }
-#line 1786 "parse.c" /* yacc.c:1646  */
+#line 1787 "parse.c" /* yacc.c:1648  */
     break;
 
   case 29:
-#line 352 "parse.y" /* yacc.c:1646  */
+#line 352 "parse.y" /* yacc.c:1648  */
     {
                        if ( scon_stk_ptr > 0 )
                                build_eof_action();
@@ -1821,32 +1822,32 @@ yyreduce:
  insert_after(0, "</AST_Section2_Rule_EOFRule>");
  insert_before(0, "<AST_Section2_Rule_EOFRule>");
                        }
-#line 1814 "parse.c" /* yacc.c:1646  */
+#line 1815 "parse.c" /* yacc.c:1648  */
     break;
 
   case 30:
-#line 377 "parse.y" /* yacc.c:1646  */
+#line 377 "parse.y" /* yacc.c:1648  */
     { synerr( _("unrecognized rule") ); }
-#line 1820 "parse.c" /* yacc.c:1646  */
+#line 1821 "parse.c" /* yacc.c:1648  */
     break;
 
   case 31:
-#line 381 "parse.y" /* yacc.c:1646  */
+#line 381 "parse.y" /* yacc.c:1648  */
     { (yyval) = scon_stk_ptr; }
-#line 1826 "parse.c" /* yacc.c:1646  */
+#line 1827 "parse.c" /* yacc.c:1648  */
     break;
 
   case 32:
-#line 385 "parse.y" /* yacc.c:1646  */
+#line 385 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-2]); /*}*/
  insert_after(3, "</AST_Section2_StartConditions>");
  insert_before(0, "<AST_Section2_StartConditions>");
  }
-#line 1835 "parse.c" /* yacc.c:1646  */
+#line 1836 "parse.c" /* yacc.c:1648  */
     break;
 
   case 33:
-#line 391 "parse.y" /* yacc.c:1646  */
+#line 391 "parse.y" /* yacc.c:1648  */
     {
                        (yyval) = scon_stk_ptr;
 
@@ -1864,11 +1865,11 @@ yyreduce:
  insert_after(2, "</AST_Section2_StartConditions>");
  insert_before(0, "<AST_Section2_StartConditions wildcard=\"true\">");
                        }
-#line 1857 "parse.c" /* yacc.c:1646  */
+#line 1858 "parse.c" /* yacc.c:1648  */
     break;
 
   case 34:
-#line 410 "parse.y" /* yacc.c:1646  */
+#line 410 "parse.y" /* yacc.c:1648  */
     { (yyval) = scon_stk_ptr; /*}*/
  /* in this case, want empty rule associated with stuff on the right of us */
  /* therefore, move inter-token text from the right of us over to the left */
@@ -1880,17 +1881,17 @@ yyreduce:
  piece[piece2 - 1] = temp;
  insert_before(0, "<AST_Section2_StartConditions />");
  }
-#line 1873 "parse.c" /* yacc.c:1646  */
+#line 1874 "parse.c" /* yacc.c:1648  */
     break;
 
   case 37:
-#line 428 "parse.y" /* yacc.c:1646  */
+#line 428 "parse.y" /* yacc.c:1648  */
     { synerr( _("bad start condition list") ); }
-#line 1879 "parse.c" /* yacc.c:1646  */
+#line 1880 "parse.c" /* yacc.c:1648  */
     break;
 
   case 38:
-#line 432 "parse.y" /* yacc.c:1646  */
+#line 432 "parse.y" /* yacc.c:1648  */
     {
                        if ( (scnum = sclookup( nmstr )) == 0 )
                                format_pinpoint_message(
@@ -1911,11 +1912,11 @@ yyreduce:
                                        scon_stk[++scon_stk_ptr] = scnum;
                                }
                        }
-#line 1904 "parse.c" /* yacc.c:1646  */
+#line 1905 "parse.c" /* yacc.c:1648  */
     break;
 
   case 39:
-#line 459 "parse.y" /* yacc.c:1646  */
+#line 459 "parse.y" /* yacc.c:1648  */
     {
                        if ( transchar[lastst[(yyvsp[0])]] != SYM_EPSILON )
                                /* Provide final transition \now/ so it
@@ -1970,17 +1971,17 @@ yyreduce:
 
                        (yyval) = link_machines( (yyvsp[-1]), (yyvsp[0]) );
                        }
-#line 1963 "parse.c" /* yacc.c:1646  */
+#line 1964 "parse.c" /* yacc.c:1648  */
     break;
 
   case 40:
-#line 515 "parse.y" /* yacc.c:1646  */
+#line 515 "parse.y" /* yacc.c:1648  */
     { synerr( _("trailing context used twice") ); }
-#line 1969 "parse.c" /* yacc.c:1646  */
+#line 1970 "parse.c" /* yacc.c:1648  */
     break;
 
   case 41:
-#line 518 "parse.y" /* yacc.c:1646  */
+#line 518 "parse.y" /* yacc.c:1648  */
     {
                        headcnt = 0;
                        trailcnt = 1;
@@ -2024,11 +2025,11 @@ yyreduce:
  insert_after(1, "</RegexCharacterLiteral>");
  insert_before(1, "<RegexCharacterLiteral character_set=\"10 11\">");
                        }
-#line 2017 "parse.c" /* yacc.c:1646  */
+#line 2018 "parse.c" /* yacc.c:1648  */
     break;
 
   case 42:
-#line 563 "parse.y" /* yacc.c:1646  */
+#line 563 "parse.y" /* yacc.c:1648  */
     {
                        (yyval) = (yyvsp[0]);
 
@@ -2044,28 +2045,28 @@ yyreduce:
                                }
  insert_after(0, "<RegexEmpty />");
                        }
-#line 2037 "parse.c" /* yacc.c:1646  */
+#line 2038 "parse.c" /* yacc.c:1648  */
     break;
 
   case 43:
-#line 582 "parse.y" /* yacc.c:1646  */
+#line 582 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
                        (yyval) = mkor( (yyvsp[-2]), (yyvsp[0]) );
  insert_after(2, "</RegexOr>");
  insert_before(0, "<RegexOr>");
                        }
-#line 2048 "parse.c" /* yacc.c:1646  */
+#line 2049 "parse.c" /* yacc.c:1648  */
     break;
 
   case 44:
-#line 590 "parse.y" /* yacc.c:1646  */
+#line 590 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[0]); }
-#line 2054 "parse.c" /* yacc.c:1646  */
+#line 2055 "parse.c" /* yacc.c:1648  */
     break;
 
   case 45:
-#line 595 "parse.y" /* yacc.c:1646  */
+#line 595 "parse.y" /* yacc.c:1648  */
     {
                        /* This rule is written separately so the
                         * reduction will occur before the trailing
@@ -2090,11 +2091,11 @@ yyreduce:
                        current_state_type = STATE_TRAILING_CONTEXT;
                        (yyval) = (yyvsp[-1]);
                        }
-#line 2083 "parse.c" /* yacc.c:1646  */
+#line 2084 "parse.c" /* yacc.c:1648  */
     break;
 
   case 46:
-#line 622 "parse.y" /* yacc.c:1646  */
+#line 622 "parse.y" /* yacc.c:1648  */
     {
                        /* This is where concatenation of adjacent patterns
                         * gets done.
@@ -2103,17 +2104,17 @@ yyreduce:
  insert_after(1, "</RegexSequence>");
  insert_before(0, "<RegexSequence>");
                        }
-#line 2096 "parse.c" /* yacc.c:1646  */
+#line 2097 "parse.c" /* yacc.c:1648  */
     break;
 
   case 47:
-#line 632 "parse.y" /* yacc.c:1646  */
+#line 632 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[0]); }
-#line 2102 "parse.c" /* yacc.c:1646  */
+#line 2103 "parse.c" /* yacc.c:1648  */
     break;
 
   case 48:
-#line 635 "parse.y" /* yacc.c:1646  */
+#line 635 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
 
@@ -2143,11 +2144,11 @@ yyreduce:
  sprintf(piece_temp, "<RegexRepeat count0=\"%d\" count1=\"%d\">", (yyvsp[-3]), (yyvsp[-1]));
  insert_before(0, piece_temp);
                        }
-#line 2136 "parse.c" /* yacc.c:1646  */
+#line 2137 "parse.c" /* yacc.c:1648  */
     break;
 
   case 49:
-#line 666 "parse.y" /* yacc.c:1646  */
+#line 666 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
 
@@ -2163,11 +2164,11 @@ yyreduce:
  sprintf(piece_temp, "<RegexRepeat count0=\"%d\">", (yyvsp[-2]));
  insert_before(0, piece_temp);
                        }
-#line 2156 "parse.c" /* yacc.c:1646  */
+#line 2157 "parse.c" /* yacc.c:1648  */
     break;
 
   case 50:
-#line 683 "parse.y" /* yacc.c:1646  */
+#line 683 "parse.y" /* yacc.c:1648  */
     {
                        /* The series could be something like "(foo)",
                         * in which case we have no idea what its length
@@ -2189,11 +2190,11 @@ yyreduce:
  sprintf(piece_temp, "<RegexRepeat count0=\"%d\" count1=\"%d\">", (yyvsp[-1]), (yyvsp[-1]));
  insert_before(0, piece_temp);
                        }
-#line 2182 "parse.c" /* yacc.c:1646  */
+#line 2183 "parse.c" /* yacc.c:1648  */
     break;
 
   case 51:
-#line 708 "parse.y" /* yacc.c:1646  */
+#line 708 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
 
@@ -2201,33 +2202,33 @@ yyreduce:
  insert_after(1, "</RegexRepeat>");
  insert_before(0, "<RegexRepeat count0=\"0\">");
                        }
-#line 2194 "parse.c" /* yacc.c:1646  */
+#line 2195 "parse.c" /* yacc.c:1648  */
     break;
 
   case 52:
-#line 717 "parse.y" /* yacc.c:1646  */
+#line 717 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
                        (yyval) = mkposcl( (yyvsp[-1]) );
  insert_after(1, "</RegexRepeat>");
  insert_before(0, "<RegexRepeat count0=\"1\">");
                        }
-#line 2205 "parse.c" /* yacc.c:1646  */
+#line 2206 "parse.c" /* yacc.c:1648  */
     break;
 
   case 53:
-#line 725 "parse.y" /* yacc.c:1646  */
+#line 725 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
                        (yyval) = mkopt( (yyvsp[-1]) );
  insert_after(1, "</RegexRepeat>");
  insert_before(0, "<RegexRepeat count0=\"0\" count1=\"1\">");
                        }
-#line 2216 "parse.c" /* yacc.c:1646  */
+#line 2217 "parse.c" /* yacc.c:1648  */
     break;
 
   case 54:
-#line 733 "parse.y" /* yacc.c:1646  */
+#line 733 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
 
@@ -2257,11 +2258,11 @@ yyreduce:
  sprintf(piece_temp, "<RegexRepeat count0=\"%d\" count1=\"%d\">", (yyvsp[-3]), (yyvsp[-1]));
  insert_before(0, piece_temp);
                        }
-#line 2250 "parse.c" /* yacc.c:1646  */
+#line 2251 "parse.c" /* yacc.c:1648  */
     break;
 
   case 55:
-#line 764 "parse.y" /* yacc.c:1646  */
+#line 764 "parse.y" /* yacc.c:1648  */
     {
                        varlength = true;
 
@@ -2277,11 +2278,11 @@ yyreduce:
  sprintf(piece_temp, "<RegexRepeat count0=\"%d\">", (yyvsp[-2]));
  insert_before(0, piece_temp);
                        }
-#line 2270 "parse.c" /* yacc.c:1646  */
+#line 2271 "parse.c" /* yacc.c:1648  */
     break;
 
   case 56:
-#line 781 "parse.y" /* yacc.c:1646  */
+#line 781 "parse.y" /* yacc.c:1648  */
     {
                        /* The singleton could be something like "(foo)",
                         * in which case we have no idea what its length
@@ -2302,11 +2303,11 @@ yyreduce:
  sprintf(piece_temp, "<RegexRepeat count0=\"%d\" count1=\"%d\">", (yyvsp[-1]), (yyvsp[-1]));
  insert_before(0, piece_temp);
                        }
-#line 2295 "parse.c" /* yacc.c:1646  */
+#line 2296 "parse.c" /* yacc.c:1648  */
     break;
 
   case 57:
-#line 803 "parse.y" /* yacc.c:1646  */
+#line 803 "parse.y" /* yacc.c:1648  */
     {
                        if ( ! madeany )
                                {
@@ -2347,11 +2348,11 @@ yyreduce:
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 10 11 256\">");
  }
                        }
-#line 2340 "parse.c" /* yacc.c:1646  */
+#line 2341 "parse.c" /* yacc.c:1648  */
     break;
 
   case 58:
-#line 845 "parse.y" /* yacc.c:1646  */
+#line 845 "parse.y" /* yacc.c:1648  */
     {
                                /* Sort characters for fast searching.
                                 */
@@ -2368,11 +2369,11 @@ yyreduce:
 
                        (yyval) = mkstate( -(yyvsp[0]) );
                        }
-#line 2361 "parse.c" /* yacc.c:1646  */
+#line 2362 "parse.c" /* yacc.c:1648  */
     break;
 
   case 59:
-#line 863 "parse.y" /* yacc.c:1646  */
+#line 863 "parse.y" /* yacc.c:1648  */
     {
                        ++rulelen;
 
@@ -2381,59 +2382,59 @@ yyreduce:
 
                        (yyval) = mkstate( -(yyvsp[0]) );
                        }
-#line 2374 "parse.c" /* yacc.c:1646  */
+#line 2375 "parse.c" /* yacc.c:1648  */
     break;
 
   case 60:
-#line 873 "parse.y" /* yacc.c:1646  */
+#line 873 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-1]); }
-#line 2380 "parse.c" /* yacc.c:1646  */
+#line 2381 "parse.c" /* yacc.c:1648  */
     break;
 
   case 61:
-#line 876 "parse.y" /* yacc.c:1646  */
+#line 876 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-1]); /*}*/
  insert_after(2, "</RegexGroup>");
  insert_before(0, "<RegexGroup>");
  }
-#line 2389 "parse.c" /* yacc.c:1646  */
+#line 2390 "parse.c" /* yacc.c:1648  */
     break;
 
   case 62:
-#line 882 "parse.y" /* yacc.c:1646  */
+#line 882 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-1]); }
-#line 2395 "parse.c" /* yacc.c:1646  */
+#line 2396 "parse.c" /* yacc.c:1648  */
     break;
 
   case 63:
-#line 885 "parse.y" /* yacc.c:1646  */
+#line 885 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-1]); /*}*/
  insert_after(3, "</RegexGroupName>");
  insert_before(0, "<RegexGroupName>");
 }
-#line 2404 "parse.c" /* yacc.c:1646  */
+#line 2405 "parse.c" /* yacc.c:1648  */
     break;
 
   case 64:
-#line 891 "parse.y" /* yacc.c:1646  */
+#line 891 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-1]); /*}*/
  insert_after(3, "</RegexGroupAction>");
  insert_before(0, "<RegexGroupAction>");
 }
-#line 2413 "parse.c" /* yacc.c:1646  */
+#line 2414 "parse.c" /* yacc.c:1648  */
     break;
 
   case 65:
-#line 896 "parse.y" /* yacc.c:1646  */
+#line 896 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-1]); /*}*/
  insert_after(3, "</RegexGroupElement>");
  insert_before(0, "<RegexGroupElement>");
 }
-#line 2422 "parse.c" /* yacc.c:1646  */
+#line 2423 "parse.c" /* yacc.c:1648  */
     break;
 
   case 66:
-#line 902 "parse.y" /* yacc.c:1646  */
+#line 902 "parse.y" /* yacc.c:1648  */
     {
                        ++rulelen;
 
@@ -2449,48 +2450,48 @@ yyreduce:
  sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
  insert_before(0, piece_temp);
                        }
-#line 2442 "parse.c" /* yacc.c:1646  */
+#line 2443 "parse.c" /* yacc.c:1648  */
     break;
 
   case 67:
-#line 919 "parse.y" /* yacc.c:1646  */
+#line 919 "parse.y" /* yacc.c:1648  */
     { (yyval) = ccl_set_diff  ((yyvsp[-2]), (yyvsp[0])); /*}*/
  insert_after(2, "</RegexCharacterAnd>");
  insert_after(2, "</RegexCharacterNot>");
  insert_before(2, "<RegexCharacterNot>");
  insert_before(0, "<RegexCharacterAnd>");
  }
-#line 2453 "parse.c" /* yacc.c:1646  */
+#line 2454 "parse.c" /* yacc.c:1648  */
     break;
 
   case 68:
-#line 925 "parse.y" /* yacc.c:1646  */
+#line 925 "parse.y" /* yacc.c:1648  */
     { (yyval) = ccl_set_union ((yyvsp[-2]), (yyvsp[0])); /*}*/
  insert_after(2, "</RegexCharacterOr>");
  insert_before(0, "<RegexCharacterOr>");
  }
-#line 2462 "parse.c" /* yacc.c:1646  */
+#line 2463 "parse.c" /* yacc.c:1648  */
     break;
 
   case 70:
-#line 934 "parse.y" /* yacc.c:1646  */
+#line 934 "parse.y" /* yacc.c:1648  */
     { (yyval) = (yyvsp[-1]); }
-#line 2468 "parse.c" /* yacc.c:1646  */
+#line 2469 "parse.c" /* yacc.c:1648  */
     break;
 
   case 71:
-#line 937 "parse.y" /* yacc.c:1646  */
+#line 937 "parse.y" /* yacc.c:1648  */
     {
                        cclnegate( (yyvsp[-1]) );
                        (yyval) = (yyvsp[-1]);
  insert_after(2, "</RegexCharacterNot>");
  insert_before(1, "<RegexCharacterNot>");
                        }
-#line 2479 "parse.c" /* yacc.c:1646  */
+#line 2480 "parse.c" /* yacc.c:1648  */
     break;
 
   case 72:
-#line 946 "parse.y" /* yacc.c:1646  */
+#line 946 "parse.y" /* yacc.c:1648  */
     {
 
                        if (sf_case_ins())
@@ -2554,11 +2555,11 @@ yyreduce:
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
-#line 2547 "parse.c" /* yacc.c:1646  */
+#line 2548 "parse.c" /* yacc.c:1648  */
     break;
 
   case 73:
-#line 1011 "parse.y" /* yacc.c:1646  */
+#line 1011 "parse.y" /* yacc.c:1648  */
     {
                        ccladd( (yyvsp[-1]), (yyvsp[0]) );
                        cclsorted = cclsorted && ((yyvsp[0]) > lastchar);
@@ -2580,11 +2581,11 @@ yyreduce:
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
-#line 2573 "parse.c" /* yacc.c:1646  */
+#line 2574 "parse.c" /* yacc.c:1648  */
     break;
 
   case 74:
-#line 1034 "parse.y" /* yacc.c:1646  */
+#line 1034 "parse.y" /* yacc.c:1648  */
     {
                        /* Too hard to properly maintain cclsorted. */
                        cclsorted = false;
@@ -2592,76 +2593,76 @@ yyreduce:
  insert_after(1, "</RegexCharacterOr>");
  insert_before(0, "<RegexCharacterOr>");
                        }
-#line 2585 "parse.c" /* yacc.c:1646  */
+#line 2586 "parse.c" /* yacc.c:1648  */
     break;
 
   case 75:
-#line 1043 "parse.y" /* yacc.c:1646  */
+#line 1043 "parse.y" /* yacc.c:1648  */
     {
                        cclsorted = true;
                        lastchar = 0;
                        currccl = (yyval) = cclinit();
  insert_before(0, "<RegexCharacterLiteral character_set=\"\" />");
                        }
-#line 2596 "parse.c" /* yacc.c:1646  */
+#line 2597 "parse.c" /* yacc.c:1648  */
     break;
 
   case 76:
-#line 1052 "parse.y" /* yacc.c:1646  */
+#line 1052 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(isalnum); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"48 58 65 91 97 123\">");
  }
-#line 2605 "parse.c" /* yacc.c:1646  */
+#line 2606 "parse.c" /* yacc.c:1648  */
     break;
 
   case 77:
-#line 1056 "parse.y" /* yacc.c:1646  */
+#line 1056 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(isalpha); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"65 91 97 123\">");
  }
-#line 2614 "parse.c" /* yacc.c:1646  */
+#line 2615 "parse.c" /* yacc.c:1648  */
     break;
 
   case 78:
-#line 1060 "parse.y" /* yacc.c:1646  */
+#line 1060 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(IS_BLANK); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"9 10 32 33\">");
  }
-#line 2623 "parse.c" /* yacc.c:1646  */
+#line 2624 "parse.c" /* yacc.c:1648  */
     break;
 
   case 79:
-#line 1064 "parse.y" /* yacc.c:1646  */
+#line 1064 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(iscntrl); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 32\">");
  }
-#line 2632 "parse.c" /* yacc.c:1646  */
+#line 2633 "parse.c" /* yacc.c:1648  */
     break;
 
   case 80:
-#line 1068 "parse.y" /* yacc.c:1646  */
+#line 1068 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(isdigit); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"48 58\">");
  }
-#line 2641 "parse.c" /* yacc.c:1646  */
+#line 2642 "parse.c" /* yacc.c:1648  */
     break;
 
   case 81:
-#line 1072 "parse.y" /* yacc.c:1646  */
+#line 1072 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(isgraph); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"33 127\">");
  }
-#line 2650 "parse.c" /* yacc.c:1646  */
+#line 2651 "parse.c" /* yacc.c:1648  */
     break;
 
   case 82:
-#line 1076 "parse.y" /* yacc.c:1646  */
+#line 1076 "parse.y" /* yacc.c:1648  */
     { 
                           CCL_EXPR(islower);
                           if (sf_case_ins())
@@ -2676,47 +2677,47 @@ yyreduce:
  insert_before(0, "<RegexCharacterLiteral character_set=\"97 123\">");
  }
                         }
-#line 2669 "parse.c" /* yacc.c:1646  */
+#line 2670 "parse.c" /* yacc.c:1648  */
     break;
 
   case 83:
-#line 1090 "parse.y" /* yacc.c:1646  */
+#line 1090 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(isprint); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"32 127\">");
  }
-#line 2678 "parse.c" /* yacc.c:1646  */
+#line 2679 "parse.c" /* yacc.c:1648  */
     break;
 
   case 84:
-#line 1094 "parse.y" /* yacc.c:1646  */
+#line 1094 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(ispunct); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"33 48 58 65 91 97 123 127\">");
  }
-#line 2687 "parse.c" /* yacc.c:1646  */
+#line 2688 "parse.c" /* yacc.c:1648  */
     break;
 
   case 85:
-#line 1098 "parse.y" /* yacc.c:1646  */
+#line 1098 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(isspace); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"9 14 32 33\">");
  }
-#line 2696 "parse.c" /* yacc.c:1646  */
+#line 2697 "parse.c" /* yacc.c:1648  */
     break;
 
   case 86:
-#line 1102 "parse.y" /* yacc.c:1646  */
+#line 1102 "parse.y" /* yacc.c:1648  */
     { CCL_EXPR(isxdigit); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"48 58 65 71 97 103\">");
  }
-#line 2705 "parse.c" /* yacc.c:1646  */
+#line 2706 "parse.c" /* yacc.c:1648  */
     break;
 
   case 87:
-#line 1106 "parse.y" /* yacc.c:1646  */
+#line 1106 "parse.y" /* yacc.c:1648  */
     {
                     CCL_EXPR(isupper);
                     if (sf_case_ins())
@@ -2731,101 +2732,101 @@ yyreduce:
  insert_before(0, "<RegexCharacterLiteral character_set=\"65 91\">");
  }
                                }
-#line 2724 "parse.c" /* yacc.c:1646  */
+#line 2725 "parse.c" /* yacc.c:1648  */
     break;
 
   case 88:
-#line 1121 "parse.y" /* yacc.c:1646  */
+#line 1121 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(isalnum); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 65 91 97 123 256\">");
  }
-#line 2733 "parse.c" /* yacc.c:1646  */
+#line 2734 "parse.c" /* yacc.c:1648  */
     break;
 
   case 89:
-#line 1125 "parse.y" /* yacc.c:1646  */
+#line 1125 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(isalpha); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 65 91 97 123 256\">");
  }
-#line 2742 "parse.c" /* yacc.c:1646  */
+#line 2743 "parse.c" /* yacc.c:1648  */
     break;
 
   case 90:
-#line 1129 "parse.y" /* yacc.c:1646  */
+#line 1129 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(IS_BLANK); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 9 10 32 33 256\">");
  }
-#line 2751 "parse.c" /* yacc.c:1646  */
+#line 2752 "parse.c" /* yacc.c:1648  */
     break;
 
   case 91:
-#line 1133 "parse.y" /* yacc.c:1646  */
+#line 1133 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(iscntrl); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"32 256\">");
  }
-#line 2760 "parse.c" /* yacc.c:1646  */
+#line 2761 "parse.c" /* yacc.c:1648  */
     break;
 
   case 92:
-#line 1137 "parse.y" /* yacc.c:1646  */
+#line 1137 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(isdigit); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 256\">");
  }
-#line 2769 "parse.c" /* yacc.c:1646  */
+#line 2770 "parse.c" /* yacc.c:1648  */
     break;
 
   case 93:
-#line 1141 "parse.y" /* yacc.c:1646  */
+#line 1141 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(isgraph); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 33 127 256\">");
  }
-#line 2778 "parse.c" /* yacc.c:1646  */
+#line 2779 "parse.c" /* yacc.c:1648  */
     break;
 
   case 94:
-#line 1145 "parse.y" /* yacc.c:1646  */
+#line 1145 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(isprint); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 32 127 256\">");
  }
-#line 2787 "parse.c" /* yacc.c:1646  */
+#line 2788 "parse.c" /* yacc.c:1648  */
     break;
 
   case 95:
-#line 1149 "parse.y" /* yacc.c:1646  */
+#line 1149 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(ispunct); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 33 48 58 65 91 97 123 127 256\">");
  }
-#line 2796 "parse.c" /* yacc.c:1646  */
+#line 2797 "parse.c" /* yacc.c:1648  */
     break;
 
   case 96:
-#line 1153 "parse.y" /* yacc.c:1646  */
+#line 1153 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(isspace); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 9 14 32 33 256\">");
  }
-#line 2805 "parse.c" /* yacc.c:1646  */
+#line 2806 "parse.c" /* yacc.c:1648  */
     break;
 
   case 97:
-#line 1157 "parse.y" /* yacc.c:1646  */
+#line 1157 "parse.y" /* yacc.c:1648  */
     { CCL_NEG_EXPR(isxdigit); /*}*/
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 65 71 97 103 256\">");
  }
-#line 2814 "parse.c" /* yacc.c:1646  */
+#line 2815 "parse.c" /* yacc.c:1648  */
     break;
 
   case 98:
-#line 1161 "parse.y" /* yacc.c:1646  */
+#line 1161 "parse.y" /* yacc.c:1648  */
     { 
                                if ( sf_case_ins() )
                                        lwarn(_("[:^lower:] is ambiguous in case insensitive scanner"));
@@ -2834,11 +2835,11 @@ yyreduce:
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 97 123 256\">");
                                }
-#line 2827 "parse.c" /* yacc.c:1646  */
+#line 2828 "parse.c" /* yacc.c:1648  */
     break;
 
   case 99:
-#line 1169 "parse.y" /* yacc.c:1646  */
+#line 1169 "parse.y" /* yacc.c:1648  */
     {
                                if ( sf_case_ins() )
                                        lwarn(_("[:^upper:] ambiguous in case insensitive scanner"));
@@ -2847,11 +2848,11 @@ yyreduce:
  insert_after(0, "</RegexCharacterLiteral>");
  insert_before(0, "<RegexCharacterLiteral character_set=\"0 65 91 256\">");
                                }
-#line 2840 "parse.c" /* yacc.c:1646  */
+#line 2841 "parse.c" /* yacc.c:1648  */
     break;
 
   case 100:
-#line 1180 "parse.y" /* yacc.c:1646  */
+#line 1180 "parse.y" /* yacc.c:1648  */
     {
                        if ( (yyvsp[0]) == nlch )
                                rule_has_nl[num_rules] = true;
@@ -2870,19 +2871,19 @@ yyreduce:
  insert_before(1, piece_temp);
  insert_before(0, "<RegexSequence>");
                        }
-#line 2863 "parse.c" /* yacc.c:1646  */
+#line 2864 "parse.c" /* yacc.c:1648  */
     break;
 
   case 101:
-#line 1200 "parse.y" /* yacc.c:1646  */
+#line 1200 "parse.y" /* yacc.c:1648  */
     { (yyval) = mkstate( SYM_EPSILON ); /*}*/
  insert_before(0, "<RegexEmpty />");
  }
-#line 2871 "parse.c" /* yacc.c:1646  */
+#line 2872 "parse.c" /* yacc.c:1648  */
     break;
 
 
-#line 2875 "parse.c" /* yacc.c:1646  */
+#line 2876 "parse.c" /* yacc.c:1648  */
       default: break;
     }
  int i;
@@ -3127,7 +3128,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 1206 "parse.y" /* yacc.c:1906  */
+#line 1206 "parse.y" /* yacc.c:1907  */
 
 
 

diff --git a/src/parse.h b/src/parse.h
index a4abb4f..6a610de 100644 (file)
--- a/src/parse.h
+++ b/src/parse.h
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 3.0.5.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/src/scan.c b/src/scan.c
index 69d7115..3b2b24d 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -2132,7 +2132,7 @@ void piece_append(const char *str);
 void piece_insert(int n, const char *str);
 void piece_escape(const char *p, size_t n);
 void piece_flush(size_t n);
-void piece_pack();
+void piece_pack(void);
 
 static void markup_action(const char *text);
 static void markup_option(const char *name, int sense);
@@ -5769,7 +5769,7 @@ void piece_flush(size_t n) {
  yytext += n;
 }
 
-void piece_pack() {
+void piece_pack(void) {
  int i;
  size_t j = 0;
  for (i = piece0; i < piece1; ++i)

diff --git a/src/scan.l b/src/scan.l
index 73e1b5f..c954c15 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -139,7 +139,7 @@ void piece_append(const char *str);
 void piece_insert(int n, const char *str);
 void piece_escape(const char *p, size_t n);
 void piece_flush(size_t n);
-void piece_pack();
+void piece_pack(void);
 
 static void markup_action(const char *text);
 static void markup_option(const char *name, int sense);
@@ -1351,7 +1351,7 @@ void piece_flush(size_t n) {
  yytext += n;
 }
 
-void piece_pack() {
+void piece_pack(void) {
  int i;
  size_t j = 0;
  for (i = piece0; i < piece1; ++i)