Changes for caseless scanners, allow build system to rebuild texinfo/manpage

diff --git a/doc/flex.1 b/doc/flex.1
index a1cd269..953a1f0 100644 (file)
--- a/doc/flex.1
+++ b/doc/flex.1
@@ -1,10 +1,10 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
-.TH FLEX "1" "May 2017" "The Flex Project" "Programming"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH FLEX "1" "July 2018" "The Flex Project" "Programming"
 .SH NAME
 flex \- the fast lexical analyser generator
 .SH SYNOPSIS
 .B flex
-[\fI\,OPTIONS\/\fR] [\fI\,FILE\/\fR]...
+[\fIOPTIONS\fR] [\fIFILE\fR]...
 .SH DESCRIPTION
 Generates programs that perform pattern\-matching on text.
 .SS "Table Compression:"
@@ -62,22 +62,22 @@ write summary of scanner statistics to stdout
 use hexadecimal numbers instead of octal in debug outputs
 .SH FILES
 .TP
-\fB\-o\fR, \fB\-\-outfile\fR=\fI\,FILE\/\fR
+\fB\-o\fR, \fB\-\-outfile\fR=\fIFILE\fR
 specify output filename
 .TP
-\fB\-S\fR, \fB\-\-skel\fR=\fI\,FILE\/\fR
+\fB\-S\fR, \fB\-\-skel\fR=\fIFILE\fR
 specify skeleton file
 .TP
 \fB\-t\fR, \fB\-\-stdout\fR
 write scanner on stdout instead of lex.yy.c
 .TP
-\fB\-\-yyclass\fR=\fI\,NAME\/\fR
+\fB\-\-yyclass\fR=\fINAME\fR
 name of C++ class
 .TP
-\fB\-\-header\-file\fR=\fI\,FILE\/\fR
+\fB\-\-header\-file\fR=\fIFILE\fR
 create a C header file in addition to the scanner
 .HP
-\fB\-\-tables\-file\fR[=\fI\,FILE\/\fR] write tables to FILE
+\fB\-\-tables\-file\fR[=\fIFILE\fR] write tables to FILE
 .SS "Scanner behavior:"
 .TP
 \fB\-7\fR, \fB\-\-7bit\fR
@@ -108,13 +108,13 @@ track line count in yylineno
 \-+,  \fB\-\-c\fR++
 generate C++ scanner class
 .TP
-\fB\-Dmacro\fR[=\fI\,defn\/\fR]
+\fB\-Dmacro\fR[=\fIdefn\fR]
 #define macro defn  (default defn is '1')
 .TP
 \fB\-L\fR,  \fB\-\-noline\fR
 suppress #line directives in scanner
 .TP
-\fB\-P\fR,  \fB\-\-prefix\fR=\fI\,STRING\/\fR
+\fB\-P\fR,  \fB\-\-prefix\fR=\fISTRING\fR
 use STRING as prefix instead of "yy"
 .TP
 \fB\-R\fR,  \fB\-\-reentrant\fR

diff --git a/doc/flex.info b/doc/flex.info
index a972bcd..3d4793f 100644 (file)
--- a/doc/flex.info
+++ b/doc/flex.info
@@ -1,4 +1,4 @@
-This is flex.info, produced by makeinfo version 6.1 from flex.texi.
+This is flex.info, produced by makeinfo version 5.2 from flex.texi.
 
 The flex manual is placed under the same licensing conditions as the
 rest of flex:

diff --git a/doc/flex.info-1 b/doc/flex.info-1
index b79df5e..9811139 100644 (file)
--- a/doc/flex.info-1
+++ b/doc/flex.info-1
@@ -1,4 +1,4 @@
-This is flex.info, produced by makeinfo version 6.1 from flex.texi.
+This is flex.info, produced by makeinfo version 5.2 from flex.texi.
 
 The flex manual is placed under the same licensing conditions as the
 rest of flex:

diff --git a/doc/flex.info-2 b/doc/flex.info-2
index 32356d6..5b2fe76 100644 (file)
Binary files a/doc/flex.info-2 and b/doc/flex.info-2 differ

diff --git a/n.sh b/n.sh
index 63a39a5..29ad93b 100755 (executable)
--- a/n.sh
+++ b/n.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+#sudo apt-get install texinfo help2man
 ./configure
 cp src/Makefile src/Makefile.orig
 patch src/Makefile <src/Makefile.patch

diff --git a/src/parse.c b/src/parse.c
index f7848b9..bc67f03 100644 (file)
--- a/src/parse.c
+++ b/src/parse.c
@@ -2008,8 +2008,8 @@ yyreduce:
                        eps = mkstate( SYM_EPSILON );
                        (yyval) = link_machines( (yyvsp[-1]),
                                link_machines( eps, mkstate( '\n' ) ) );
- insert_after(1, "</RegexCharacter>");
- insert_before(1, "<RegexCharacter character_set=\"10 11\">");
+ insert_after(1, "</RegexCharacterLiteral>");
+ insert_before(1, "<RegexCharacterLiteral character_set=\"10 11\">");
                        }
 #line 1985 "parse.c" /* yacc.c:1646  */
     break;
@@ -2324,14 +2324,14 @@ yyreduce:
             if (sf_dot_all())
  {
                 (yyval) = mkstate( -cclany );
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 256\">");
  }
             else
  {
                 (yyval) = mkstate( -ccldot );
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 10 11 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 10 11 256\">");
  }
                        }
 #line 2308 "parse.c" /* yacc.c:1646  */
@@ -2401,8 +2401,8 @@ yyreduce:
                 (yyval) = mkor (mkstate((yyvsp[0])), mkstate(reverse_case((yyvsp[0]))));
             else
                 (yyval) = mkstate( (yyvsp[0]) );
- insert_after(0, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
+ insert_after(0, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
  insert_before(0, piece_temp);
                        }
 #line 2379 "parse.c" /* yacc.c:1646  */
@@ -2505,8 +2505,8 @@ yyreduce:
 
                        (yyval) = (yyvsp[-3]);
  insert_after(3, "</RegexCharacterOr>");
- insert_after(3, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[-2]), (yyvsp[0]) + 1);
+ insert_after(3, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", (yyvsp[-2]), (yyvsp[0]) + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -2531,8 +2531,8 @@ yyreduce:
 
                        (yyval) = (yyvsp[-1]);
  insert_after(1, "</RegexCharacterOr>");
- insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
+ insert_after(1, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -2557,7 +2557,7 @@ yyreduce:
                        cclsorted = true;
                        lastchar = 0;
                        currccl = (yyval) = cclinit();
- insert_before(0, "<RegexCharacter character_set=\"\" />");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"\" />");
                        }
 #line 2533 "parse.c" /* yacc.c:1646  */
     break;
@@ -2565,8 +2565,8 @@ yyreduce:
   case 72:
 #line 1018 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isalnum); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"48 58 65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"48 58 65 91 97 123\">");
  }
 #line 2542 "parse.c" /* yacc.c:1646  */
     break;
@@ -2574,8 +2574,8 @@ yyreduce:
   case 73:
 #line 1022 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isalpha); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91 97 123\">");
  }
 #line 2551 "parse.c" /* yacc.c:1646  */
     break;
@@ -2583,8 +2583,8 @@ yyreduce:
   case 74:
 #line 1026 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(IS_BLANK); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"9 14 32 33\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"9 14 32 33\">");
  }
 #line 2560 "parse.c" /* yacc.c:1646  */
     break;
@@ -2592,8 +2592,8 @@ yyreduce:
   case 75:
 #line 1030 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(iscntrl); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 32\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 32\">");
  }
 #line 2569 "parse.c" /* yacc.c:1646  */
     break;
@@ -2601,8 +2601,8 @@ yyreduce:
   case 76:
 #line 1034 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"48 58\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"48 58\">");
  }
 #line 2578 "parse.c" /* yacc.c:1646  */
     break;
@@ -2610,8 +2610,8 @@ yyreduce:
   case 77:
 #line 1038 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isgraph); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"33 127\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"33 127\">");
  }
 #line 2587 "parse.c" /* yacc.c:1646  */
     break;
@@ -2623,13 +2623,13 @@ yyreduce:
                           if (sf_case_ins())
  {
                               CCL_EXPR(isupper);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91 97 123\">");
  }
  else
  {
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"97 123\">");
  }
                         }
 #line 2606 "parse.c" /* yacc.c:1646  */
@@ -2638,8 +2638,8 @@ yyreduce:
   case 79:
 #line 1056 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isprint); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"32 127\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"32 127\">");
  }
 #line 2615 "parse.c" /* yacc.c:1646  */
     break;
@@ -2647,8 +2647,8 @@ yyreduce:
   case 80:
 #line 1060 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(ispunct); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"33 48 58 65 91 97 123 127\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"33 48 58 65 91 97 123 127\">");
  }
 #line 2624 "parse.c" /* yacc.c:1646  */
     break;
@@ -2656,8 +2656,8 @@ yyreduce:
   case 81:
 #line 1064 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isspace); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"32 33\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"32 33\">");
  }
 #line 2633 "parse.c" /* yacc.c:1646  */
     break;
@@ -2665,8 +2665,8 @@ yyreduce:
   case 82:
 #line 1068 "parse.y" /* yacc.c:1646  */
     { CCL_EXPR(isxdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"48 58 65 71 97 103\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"48 58 65 71 97 103\">");
  }
 #line 2642 "parse.c" /* yacc.c:1646  */
     break;
@@ -2678,13 +2678,13 @@ yyreduce:
                     if (sf_case_ins())
  {
                         CCL_EXPR(islower);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91 97 123\">");
  }
  else
  {
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91\">");
  }
                                }
 #line 2661 "parse.c" /* yacc.c:1646  */
@@ -2693,8 +2693,8 @@ yyreduce:
   case 84:
 #line 1087 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isalnum); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 91 97 123 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 65 91 97 123 256\">");
  }
 #line 2670 "parse.c" /* yacc.c:1646  */
     break;
@@ -2702,8 +2702,8 @@ yyreduce:
   case 85:
 #line 1091 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isalpha); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 65 91 97 123 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 65 91 97 123 256\">");
  }
 #line 2679 "parse.c" /* yacc.c:1646  */
     break;
@@ -2711,8 +2711,8 @@ yyreduce:
   case 86:
 #line 1095 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(IS_BLANK); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 9 14 32 33 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 9 14 32 33 256\">");
  }
 #line 2688 "parse.c" /* yacc.c:1646  */
     break;
@@ -2720,8 +2720,8 @@ yyreduce:
   case 87:
 #line 1099 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(iscntrl); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"32 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"32 256\">");
  }
 #line 2697 "parse.c" /* yacc.c:1646  */
     break;
@@ -2729,8 +2729,8 @@ yyreduce:
   case 88:
 #line 1103 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 48 58 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 256\">");
  }
 #line 2706 "parse.c" /* yacc.c:1646  */
     break;
@@ -2738,8 +2738,8 @@ yyreduce:
   case 89:
 #line 1107 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isgraph); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 33 127 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 33 127 256\">");
  }
 #line 2715 "parse.c" /* yacc.c:1646  */
     break;
@@ -2747,8 +2747,8 @@ yyreduce:
   case 90:
 #line 1111 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isprint); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 32 127 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 32 127 256\">");
  }
 #line 2724 "parse.c" /* yacc.c:1646  */
     break;
@@ -2756,8 +2756,8 @@ yyreduce:
   case 91:
 #line 1115 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(ispunct); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 33 48 58 65 91 97 123 127 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 33 48 58 65 91 97 123 127 256\">");
  }
 #line 2733 "parse.c" /* yacc.c:1646  */
     break;
@@ -2765,8 +2765,8 @@ yyreduce:
   case 92:
 #line 1119 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isspace); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 32 33 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 32 33 256\">");
  }
 #line 2742 "parse.c" /* yacc.c:1646  */
     break;
@@ -2774,8 +2774,8 @@ yyreduce:
   case 93:
 #line 1123 "parse.y" /* yacc.c:1646  */
     { CCL_NEG_EXPR(isxdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 71 97 103 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 65 71 97 103 256\">");
  }
 #line 2751 "parse.c" /* yacc.c:1646  */
     break;
@@ -2787,8 +2787,8 @@ yyreduce:
                                        lwarn(_("[:^lower:] is ambiguous in case insensitive scanner"));
                                else
                                        CCL_NEG_EXPR(islower);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 97 123 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 97 123 256\">");
                                }
 #line 2764 "parse.c" /* yacc.c:1646  */
     break;
@@ -2800,8 +2800,8 @@ yyreduce:
                                        lwarn(_("[:^upper:] ambiguous in case insensitive scanner"));
                                else
                                        CCL_NEG_EXPR(isupper);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 65 91 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 65 91 256\">");
                                }
 #line 2777 "parse.c" /* yacc.c:1646  */
     break;
@@ -2821,8 +2821,8 @@ yyreduce:
 
                        (yyval) = link_machines( (yyvsp[-1]), (yyval));
  insert_after(1, "</RegexSequence>");
- insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", (yyvsp[0]), (yyvsp[0]) + 1);
+ insert_after(1, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral 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 cbae51a..d710a61 100644 (file)
--- a/src/parse.y
+++ b/src/parse.y
@@ -539,8 +539,8 @@ rule                :  re2 re
                        eps = mkstate( SYM_EPSILON );
                        $$ = link_machines( $1,
                                link_machines( eps, mkstate( '\n' ) ) );
- insert_after(1, "</RegexCharacter>");
- insert_before(1, "<RegexCharacter character_set=\"10 11\">");
+ insert_after(1, "</RegexCharacterLiteral>");
+ insert_before(1, "<RegexCharacterLiteral character_set=\"10 11\">");
                        }
 
                |  re
@@ -814,14 +814,14 @@ singleton :  singleton '*'
             if (sf_dot_all())
  {
                 $$ = mkstate( -cclany );
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 256\">");
  }
             else
  {
                 $$ = mkstate( -ccldot );
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 10 11 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 10 11 256\">");
  }
                        }
 
@@ -876,8 +876,8 @@ singleton   :  singleton '*'
                 $$ = mkor (mkstate($1), mkstate(reverse_case($1)));
             else
                 $$ = mkstate( $1 );
- insert_after(0, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $1, $1 + 1);
+ insert_after(0, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", $1, $1 + 1);
  insert_before(0, piece_temp);
                        }
                ;
@@ -967,8 +967,8 @@ ccl         :  ccl CHAR '-' CHAR
 
                        $$ = $1;
  insert_after(3, "</RegexCharacterOr>");
- insert_after(3, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $2, $4 + 1);
+ insert_after(3, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", $2, $4 + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -990,8 +990,8 @@ ccl         :  ccl CHAR '-' CHAR
 
                        $$ = $1;
  insert_after(1, "</RegexCharacterOr>");
- insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $2, $2 + 1);
+ insert_after(1, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", $2, $2 + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexCharacterOr>");
                        }
@@ -1010,135 +1010,135 @@ ccl           :  ccl CHAR '-' CHAR
                        cclsorted = true;
                        lastchar = 0;
                        currccl = $$ = cclinit();
- insert_before(0, "<RegexCharacter character_set=\"\" />");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"\" />");
                        }
                ;
 
 ccl_expr:         
            CCE_ALNUM   { CCL_EXPR(isalnum); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"48 58 65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"48 58 65 91 97 123\">");
  }
                |  CCE_ALPHA    { CCL_EXPR(isalpha); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91 97 123\">");
  }
                |  CCE_BLANK    { CCL_EXPR(IS_BLANK); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"9 14 32 33\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"9 14 32 33\">");
  }
                |  CCE_CNTRL    { CCL_EXPR(iscntrl); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 32\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 32\">");
  }
                |  CCE_DIGIT    { CCL_EXPR(isdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"48 58\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"48 58\">");
  }
                |  CCE_GRAPH    { CCL_EXPR(isgraph); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"33 127\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"33 127\">");
  }
                |  CCE_LOWER    { 
                           CCL_EXPR(islower);
                           if (sf_case_ins())
  {
                               CCL_EXPR(isupper);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91 97 123\">");
  }
  else
  {
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"97 123\">");
  }
                         }
                |  CCE_PRINT    { CCL_EXPR(isprint); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"32 127\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"32 127\">");
  }
                |  CCE_PUNCT    { CCL_EXPR(ispunct); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"33 48 58 65 91 97 123 127\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"33 48 58 65 91 97 123 127\">");
  }
                |  CCE_SPACE    { CCL_EXPR(isspace); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"32 33\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"32 33\">");
  }
                |  CCE_XDIGIT   { CCL_EXPR(isxdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"48 58 65 71 97 103\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"48 58 65 71 97 103\">");
  }
                |  CCE_UPPER    {
                     CCL_EXPR(isupper);
                     if (sf_case_ins())
  {
                         CCL_EXPR(islower);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91 97 123\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91 97 123\">");
  }
  else
  {
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"65 91\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"65 91\">");
  }
                                }
 
         |  CCE_NEG_ALNUM       { CCL_NEG_EXPR(isalnum); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 91 97 123 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral 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 character_set=\"0 65 91 97 123 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 65 91 97 123 256\">");
  }
                |  CCE_NEG_BLANK        { CCL_NEG_EXPR(IS_BLANK); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 9 14 32 33 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 9 14 32 33 256\">");
  }
                |  CCE_NEG_CNTRL        { CCL_NEG_EXPR(iscntrl); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"32 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"32 256\">");
  }
                |  CCE_NEG_DIGIT        { CCL_NEG_EXPR(isdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 48 58 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 256\">");
  }
                |  CCE_NEG_GRAPH        { CCL_NEG_EXPR(isgraph); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 33 127 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 33 127 256\">");
  }
                |  CCE_NEG_PRINT        { CCL_NEG_EXPR(isprint); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 32 127 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 32 127 256\">");
  }
                |  CCE_NEG_PUNCT        { CCL_NEG_EXPR(ispunct); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 33 48 58 65 91 97 123 127 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral 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 character_set=\"0 32 33 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 32 33 256\">");
  }
                |  CCE_NEG_XDIGIT       { CCL_NEG_EXPR(isxdigit); /*}*/
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 48 58 65 71 97 103 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 48 58 65 71 97 103 256\">");
  }
                |  CCE_NEG_LOWER        { 
                                if ( sf_case_ins() )
                                        lwarn(_("[:^lower:] is ambiguous in case insensitive scanner"));
                                else
                                        CCL_NEG_EXPR(islower);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 97 123 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 97 123 256\">");
                                }
                |  CCE_NEG_UPPER        {
                                if ( sf_case_ins() )
                                        lwarn(_("[:^upper:] ambiguous in case insensitive scanner"));
                                else
                                        CCL_NEG_EXPR(isupper);
- insert_after(0, "</RegexCharacter>");
- insert_before(0, "<RegexCharacter character_set=\"0 65 91 256\">");
+ insert_after(0, "</RegexCharacterLiteral>");
+ insert_before(0, "<RegexCharacterLiteral character_set=\"0 65 91 256\">");
                                }
                ;
                
@@ -1156,8 +1156,8 @@ string            :  string CHAR
 
                        $$ = link_machines( $1, $$);
  insert_after(1, "</RegexSequence>");
- insert_after(1, "</RegexCharacter>");
- sprintf(piece_temp, "<RegexCharacter character_set=\"%d %d\">", $2, $2 + 1);
+ insert_after(1, "</RegexCharacterLiteral>");
+ sprintf(piece_temp, "<RegexCharacterLiteral character_set=\"%d %d\">", $2, $2 + 1);
  insert_before(1, piece_temp);
  insert_before(0, "<RegexSequence>");
                        }

diff --git a/src/scan.c b/src/scan.c
index 28e469f..e1bf326 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -8669,12 +8669,12 @@ C_plus_plus = option_sense; markup_option("CPlusPlus", option_sense);
 case 66:
 YY_RULE_SETUP
 #line 394 "scan.l"
-sf_set_case_ins(!option_sense); markup_option("CaseSensitive", option_sense);
+sf_set_case_ins(!option_sense); markup_option("Caseless", !option_sense);
        YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 395 "scan.l"
-sf_set_case_ins(option_sense); markup_option("CaseInsensitive", option_sense);
+sf_set_case_ins(option_sense); markup_option("Caseless", option_sense);
        YY_BREAK
 case 68:
 YY_RULE_SETUP

diff --git a/src/scan.l b/src/scan.l
index a6ebe72..f8818cc 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -391,8 +391,8 @@ M4QEND      "]""]"
                             bison_bridge_lval = true;
                      }
        "c++"           C_plus_plus = option_sense; markup_option("CPlusPlus", option_sense);
-       caseful|case-sensitive          sf_set_case_ins(!option_sense); markup_option("CaseSensitive", option_sense);
-       caseless|case-insensitive       sf_set_case_ins(option_sense); markup_option("CaseInsensitive", option_sense);
+       caseful|case-sensitive          sf_set_case_ins(!option_sense); markup_option("Caseless", !option_sense);
+       caseless|case-insensitive       sf_set_case_ins(option_sense); markup_option("Caseless", option_sense);
        debug           ddebug = option_sense; markup_option("Debug", option_sense);
        default         spprdflt = ! option_sense; markup_option("Default", option_sense);
        ecs             useecs = option_sense; markup_option("ECS", option_sense);