From 2c339ae5197d1962cde1856d1cf0ad265a71659c Mon Sep 17 00:00:00 2001
From: Nick Downing <downing.nick@gmail.com>
Date: Sat, 30 Jun 2018 16:35:47 +1000
Subject: [PATCH] Rearrange AST class structure to use inner class definitions

---
 src/parse.c | 34 +++++++++++++++++-----------------
 src/parse.y | 34 +++++++++++++++++-----------------
 src/scan.c  | 20 ++++++++++----------
 src/scan.l  | 20 ++++++++++----------
 4 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/parse.c b/src/parse.c
index 2d60fb9..49be98e 100644
--- 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, "</StartConditionDecl>");
- sprintf(piece_temp, "<StartConditionDecl exclusive=\"%s\">", xcluflg ? "true" : "false");
+ insert_after(2, "</Section1_StartConditions>");
+ sprintf(piece_temp, "<Section1_StartConditions exclusive=\"%s\">", xcluflg ? "true" : "false");
  insert_before(1, piece_temp);
  }
 #line 1532 "parse.c" /* yacc.c:1646  */
@@ -1564,8 +1564,8 @@ yyreduce:
   case 5:
 #line 162 "parse.y" /* yacc.c:1646  */
     {
- insert_after(1, "</Options>");
- insert_before(1, "<Options>");
+ insert_after(1, "</Section1_Options>");
+ insert_before(1, "<Section1_Options>");
  }
 #line 1541 "parse.c" /* yacc.c:1646  */
     break;
@@ -1683,8 +1683,8 @@ yyreduce:
   case 23:
 #line 246 "parse.y" /* yacc.c:1646  */
     { scon_stk_ptr = (yyvsp[-3]); /*}*/
- insert_after(4, "</Rule>");
- insert_before(1, "<Rule>");
+ insert_after(4, "</Section2_Rule>");
+ insert_before(1, "<Section2_Rule>");
  }
 #line 1660 "parse.c" /* yacc.c:1646  */
     break;
@@ -1692,8 +1692,8 @@ yyreduce:
   case 24:
 #line 251 "parse.y" /* yacc.c:1646  */
     { scon_stk_ptr = (yyvsp[-3]); /*}*/
- insert_after(4, "</CompoundRule>");
- insert_before(1, "<CompoundRule>");
+ insert_after(4, "</Section2_CompoundRule>");
+ insert_before(1, "<Section2_CompoundRule>");
  }
 #line 1669 "parse.c" /* yacc.c:1646  */
     break;
@@ -1748,8 +1748,8 @@ yyreduce:
 					pinpoint_message(
 			"'^' operator results in sub-optimal performance" );
 				}
- insert_after(1, "</BOLRule>");
- insert_before(0, "<BOLRule>");
+ insert_after(1, "</Section2_Rule_BOLRule>");
+ insert_before(0, "<Section2_Rule_BOLRule>");
 			}
 #line 1725 "parse.c" /* yacc.c:1646  */
     break;
@@ -1803,8 +1803,8 @@ yyreduce:
 				else
 					build_eof_action();
 				}
- insert_after(0, "</EOFRule><RegexNone />");
- insert_before(0, "<EOFRule>");
+ insert_after(0, "</Section2_Rule_EOFRule><RegexNone />");
+ insert_before(0, "<Section2_Rule_EOFRule>");
 			}
 #line 1780 "parse.c" /* yacc.c:1646  */
     break;
@@ -1824,8 +1824,8 @@ yyreduce:
   case 32:
 #line 367 "parse.y" /* yacc.c:1646  */
     { (yyval) = (yyvsp[-2]); /*}*/
- insert_after(3, "</StartConditionList>");
- insert_before(0, "<StartConditionList>");
+ insert_after(3, "</Section2_StartConditions>");
+ insert_before(0, "<Section2_StartConditions>");
  }
 #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, "</StartConditionList>");
- insert_before(0, "<StartConditionList wildcard=\"true\">");
+ insert_after(2, "</Section2_StartConditions>");
+ insert_before(0, "<Section2_StartConditions 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, "<StartConditionList />");
+ insert_before(0, "<Section2_StartConditions />");
  }
 #line 1839 "parse.c" /* yacc.c:1646  */
     break;
diff --git a/src/parse.y b/src/parse.y
index 98e7806..cbf8d43 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -154,14 +154,14 @@ initlex		:
 
 sect1		:  sect1 startconddecl namelist1
  {
- insert_after(2, "</StartConditionDecl>");
- sprintf(piece_temp, "<StartConditionDecl exclusive=\"%s\">", xcluflg ? "true" : "false");
+ insert_after(2, "</Section1_StartConditions>");
+ sprintf(piece_temp, "<Section1_StartConditions exclusive=\"%s\">", xcluflg ? "true" : "false");
  insert_before(1, piece_temp);
  }
 		|  sect1 options
  {
- insert_after(1, "</Options>");
- insert_before(1, "<Options>");
+ insert_after(1, "</Section1_Options>");
+ insert_before(1, "<Section1_Options>");
  }
 		|
 		|  error
@@ -244,13 +244,13 @@ option		:  TOK_OUTFILE '=' NAME
 
 sect2		:  sect2 scon initforrule flexrule '\n'
 			{ scon_stk_ptr = $2; /*}*/
- insert_after(4, "</Rule>");
- insert_before(1, "<Rule>");
+ insert_after(4, "</Section2_Rule>");
+ insert_before(1, "<Section2_Rule>");
  }
 		|  sect2 scon '{' sect2 '}'
 			{ scon_stk_ptr = $2; /*}*/
- insert_after(4, "</CompoundRule>");
- insert_before(1, "<CompoundRule>");
+ insert_after(4, "</Section2_CompoundRule>");
+ insert_before(1, "<Section2_CompoundRule>");
  }
 		|
 		;
@@ -302,8 +302,8 @@ flexrule	:  '^' rule
 					pinpoint_message(
 			"'^' operator results in sub-optimal performance" );
 				}
- insert_after(1, "</BOLRule>");
- insert_before(0, "<BOLRule>");
+ insert_after(1, "</Section2_Rule_BOLRule>");
+ insert_before(0, "<Section2_Rule_BOLRule>");
 			}
 
 		|  rule
@@ -351,8 +351,8 @@ flexrule	:  '^' rule
 				else
 					build_eof_action();
 				}
- insert_after(0, "</EOFRule><RegexNone />");
- insert_before(0, "<EOFRule>");
+ insert_after(0, "</Section2_Rule_EOFRule><RegexNone />");
+ insert_before(0, "<Section2_Rule_EOFRule>");
 			}
 
 		|  error
@@ -365,8 +365,8 @@ scon_stk_ptr	:
 
 scon		:  '<' scon_stk_ptr namelist2 '>'
 			{ $$ = $2; /*}*/
- insert_after(3, "</StartConditionList>");
- insert_before(0, "<StartConditionList>");
+ insert_after(3, "</Section2_StartConditions>");
+ insert_before(0, "<Section2_StartConditions>");
  }
 
 		|  '<' '*' '>'
@@ -384,8 +384,8 @@ scon		:  '<' scon_stk_ptr namelist2 '>'
 				if ( j > scon_stk_ptr )
 					scon_stk[++scon_stk_ptr] = i;
 				}
- insert_after(2, "</StartConditionList>");
- insert_before(0, "<StartConditionList wildcard=\"true\">");
+ insert_after(2, "</Section2_StartConditions>");
+ insert_before(0, "<Section2_StartConditions 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, "<StartConditionList />");
+ insert_before(0, "<Section2_StartConditions />");
  }
 		;
 
diff --git a/src/scan.c b/src/scan.c
index 58c6109..7383a53 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -9261,7 +9261,7 @@ YY_RULE_SETUP
  piece_append("</token>");
 #endif
  piece_pack();
- piece_append("<Action>");
+ piece_append("<Section2_Rule_Action>");
  return ~'\n';
 #else
                     return '\n';
@@ -9303,7 +9303,7 @@ YY_RULE_SETUP
  piece_append("</token>");
 #endif
  piece_pack();
- piece_append("<Action>");
+ piece_append("<Section2_Rule_Action>");
  return ~'\n';
 #else
                     return '\n';
@@ -11275,15 +11275,15 @@ void set_input_file( char *file )
 
 /* Nick */
 static void markup_action(void) {
- /* append to last token text so it appears inside <Rule>..</Rule> */
+ /* append to last token text so it appears inside <Section2_Rule>..</Section2_Rule> */
  /* a problem here is that Rule has already been reduced (marked up), */
  /* because we returned a '\n' token when we detected start of action, */
- /* hence we need to move the closing </Rule> tag over to our right */
+ /* hence we need to move the closing </Section2_Rule> tag over to our right */
  int i = strlen(piece[--piece0]);
- if (i < 7 || strcmp(piece[piece0] + i - 7, "</Rule>") != 0)
+ if (i < 16 || strcmp(piece[piece0] + i - 16, "</Section2_Rule>") != 0)
   abort();
- piece[piece0][i - 7] = 0;
- piece_append("</Action></Rule>");
+ piece[piece0][i - 16] = 0;
+ piece_append("</Section2_Rule_Action></Section2_Rule>");
  piece_pack();
 }
 
@@ -11293,12 +11293,12 @@ static void markup_option(const char *name, int sense) {
  int i = piece1;
  while (--i >= piece0 && strcmp(piece[i], "no") == 0)
   ;
- sprintf(piece_temp, "<Options_%s%s>", name, sense ? " value=\"true\"" : "");
+ sprintf(piece_temp, "<Section1_Options_%s%s>", name, sense ? " value=\"true\"" : "");
  piece_insert(i + 1, piece_temp);
  flush();
- sprintf(piece_temp, "</Options_%s>", name);
+ sprintf(piece_temp, "</Section1_Options_%s>", name);
  piece_append(piece_temp);
- /* append to last token text so it appears inside <Options>..</Options> */
+ /* append to last token text so it appears inside <Section1_Options>..</Section1_Options> */
  --piece0;
  piece_pack();
 }
diff --git a/src/scan.l b/src/scan.l
index 10735de..1bc9578 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -663,7 +663,7 @@ M4QEND      "]""]"
  piece_append("</token>");
 #endif
  piece_pack();
- piece_append("<Action>");
+ piece_append("<Section2_Rule_Action>");
  return ~'\n';
 #else
                     return '\n';
@@ -701,7 +701,7 @@ M4QEND      "]""]"
  piece_append("</token>");
 #endif
  piece_pack();
- piece_append("<Action>");
+ piece_append("<Section2_Rule_Action>");
  return ~'\n';
 #else
                     return '\n';
@@ -1198,15 +1198,15 @@ void set_input_file( char *file )
 
 /* Nick */
 static void markup_action(void) {
- /* append to last token text so it appears inside <Rule>..</Rule> */
+ /* append to last token text so it appears inside <Section2_Rule>..</Section2_Rule> */
  /* a problem here is that Rule has already been reduced (marked up), */
  /* because we returned a '\n' token when we detected start of action, */
- /* hence we need to move the closing </Rule> tag over to our right */
+ /* hence we need to move the closing </Section2_Rule> tag over to our right */
  int i = strlen(piece[--piece0]);
- if (i < 7 || strcmp(piece[piece0] + i - 7, "</Rule>") != 0)
+ if (i < 16 || strcmp(piece[piece0] + i - 16, "</Section2_Rule>") != 0)
   abort();
- piece[piece0][i - 7] = 0;
- piece_append("</Action></Rule>");
+ piece[piece0][i - 16] = 0;
+ piece_append("</Section2_Rule_Action></Section2_Rule>");
  piece_pack();
 }
 
@@ -1216,12 +1216,12 @@ static void markup_option(const char *name, int sense) {
  int i = piece1;
  while (--i >= piece0 && strcmp(piece[i], "no") == 0)
   ;
- sprintf(piece_temp, "<Options_%s%s>", name, sense ? " value=\"true\"" : "");
+ sprintf(piece_temp, "<Section1_Options_%s%s>", name, sense ? " value=\"true\"" : "");
  piece_insert(i + 1, piece_temp);
  flush();
- sprintf(piece_temp, "</Options_%s>", name);
+ sprintf(piece_temp, "</Section1_Options_%s>", name);
  piece_append(piece_temp);
- /* append to last token text so it appears inside <Options>..</Options> */
+ /* append to last token text so it appears inside <Section1_Options>..</Section1_Options> */
  --piece0;
  piece_pack();
 }
-- 
2.34.1