Minor changes to PYACC_Text bracketing of actions and section 3

diff --git a/src/scan-gram.c b/src/scan-gram.c
index 6a03b57..1a9cc6c 100644 (file)
--- a/src/scan-gram.c
+++ b/src/scan-gram.c
@@ -1017,13 +1017,13 @@ static yyconst flex_int16_t yy_rule_linenum[130] =
       256,  257,  258,  259,  260,  261,  262,  263,  264,  265,
       268,  269,  270,  271,  272,  273,  274,  275,  276,  277,
       278,  280,  284,  285,  286,  288,  300,  314,  331,  336,
-      339,  342,  345,  355,  364,  365,  366,  374,  384,  391,
-      411,  421,  436,  446,  473,  486,  502,  517,  534,  535,
-      546,  557,  558,  570,  586,  596,  623,  635,  656,  657,
+      339,  342,  345,  359,  368,  369,  370,  378,  393,  400,
+      420,  430,  445,  455,  482,  495,  511,  526,  543,  544,
+      555,  566,  567,  579,  595,  605,  632,  644,  665,  666,
 
-      668,  684,  701,  702,  703,  704,  705,  706,  707,  710,
-      712,  726,  744,  749,  750,  756,  757,  768,  775,  782,
-      789,  806,  807,  811,  818,  843,  872,  913,  914
+      677,  693,  710,  711,  712,  713,  714,  715,  716,  719,
+      721,  735,  753,  758,  759,  765,  766,  777,  784,  791,
+      798,  815,  816,  820,  827,  858,  887,  934,  935
     } ;
 
 /* The intent behind this definition is that it'll catch
@@ -2109,13 +2109,17 @@ YY_RULE_SETUP
     BEGIN SC_BRACED_CODE;
  piece_pack();
  piece_append("<PYACC_BracedCode>");
+#if 1 /* include the braces */
+ start_text();
+ flush();
+#endif
   }
        YY_BREAK
 /* Semantic predicate. */
 case 74:
 /* rule 74 can match eol */
 YY_RULE_SETUP
-#line 355 "src/scan-gram.l"
+#line 359 "src/scan-gram.l"
 {
     nesting = 0;
     code_start = loc->start;
@@ -2127,17 +2131,17 @@ YY_RULE_SETUP
 /* A type. */
 case 75:
 YY_RULE_SETUP
-#line 364 "src/scan-gram.l"
+#line 368 "src/scan-gram.l"
 return TAG_ANY;
        YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 365 "src/scan-gram.l"
+#line 369 "src/scan-gram.l"
 return TAG_NONE;
        YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 366 "src/scan-gram.l"
+#line 370 "src/scan-gram.l"
 {
     nesting = 0;
     token_start = loc->start;
@@ -2148,20 +2152,25 @@ YY_RULE_SETUP
        YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 374 "src/scan-gram.l"
+#line 378 "src/scan-gram.l"
 {
     static int percent_percent_count;
     if (++percent_percent_count == 2)
  {
       BEGIN SC_EPILOGUE;
-  in_text = 1; /* not really in text, just suppress the <PYACC_Text> tag */
+  piece_pack();
+  piece_esc(gram_text, strlen(gram_text));
+  piece_pack();
+  piece_pack();
+  start_text();
+  return ~PERCENT_PERCENT;
  }
     return PERCENT_PERCENT;
   }
        YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 384 "src/scan-gram.l"
+#line 393 "src/scan-gram.l"
 {
     bracketed_id_str = NULL;
     bracketed_id_start = loc->start;
@@ -2171,7 +2180,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 391 "src/scan-gram.l"
+#line 400 "src/scan-gram.l"
 {
     complain (loc, complaint, "%s: %s",
               ngettext ("invalid character", "invalid characters", gram_leng),
@@ -2179,7 +2188,7 @@ YY_RULE_SETUP
   }
        YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 397 "src/scan-gram.l"
+#line 406 "src/scan-gram.l"
 {
     loc->start = loc->end = scanner_cursor;
     yyterminate ();
@@ -2194,7 +2203,7 @@ case YY_STATE_EOF(INITIAL):
 
 case 81:
 YY_RULE_SETUP
-#line 411 "src/scan-gram.l"
+#line 420 "src/scan-gram.l"
 complain (loc, complaint, _("invalid null character"));
        YY_BREAK
 
@@ -2205,7 +2214,7 @@ complain (loc, complaint, _("invalid null character"));
 
 case 82:
 YY_RULE_SETUP
-#line 421 "src/scan-gram.l"
+#line 430 "src/scan-gram.l"
 {
     if (bracketed_id_str) /* SHOULDN'T THIS BE if (!bracketed_id_str) ??? */
       {
@@ -2224,7 +2233,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 436 "src/scan-gram.l"
+#line 445 "src/scan-gram.l"
 {
     BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
     *loc = id_loc;
@@ -2238,7 +2247,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 446 "src/scan-gram.l"
+#line 455 "src/scan-gram.l"
 {
     ROLLBACK_CURRENT_TOKEN;
     BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
@@ -2251,7 +2260,7 @@ YY_RULE_SETUP
   }
        YY_BREAK
 case YY_STATE_EOF(SC_AFTER_IDENTIFIER):
-#line 456 "src/scan-gram.l"
+#line 465 "src/scan-gram.l"
 {
     BEGIN (bracketed_id_str ? SC_RETURN_BRACKETED_ID : INITIAL);
     *loc = id_loc;
@@ -2270,7 +2279,7 @@ case YY_STATE_EOF(SC_AFTER_IDENTIFIER):
 
 case 85:
 YY_RULE_SETUP
-#line 473 "src/scan-gram.l"
+#line 482 "src/scan-gram.l"
 {
     if (bracketed_id_str)
       {
@@ -2287,7 +2296,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 486 "src/scan-gram.l"
+#line 495 "src/scan-gram.l"
 {
     BEGIN bracketed_id_context_state;
     if (bracketed_id_str)
@@ -2306,7 +2315,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 502 "src/scan-gram.l"
+#line 511 "src/scan-gram.l"
 {
     complain (loc, complaint, "%s: %s",
               ngettext ("invalid character in bracketed name",
@@ -2315,7 +2324,7 @@ YY_RULE_SETUP
   }
        YY_BREAK
 case YY_STATE_EOF(SC_BRACKETED_ID):
-#line 509 "src/scan-gram.l"
+#line 518 "src/scan-gram.l"
 {
     BEGIN bracketed_id_context_state;
     unexpected_eof (bracketed_id_start, "]");
@@ -2326,7 +2335,7 @@ case YY_STATE_EOF(SC_BRACKETED_ID):
 
 case 88:
 YY_RULE_SETUP
-#line 517 "src/scan-gram.l"
+#line 526 "src/scan-gram.l"
 {
     ROLLBACK_CURRENT_TOKEN;
     val->uniqstr = bracketed_id_str;
@@ -2344,17 +2353,17 @@ YY_RULE_SETUP
 
 case 89:
 YY_RULE_SETUP
-#line 534 "src/scan-gram.l"
+#line 543 "src/scan-gram.l"
 BEGIN context_state;
        YY_BREAK
 case 90:
 /* rule 90 can match eol */
 YY_RULE_SETUP
-#line 535 "src/scan-gram.l"
+#line 544 "src/scan-gram.l"
 continue;
        YY_BREAK
 case YY_STATE_EOF(SC_YACC_COMMENT):
-#line 536 "src/scan-gram.l"
+#line 545 "src/scan-gram.l"
 unexpected_eof (token_start, "*/"); BEGIN context_state;
        YY_BREAK
 
@@ -2366,11 +2375,11 @@ unexpected_eof (token_start, "*/"); BEGIN context_state;
 case 91:
 /* rule 91 can match eol */
 YY_RULE_SETUP
-#line 546 "src/scan-gram.l"
+#line 555 "src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
        YY_BREAK
 case YY_STATE_EOF(SC_COMMENT):
-#line 547 "src/scan-gram.l"
+#line 556 "src/scan-gram.l"
 unexpected_eof (token_start, "*/"); BEGIN context_state;
        YY_BREAK
 
@@ -2382,17 +2391,17 @@ unexpected_eof (token_start, "*/"); BEGIN context_state;
 case 92:
 /* rule 92 can match eol */
 YY_RULE_SETUP
-#line 557 "src/scan-gram.l"
+#line 566 "src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
        YY_BREAK
 case 93:
 /* rule 93 can match eol */
 YY_RULE_SETUP
-#line 558 "src/scan-gram.l"
+#line 567 "src/scan-gram.l"
 STRING_GROW;
        YY_BREAK
 case YY_STATE_EOF(SC_LINE_COMMENT):
-#line 559 "src/scan-gram.l"
+#line 568 "src/scan-gram.l"
 BEGIN context_state;
        YY_BREAK
 
@@ -2404,7 +2413,7 @@ BEGIN context_state;
 
 case 94:
 YY_RULE_SETUP
-#line 570 "src/scan-gram.l"
+#line 579 "src/scan-gram.l"
 {
     STRING_FINISH;
     loc->start = token_start;
@@ -2422,13 +2431,13 @@ YY_RULE_SETUP
   }
        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_STRING):
-#line 585 "src/scan-gram.l"
+#line 594 "src/scan-gram.l"
 unexpected_eof (token_start, "\"");
        YY_BREAK
 case 95:
 /* rule 95 can match eol */
 YY_RULE_SETUP
-#line 586 "src/scan-gram.l"
+#line 595 "src/scan-gram.l"
 unexpected_newline (token_start, "\"");
        YY_BREAK
 
@@ -2440,7 +2449,7 @@ unexpected_newline (token_start, "\"");
 
 case 96:
 YY_RULE_SETUP
-#line 596 "src/scan-gram.l"
+#line 605 "src/scan-gram.l"
 {
     STRING_FINISH;
     loc->start = token_start;
@@ -2472,11 +2481,11 @@ YY_RULE_SETUP
 case 97:
 /* rule 97 can match eol */
 YY_RULE_SETUP
-#line 623 "src/scan-gram.l"
+#line 632 "src/scan-gram.l"
 unexpected_newline (token_start, "'");
        YY_BREAK
 case YY_STATE_EOF(SC_ESCAPED_CHARACTER):
-#line 624 "src/scan-gram.l"
+#line 633 "src/scan-gram.l"
 unexpected_eof (token_start, "'");
        YY_BREAK
 
@@ -2487,7 +2496,7 @@ unexpected_eof (token_start, "'");
 
 case 98:
 YY_RULE_SETUP
-#line 635 "src/scan-gram.l"
+#line 644 "src/scan-gram.l"
 {
     --nesting;
     if (nesting < 0)
@@ -2512,16 +2521,16 @@ YY_RULE_SETUP
 case 99:
 /* rule 99 can match eol */
 YY_RULE_SETUP
-#line 656 "src/scan-gram.l"
+#line 665 "src/scan-gram.l"
 STRING_GROW;
        YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 657 "src/scan-gram.l"
+#line 666 "src/scan-gram.l"
 STRING_GROW; nesting += gram_leng;
        YY_BREAK
 case YY_STATE_EOF(SC_TAG):
-#line 659 "src/scan-gram.l"
+#line 668 "src/scan-gram.l"
 unexpected_eof (token_start, ">");
        YY_BREAK
 
@@ -2532,7 +2541,7 @@ unexpected_eof (token_start, ">");
 
 case 101:
 YY_RULE_SETUP
-#line 668 "src/scan-gram.l"
+#line 677 "src/scan-gram.l"
 {
     unsigned long int c = strtoul (gram_text + 1, NULL, 8);
     if (!c || UCHAR_MAX < c)
@@ -2542,7 +2551,7 @@ YY_RULE_SETUP
  {
       obstack_1grow (&obstack_for_string, c);
   stop_text();
-  sprintf(piece_temp, "<PYACC_Escape char=\"%d\">", (int)c);
+  sprintf(piece_temp, "<PYACC_Escape character=\"%d\">", (int)c);
   piece_append(piece_temp);
   flush();
   piece_append("</PYACC_Escape>"); 
@@ -2551,7 +2560,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 684 "src/scan-gram.l"
+#line 693 "src/scan-gram.l"
 {
     verify (UCHAR_MAX < ULONG_MAX);
     unsigned long int c = strtoul (gram_text + 2, NULL, 16);
@@ -2562,7 +2571,7 @@ YY_RULE_SETUP
  {
       obstack_1grow (&obstack_for_string, c);
   stop_text();
-  sprintf(piece_temp, "<PYACC_Escape char=\"%d\">", (int)c);
+  sprintf(piece_temp, "<PYACC_Escape character=\"%d\">", (int)c);
   piece_append(piece_temp);
   flush();
   piece_append("</PYACC_Escape>"); 
@@ -2571,48 +2580,48 @@ YY_RULE_SETUP
        YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 701 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, '\a'); stop_text(); piece_append("<PYACC_Escape char=\"7\">"); flush(); piece_append("</PYACC_Escape>");
+#line 710 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, '\a'); stop_text(); piece_append("<PYACC_Escape character=\"7\">"); flush(); piece_append("</PYACC_Escape>");
        YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 702 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, '\b'); stop_text(); piece_append("<PYACC_Escape char=\"8\">"); flush(); piece_append("</PYACC_Escape>");
+#line 711 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, '\b'); stop_text(); piece_append("<PYACC_Escape character=\"8\">"); flush(); piece_append("</PYACC_Escape>");
        YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 703 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, '\f'); stop_text(); piece_append("<PYACC_Escape char=\"12\">"); flush(); piece_append("</PYACC_Escape>");
+#line 712 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, '\f'); stop_text(); piece_append("<PYACC_Escape character=\"12\">"); flush(); piece_append("</PYACC_Escape>");
        YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 704 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, '\n'); stop_text(); piece_append("<PYACC_Escape char=\"10\">"); flush(); piece_append("</PYACC_Escape>");
+#line 713 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, '\n'); stop_text(); piece_append("<PYACC_Escape character=\"10\">"); flush(); piece_append("</PYACC_Escape>");
        YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 705 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, '\r'); stop_text(); piece_append("<PYACC_Escape char=\"13\">"); flush(); piece_append("</PYACC_Escape>");
+#line 714 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, '\r'); stop_text(); piece_append("<PYACC_Escape character=\"13\">"); flush(); piece_append("</PYACC_Escape>");
        YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 706 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, '\t'); stop_text(); piece_append("<PYACC_Escape char=\"9\">"); flush(); piece_append("</PYACC_Escape>");
+#line 715 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, '\t'); stop_text(); piece_append("<PYACC_Escape character=\"9\">"); flush(); piece_append("</PYACC_Escape>");
        YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 707 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, '\v'); stop_text(); piece_append("<PYACC_Escape char=\"11\">"); flush(); piece_append("</PYACC_Escape>");
+#line 716 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, '\v'); stop_text(); piece_append("<PYACC_Escape character=\"11\">"); flush(); piece_append("</PYACC_Escape>");
        YY_BREAK
 /* \\[\"\'?\\] would be shorter, but it confuses xgettext.  */
 case 110:
 YY_RULE_SETUP
-#line 710 "src/scan-gram.l"
-obstack_1grow (&obstack_for_string, gram_text[1]); stop_text(); sprintf(piece_temp, "<PYACC_Escape char=\"%d\">", gram_text[1]); piece_append(piece_temp); flush(); piece_append("</PYACC_Escape>"); 
+#line 719 "src/scan-gram.l"
+obstack_1grow (&obstack_for_string, gram_text[1]); stop_text(); sprintf(piece_temp, "<PYACC_Escape character=\"%d\">", gram_text[1]); piece_append(piece_temp); flush(); piece_append("</PYACC_Escape>"); 
        YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 712 "src/scan-gram.l"
+#line 721 "src/scan-gram.l"
 {
     int c = convert_ucn_to_byte (gram_text);
     if (c <= 0)
@@ -2621,7 +2630,7 @@ YY_RULE_SETUP
     else
  {
       obstack_1grow (&obstack_for_string, c);
-  sprintf(piece_temp, "<PYACC_Escape char=\"%d\">", c);
+  sprintf(piece_temp, "<PYACC_Escape character=\"%d\">", c);
   piece_append(piece_temp);
   flush();
   piece_append("</PYACC_Escape>"); 
@@ -2631,7 +2640,7 @@ YY_RULE_SETUP
 case 112:
 /* rule 112 can match eol */
 YY_RULE_SETUP
-#line 726 "src/scan-gram.l"
+#line 735 "src/scan-gram.l"
 {
     char const *p = gram_text + 1;
     /* Quote only if escaping won't make the character visible.  */
@@ -2652,7 +2661,7 @@ YY_RULE_SETUP
 case 113:
 /* rule 113 can match eol */
 YY_RULE_SETUP
-#line 744 "src/scan-gram.l"
+#line 753 "src/scan-gram.l"
 STRING_GROW;
        YY_BREAK
 
@@ -2660,17 +2669,17 @@ STRING_GROW;
 
 case 114:
 YY_RULE_SETUP
-#line 749 "src/scan-gram.l"
+#line 758 "src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
        YY_BREAK
 case 115:
 /* rule 115 can match eol */
 YY_RULE_SETUP
-#line 750 "src/scan-gram.l"
+#line 759 "src/scan-gram.l"
 unexpected_newline (token_start, "'");
        YY_BREAK
 case YY_STATE_EOF(SC_CHARACTER):
-#line 751 "src/scan-gram.l"
+#line 760 "src/scan-gram.l"
 unexpected_eof (token_start, "'");
        YY_BREAK
 
@@ -2678,17 +2687,17 @@ unexpected_eof (token_start, "'");
 
 case 116:
 YY_RULE_SETUP
-#line 756 "src/scan-gram.l"
+#line 765 "src/scan-gram.l"
 STRING_GROW; BEGIN context_state;
        YY_BREAK
 case 117:
 /* rule 117 can match eol */
 YY_RULE_SETUP
-#line 757 "src/scan-gram.l"
+#line 766 "src/scan-gram.l"
 unexpected_newline (token_start, "\"");
        YY_BREAK
 case YY_STATE_EOF(SC_STRING):
-#line 758 "src/scan-gram.l"
+#line 767 "src/scan-gram.l"
 unexpected_eof (token_start, "\"");
        YY_BREAK
 
@@ -2699,7 +2708,7 @@ unexpected_eof (token_start, "\"");
 
 case 118:
 YY_RULE_SETUP
-#line 768 "src/scan-gram.l"
+#line 777 "src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2710,7 +2719,7 @@ YY_RULE_SETUP
        YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 775 "src/scan-gram.l"
+#line 784 "src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2722,7 +2731,7 @@ YY_RULE_SETUP
 case 120:
 /* rule 120 can match eol */
 YY_RULE_SETUP
-#line 782 "src/scan-gram.l"
+#line 791 "src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2734,7 +2743,7 @@ YY_RULE_SETUP
 case 121:
 /* rule 121 can match eol */
 YY_RULE_SETUP
-#line 789 "src/scan-gram.l"
+#line 798 "src/scan-gram.l"
 {
     STRING_GROW;
     context_state = YY_START;
@@ -2752,13 +2761,13 @@ YY_RULE_SETUP
 case 122:
 /* rule 122 can match eol */
 YY_RULE_SETUP
-#line 806 "src/scan-gram.l"
+#line 815 "src/scan-gram.l"
 STRING_GROW; nesting++; start_text();
        YY_BREAK
 case 123:
 /* rule 123 can match eol */
 YY_RULE_SETUP
-#line 807 "src/scan-gram.l"
+#line 816 "src/scan-gram.l"
 STRING_GROW; nesting--; start_text();
        YY_BREAK
 /* Tokenize '<<%' correctly (as '<<' '%') rather than incorrrectly
@@ -2766,12 +2775,12 @@ STRING_GROW; nesting--; start_text();
 case 124:
 /* rule 124 can match eol */
 YY_RULE_SETUP
-#line 811 "src/scan-gram.l"
+#line 820 "src/scan-gram.l"
 STRING_GROW; start_text();
        YY_BREAK
 case YY_STATE_EOF(SC_BRACED_CODE):
 case YY_STATE_EOF(SC_PREDICATE):
-#line 813 "src/scan-gram.l"
+#line 822 "src/scan-gram.l"
 unexpected_eof (code_start, "}");
        YY_BREAK
 
@@ -2779,7 +2788,7 @@ unexpected_eof (code_start, "}");
 
 case 125:
 YY_RULE_SETUP
-#line 818 "src/scan-gram.l"
+#line 827 "src/scan-gram.l"
 {
     obstack_1grow (&obstack_for_string, '}');
 
@@ -2791,9 +2800,15 @@ YY_RULE_SETUP
         val->code = last_string;
         BEGIN INITIAL;
 #if 1
- stop_text();
+#if 1 /* include the braces */
+ start_text();
  piece_esc(gram_text, strlen(gram_text));
+#endif
+ stop_text();
  piece_append("</PYACC_BracedCode>");
+#if 0 /* don't include the braces */
+ piece_esc(gram_text, strlen(gram_text));
+#endif 
  piece_pack();
  return ~BRACED_CODE;
 #else
@@ -2807,7 +2822,7 @@ YY_RULE_SETUP
 
 case 126:
 YY_RULE_SETUP
-#line 843 "src/scan-gram.l"
+#line 858 "src/scan-gram.l"
 {
     --nesting;
     if (nesting < 0)
@@ -2838,7 +2853,7 @@ YY_RULE_SETUP
 
 case 127:
 YY_RULE_SETUP
-#line 872 "src/scan-gram.l"
+#line 887 "src/scan-gram.l"
 {
     STRING_FINISH;
     loc->start = code_start;
@@ -2856,7 +2871,7 @@ YY_RULE_SETUP
   }
        YY_BREAK
 case YY_STATE_EOF(SC_PROLOGUE):
-#line 888 "src/scan-gram.l"
+#line 903 "src/scan-gram.l"
 unexpected_eof (code_start, "%}");
        YY_BREAK
 
@@ -2867,13 +2882,19 @@ unexpected_eof (code_start, "%}");
 
 
 case YY_STATE_EOF(SC_EPILOGUE):
-#line 899 "src/scan-gram.l"
+#line 914 "src/scan-gram.l"
 {
     STRING_FINISH;
     loc->start = code_start;
     val->code = last_string;
     BEGIN INITIAL;
+#if 1
+ stop_text();
+ piece_pack();
+ return ~EPILOGUE;
+#else
     return EPILOGUE;
+#endif
   }
        YY_BREAK
 
@@ -2881,19 +2902,19 @@ case YY_STATE_EOF(SC_EPILOGUE):
   | By default, grow the string obstack with the input.  |
   `-----------------------------------------------------*/
 case 128:
-#line 914 "src/scan-gram.l"
+#line 935 "src/scan-gram.l"
 case 129:
 /* rule 129 can match eol */
 YY_RULE_SETUP
-#line 914 "src/scan-gram.l"
+#line 935 "src/scan-gram.l"
 STRING_GROW; start_text();
        YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 917 "src/scan-gram.l"
+#line 938 "src/scan-gram.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
        YY_BREAK
-#line 2785 "src/scan-gram.c"
+#line 2806 "src/scan-gram.c"
 case YY_STATE_EOF(SC_RETURN_BRACKETED_ID):
        yyterminate();
 
@@ -4027,7 +4048,7 @@ void gram_free (void * ptr )
 
 /* %ok-for-header */
 
-#line 917 "src/scan-gram.l"
+#line 938 "src/scan-gram.l"
 
 
 

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 9030e49..d32da0c 100644 (file)
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -349,6 +349,10 @@ eqopt    ([[:space:]]*=)?
     BEGIN SC_BRACED_CODE;
  piece_pack();
  piece_append("<PYACC_BracedCode>");
+#if 1 /* include the braces */
+ start_text();
+ flush();
+#endif
   }
 
   /* Semantic predicate. */
@@ -376,7 +380,12 @@ eqopt    ([[:space:]]*=)?
     if (++percent_percent_count == 2)
  {
       BEGIN SC_EPILOGUE;
-  in_text = 1; /* not really in text, just suppress the <PYACC_Text> tag */
+  piece_pack();
+  piece_esc(yytext, strlen(yytext));
+  piece_pack();
+  piece_pack();
+  start_text();
+  return ~PERCENT_PERCENT;
  }
     return PERCENT_PERCENT;
   }
@@ -826,9 +835,15 @@ eqopt    ([[:space:]]*=)?
         val->code = last_string;
         BEGIN INITIAL;
 #if 1
- stop_text();
+#if 1 /* include the braces */
+ start_text();
  piece_esc(yytext, strlen(yytext));
+#endif
+ stop_text();
  piece_append("</PYACC_BracedCode>");
+#if 0 /* don't include the braces */
+ piece_esc(yytext, strlen(yytext));
+#endif
  piece_pack();
  return ~BRACED_CODE;
 #else
@@ -901,7 +916,13 @@ eqopt    ([[:space:]]*=)?
     loc->start = code_start;
     val->code = last_string;
     BEGIN INITIAL;
+#if 1
+ stop_text();
+ piece_pack();
+ return ~EPILOGUE;
+#else
     return EPILOGUE;
+#endif
   }
 }