avoid non-continous ranges in EBCDIC in the scanner, important characters like '...

between alphas in IBM1047.

(If you're reading this because you're building 2.4-or-later on z/OS, you'll have to build a new flex
with the system flex and system bison. flex-2.5.35 worked.)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1519485 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/util_expr_scan.l b/server/util_expr_scan.l
index c75b3744d849446b0fef8638dcdeeb5efa126b53..a4c840e830d87c36a8ecdba66aa6474e6ad24cb9 100644 (file)
--- a/server/util_expr_scan.l
+++ b/server/util_expr_scan.l
@@ -251,7 +251,7 @@
  /*
   * fixed name variable expansion %{XXX} and function call in %{func:arg} syntax
   */
-<var>[a-zA-Z][a-zA-Z0-9_]* {
+<var>[a-ij-rs-zA-IJ-RS-Z][a-ij-rs-zA-IJ-RS-Z0-9_]* {
     yylval->cpVal = apr_pstrdup(yyextra->pool, yytext);
     return T_ID;
 }
@@ -363,12 +363,12 @@
 "eq"  { return T_OP_EQ; }
 "in"  { return T_OP_IN; }
 
-"-"[a-zA-Z_] {
+"-"[a-ij-rs-zA-IJ-RS-Z_] {
     yylval->cpVal = apr_pstrdup(yyextra->pool, yytext + 1);
     return T_OP_UNARY;
 }
 
-"-"[a-zA-Z_][a-zA-Z_0-9]+ {
+"-"[a-ij-rs-zA-IJ-RS-Z_][a-ij-rs-zA-IJ-RS-Z_0-9]+ {
     yylval->cpVal = apr_pstrdup(yyextra->pool, yytext + 1);
     return T_OP_BINARY;
 }
@@ -390,7 +390,7 @@
  /*
   * Identifiers
   */
-[a-zA-Z][a-zA-Z0-9_]* {
+[a-ij-rs-zA-IJ-RS-Z][a-ij-rs-zA-IJ-RS-Z0-9_]* {
     yylval->cpVal = apr_pstrdup(yyextra->pool, yytext);
     return T_ID;
 }