public / bootstrap_flex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 462815d)
Change char_set="..." to character_set="...", for use with the latest regex.py
authorNick Downing <downing.nick@gmail.com>
Sat, 21 Jul 2018 13:08:55 +0000 (23:08 +1000)
committerNick Downing <downing.nick@gmail.com>
Sat, 21 Jul 2018 13:08:55 +0000 (23:08 +1000)
.gitignore patch | blob | history
src/parse.c patch | blob | history
src/parse.y patch | blob | history

diff --git a/.gitignore b/.gitignore
index 81fa12f..1982534 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ src/parse.c.orig
 src/scan.c.orig
 src/stage1flex
 src/stage1scan.c
+src/stage1scan.c.orig
 src/stamp-h1
 tests/.deps/
 tests/Makefile
diff --git a/src/parse.c b/src/parse.c
index 789d7f3..9324e86 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -2007,7 +2007,7 @@ yyreduce:
                        (yyval) = link_machines( (yyvsp[-1]),
                                link_machines( eps, mkstate( '\n' ) ) );
  insert_after(1, "</RegexCharacter>");
- insert_before(1, "<RegexCharacter char_set=\"10 11\">");
+ insert_before(1, "<RegexCharacter character_set=\"10 11\">");
                        }
 #line 1983 "parse.c" /* yacc.c:1646  */
     break;
@@ -2323,13 +2323,13 @@ yyreduce:
  {
                 (yyval) = mkstate( -cclany );
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 256\">");
  }
             else
  {
                 (yyval) = mkstate( -ccldot );
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 10 11 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 10 11 256\">");
  }
                        }
 #line 2306 "parse.c" /* yacc.c:1646  */
@@ -2400,7 +2400,7 @@ yyreduce:
             else
                 (yyval) = mkstate( (yyvsp[0]) );
  insert_after(0, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
  insert_before(0, piece_temp);
                        }
 #line 2377 "parse.c" /* yacc.c:1646  */
@@ -2504,7 +2504,7 @@ yyreduce:
                        (yyval) = (yyvsp[-3]);
  insert_after(3, "</RegexCharacterOr>");
  insert_after(3, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", (yyvsp[-2]), (yyvsp[0]) + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[-2]), (yyvsp[0]) + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -2530,7 +2530,7 @@ yyreduce:
                        (yyval) = (yyvsp[-1]);
  insert_after(1, "</RegexCharacterOr>");
  insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -2555,7 +2555,7 @@ yyreduce:
                        cclsorted = true;
                        lastchar = 0;
                        currccl = (yyval) = cclinit();
- insert_before(0, "<RegexCharacter char_set=\"\" />");
+ insert_before(0, "<RegexCharacter character_set=\"\" />");
                        }
 #line 2531 "parse.c" /* yacc.c:1646  */
     break;
@@ -2564,7 +2564,7 @@ yyreduce:
 #line 1016 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isalnum); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"48 58 65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"48 58 65 91 97 123\">");
  }
 #line 2540 "parse.c" /* yacc.c:1646  */
     break;
@@ -2573,7 +2573,7 @@ yyreduce:
 #line 1020 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isalpha); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
  }
 #line 2549 "parse.c" /* yacc.c:1646  */
     break;
@@ -2582,7 +2582,7 @@ yyreduce:
 #line 1024 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(IS_BLANK); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"9 14 32 33\">");
+ insert_before(0, "<RegexCharacter character_set=\"9 14 32 33\">");
  }
 #line 2558 "parse.c" /* yacc.c:1646  */
     break;
@@ -2591,7 +2591,7 @@ yyreduce:
 #line 1028 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(iscntrl); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 32\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 32\">");
  }
 #line 2567 "parse.c" /* yacc.c:1646  */
     break;
@@ -2600,7 +2600,7 @@ yyreduce:
 #line 1032 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"48 58\">");
+ insert_before(0, "<RegexCharacter character_set=\"48 58\">");
  }
 #line 2576 "parse.c" /* yacc.c:1646  */
     break;
@@ -2609,7 +2609,7 @@ yyreduce:
 #line 1036 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isgraph); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"33 127\">");
+ insert_before(0, "<RegexCharacter character_set=\"33 127\">");
  }
 #line 2585 "parse.c" /* yacc.c:1646  */
     break;
@@ -2622,12 +2622,12 @@ yyreduce:
  {
                               CCL_EXPR(isupper);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
  }
  else
  {
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"97 123\">");
  }
                         }
 #line 2604 "parse.c" /* yacc.c:1646  */
@@ -2637,7 +2637,7 @@ yyreduce:
 #line 1054 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isprint); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"32 127\">");
+ insert_before(0, "<RegexCharacter character_set=\"32 127\">");
  }
 #line 2613 "parse.c" /* yacc.c:1646  */
     break;
@@ -2646,7 +2646,7 @@ yyreduce:
 #line 1058 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(ispunct); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"33 48 58 65 91 97 123 127\">");
+ insert_before(0, "<RegexCharacter character_set=\"33 48 58 65 91 97 123 127\">");
  }
 #line 2622 "parse.c" /* yacc.c:1646  */
     break;
@@ -2655,7 +2655,7 @@ yyreduce:
 #line 1062 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isspace); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"32 33\">");
+ insert_before(0, "<RegexCharacter character_set=\"32 33\">");
  }
 #line 2631 "parse.c" /* yacc.c:1646  */
     break;
@@ -2664,7 +2664,7 @@ yyreduce:
 #line 1066 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isxdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"48 58 65 71 97 103\">");
+ insert_before(0, "<RegexCharacter character_set=\"48 58 65 71 97 103\">");
  }
 #line 2640 "parse.c" /* yacc.c:1646  */
     break;
@@ -2677,12 +2677,12 @@ yyreduce:
  {
                         CCL_EXPR(islower);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
  }
  else
  {
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91\">");
  }
                                }
 #line 2659 "parse.c" /* yacc.c:1646  */
@@ -2692,7 +2692,7 @@ yyreduce:
 #line 1085 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isalnum); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 48 58 65 91 97 123 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 91 97 123 256\">");
  }
 #line 2668 "parse.c" /* yacc.c:1646  */
     break;
@@ -2701,7 +2701,7 @@ yyreduce:
 #line 1089 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isalpha); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 65 91 97 123 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 65 91 97 123 256\">");
  }
 #line 2677 "parse.c" /* yacc.c:1646  */
     break;
@@ -2710,7 +2710,7 @@ yyreduce:
 #line 1093 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(IS_BLANK); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 9 14 32 33 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 9 14 32 33 256\">");
  }
 #line 2686 "parse.c" /* yacc.c:1646  */
     break;
@@ -2719,7 +2719,7 @@ yyreduce:
 #line 1097 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(iscntrl); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"32 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"32 256\">");
  }
 #line 2695 "parse.c" /* yacc.c:1646  */
     break;
@@ -2728,7 +2728,7 @@ yyreduce:
 #line 1101 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 48 58 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 48 58 256\">");
  }
 #line 2704 "parse.c" /* yacc.c:1646  */
     break;
@@ -2737,7 +2737,7 @@ yyreduce:
 #line 1105 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isgraph); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 33 127 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 33 127 256\">");
  }
 #line 2713 "parse.c" /* yacc.c:1646  */
     break;
@@ -2746,7 +2746,7 @@ yyreduce:
 #line 1109 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isprint); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 32 127 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 32 127 256\">");
  }
 #line 2722 "parse.c" /* yacc.c:1646  */
     break;
@@ -2755,7 +2755,7 @@ yyreduce:
 #line 1113 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(ispunct); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 33 48 58 65 91 97 123 127 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 33 48 58 65 91 97 123 127 256\">");
  }
 #line 2731 "parse.c" /* yacc.c:1646  */
     break;
@@ -2764,7 +2764,7 @@ yyreduce:
 #line 1117 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isspace); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 32 33 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 32 33 256\">");
  }
 #line 2740 "parse.c" /* yacc.c:1646  */
     break;
@@ -2773,7 +2773,7 @@ yyreduce:
 #line 1121 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isxdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 48 58 65 71 97 103 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 71 97 103 256\">");
  }
 #line 2749 "parse.c" /* yacc.c:1646  */
     break;
@@ -2786,7 +2786,7 @@ yyreduce:
                                else
                                        CCL_NEG_EXPR(islower);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 97 123 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 97 123 256\">");
                                }
 #line 2762 "parse.c" /* yacc.c:1646  */
     break;
@@ -2799,7 +2799,7 @@ yyreduce:
                                else
                                        CCL_NEG_EXPR(isupper);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 65 91 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 65 91 256\">");
                                }
 #line 2775 "parse.c" /* yacc.c:1646  */
     break;
@@ -2820,7 +2820,7 @@ yyreduce:
                        (yyval) = link_machines( (yyvsp[-1]), (yyval));
  insert_after(1, "</RegexSequence>");
  insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexSequence>");
                        }
diff --git a/src/parse.y b/src/parse.y
index ebab27f..9b2fe22 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -538,7 +538,7 @@ rule                :  re2 re
                        $$ = link_machines( $1,
                                link_machines( eps, mkstate( '\n' ) ) );
  insert_after(1, "</RegexCharacter>");
- insert_before(1, "<RegexCharacter char_set=\"10 11\">");
+ insert_before(1, "<RegexCharacter character_set=\"10 11\">");
                        }
 
                |  re
@@ -813,13 +813,13 @@ singleton :  singleton '*'
  {
                 $$ = mkstate( -cclany );
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 256\">");
  }
             else
  {
                 $$ = mkstate( -ccldot );
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 10 11 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 10 11 256\">");
  }
                        }
 
@@ -875,7 +875,7 @@ singleton   :  singleton '*'
             else
                 $$ = mkstate( $1 );
  insert_after(0, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", $1, $1 + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $1, $1 + 1);
  insert_before(0, piece_temp);
                        }
                ;
@@ -966,7 +966,7 @@ ccl         :  ccl CHAR '-' CHAR
                        $$ = $1;
  insert_after(3, "</RegexCharacterOr>");
  insert_after(3, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", $2, $4 + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $2, $4 + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -989,7 +989,7 @@ ccl         :  ccl CHAR '-' CHAR
                        $$ = $1;
  insert_after(1, "</RegexCharacterOr>");
  insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", $2, $2 + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $2, $2 + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -1008,34 +1008,34 @@ ccl             :  ccl CHAR '-' CHAR
                        cclsorted = true;
                        lastchar = 0;
                        currccl = $$ = cclinit();
- insert_before(0, "<RegexCharacter char_set=\"\" />");
+ insert_before(0, "<RegexCharacter character_set=\"\" />");
                        }
                ;
 
 ccl_expr:         
            CCE_ALNUM   { CCL_EXPR(isalnum); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"48 58 65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"48 58 65 91 97 123\">");
  }
                |  CCE_ALPHA    { CCL_EXPR(isalpha); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
  }
                |  CCE_BLANK    { CCL_EXPR(IS_BLANK); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"9 14 32 33\">");
+ insert_before(0, "<RegexCharacter character_set=\"9 14 32 33\">");
  }
                |  CCE_CNTRL    { CCL_EXPR(iscntrl); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 32\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 32\">");
  }
                |  CCE_DIGIT    { CCL_EXPR(isdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"48 58\">");
+ insert_before(0, "<RegexCharacter character_set=\"48 58\">");
  }
                |  CCE_GRAPH    { CCL_EXPR(isgraph); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"33 127\">");
+ insert_before(0, "<RegexCharacter character_set=\"33 127\">");
  }
                |  CCE_LOWER    { 
                           CCL_EXPR(islower);
@@ -1043,29 +1043,29 @@ ccl_expr:
  {
                               CCL_EXPR(isupper);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
  }
  else
  {
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"97 123\">");
  }
                         }
                |  CCE_PRINT    { CCL_EXPR(isprint); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"32 127\">");
+ insert_before(0, "<RegexCharacter character_set=\"32 127\">");
  }
                |  CCE_PUNCT    { CCL_EXPR(ispunct); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"33 48 58 65 91 97 123 127\">");
+ insert_before(0, "<RegexCharacter character_set=\"33 48 58 65 91 97 123 127\">");
  }
                |  CCE_SPACE    { CCL_EXPR(isspace); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"32 33\">");
+ insert_before(0, "<RegexCharacter character_set=\"32 33\">");
  }
                |  CCE_XDIGIT   { CCL_EXPR(isxdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"48 58 65 71 97 103\">");
+ insert_before(0, "<RegexCharacter character_set=\"48 58 65 71 97 103\">");
  }
                |  CCE_UPPER    {
                     CCL_EXPR(isupper);
@@ -1073,54 +1073,54 @@ ccl_expr:
  {
                         CCL_EXPR(islower);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91 97 123\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
  }
  else
  {
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"65 91\">");
+ insert_before(0, "<RegexCharacter character_set=\"65 91\">");
  }
                                }
 
         |  CCE_NEG_ALNUM       { CCL_NEG_EXPR(isalnum); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 48 58 65 91 97 123 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 91 97 123 256\">");
  }
                |  CCE_NEG_ALPHA        { CCL_NEG_EXPR(isalpha); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 65 91 97 123 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 65 91 97 123 256\">");
  }
                |  CCE_NEG_BLANK        { CCL_NEG_EXPR(IS_BLANK); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 9 14 32 33 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 9 14 32 33 256\">");
  }
                |  CCE_NEG_CNTRL        { CCL_NEG_EXPR(iscntrl); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"32 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"32 256\">");
  }
                |  CCE_NEG_DIGIT        { CCL_NEG_EXPR(isdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 48 58 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 48 58 256\">");
  }
                |  CCE_NEG_GRAPH        { CCL_NEG_EXPR(isgraph); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 33 127 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 33 127 256\">");
  }
                |  CCE_NEG_PRINT        { CCL_NEG_EXPR(isprint); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 32 127 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 32 127 256\">");
  }
                |  CCE_NEG_PUNCT        { CCL_NEG_EXPR(ispunct); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 33 48 58 65 91 97 123 127 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 33 48 58 65 91 97 123 127 256\">");
  }
                |  CCE_NEG_SPACE        { CCL_NEG_EXPR(isspace); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 32 33 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 32 33 256\">");
  }
                |  CCE_NEG_XDIGIT       { CCL_NEG_EXPR(isxdigit); /*}*/
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 48 58 65 71 97 103 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 71 97 103 256\">");
  }
                |  CCE_NEG_LOWER        { 
                                if ( sf_case_ins() )
@@ -1128,7 +1128,7 @@ ccl_expr:
                                else
                                        CCL_NEG_EXPR(islower);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 97 123 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 97 123 256\">");
                                }
                |  CCE_NEG_UPPER        {
                                if ( sf_case_ins() )
@@ -1136,7 +1136,7 @@ ccl_expr:
                                else
                                        CCL_NEG_EXPR(isupper);
  insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter char_set=\"0 65 91 256\">");
+ insert_before(0, "<RegexCharacter character_set=\"0 65 91 256\">");
                                }
                ;
                
@@ -1155,7 +1155,7 @@ string            :  string CHAR
                        $$ = link_machines( $1, $$);
  insert_after(1, "</RegexSequence>");
  insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter char_set=\"%d %d\">", $2, $2 + 1);
+ sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $2, $2 + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexSequence>");
                        }
Unnamed repository; edit this file 'description' to name the repository.