Change how start conditions are represented in the syntax tree

diff --git a/src/parse.c b/src/parse.c
index 508848f..2d60fb9 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -1554,8 +1554,8 @@ yyreduce:
   case 4:
 #line 156 "parse.y" /* yacc.c:1646  */
     {
- insert_after(2, "</StartCondDecl>");
- sprintf(piece_temp, "<StartCondDecl exclusive=\"%s\">", xcluflg ? "true" : "false");
+ insert_after(2, "</StartConditionDecl>");
+ sprintf(piece_temp, "<StartConditionDecl exclusive=\"%s\">", xcluflg ? "true" : "false");
  insert_before(1, piece_temp);
  }
 #line 1532 "parse.c" /* yacc.c:1646  */
@@ -1824,8 +1824,8 @@ yyreduce:
   case 32:
 #line 367 "parse.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-2]); /*}*/
- insert_after(3, "</StartCond>");
- insert_before(0, "<StartCond>");
+ insert_after(3, "</StartConditionList>");
+ insert_before(0, "<StartConditionList>");
  }
 #line 1801 "parse.c" /* yacc.c:1646  */
     break;
@@ -1846,8 +1846,8 @@ yyreduce:
                                if ( j > scon_stk_ptr )
                                        scon_stk[++scon_stk_ptr] = i;
                                }
- insert_after(2, "</StartCondWild>");
- insert_before(0, "<StartCondWild>");
+ insert_after(2, "</StartConditionList>");
+ insert_before(0, "<StartConditionList wildcard=\"true\">");
                        }
 #line 1823 "parse.c" /* yacc.c:1646  */
     break;
@@ -1863,7 +1863,7 @@ yyreduce:
  piece[piece2 + 1] = piece[piece2]; /* empty */
  piece[piece2] = piece[piece2 - 1]; /* empty */
  piece[piece2 - 1] = temp;
- insert_before(0, "<StartCondNone />");
+ insert_before(0, "<StartConditionList />");
  }
 #line 1839 "parse.c" /* yacc.c:1646  */
     break;

diff --git a/src/parse.y b/src/parse.y
index 1cae5c8..98e7806 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -154,8 +154,8 @@ initlex             :
 
 sect1          :  sect1 startconddecl namelist1
  {
- insert_after(2, "</StartCondDecl>");
- sprintf(piece_temp, "<StartCondDecl exclusive=\"%s\">", xcluflg ? "true" : "false");
+ insert_after(2, "</StartConditionDecl>");
+ sprintf(piece_temp, "<StartConditionDecl exclusive=\"%s\">", xcluflg ? "true" : "false");
  insert_before(1, piece_temp);
  }
                |  sect1 options
@@ -365,8 +365,8 @@ scon_stk_ptr        :
 
 scon           :  '<' scon_stk_ptr namelist2 '>'
                        { $$ = $2; /*}*/
- insert_after(3, "</StartCond>");
- insert_before(0, "<StartCond>");
+ insert_after(3, "</StartConditionList>");
+ insert_before(0, "<StartConditionList>");
  }
 
                |  '<' '*' '>'
@@ -384,8 +384,8 @@ scon                :  '<' scon_stk_ptr namelist2 '>'
                                if ( j > scon_stk_ptr )
                                        scon_stk[++scon_stk_ptr] = i;
                                }
- insert_after(2, "</StartCondWild>");
- insert_before(0, "<StartCondWild>");
+ insert_after(2, "</StartConditionList>");
+ insert_before(0, "<StartConditionList wildcard=\"true\">");
                        }
 
                |
@@ -398,7 +398,7 @@ scon                :  '<' scon_stk_ptr namelist2 '>'
  piece[piece2 + 1] = piece[piece2]; /* empty */
  piece[piece2] = piece[piece2 - 1]; /* empty */
  piece[piece2 - 1] = temp;
- insert_before(0, "<StartCondNone />");
+ insert_before(0, "<StartConditionList />");
  }
                ;