svn commit: r1519485 - /httpd/httpd/trunk/server/util_expr_scan.l

[co...@apache.org]

Author: covener
Date: Mon Sep  2 17:55:28 2013
New Revision: 1519485

URL: http://svn.apache.org/r1519485
Log:
avoid non-continous ranges in EBCDIC in the scanner, important characters like '{' come
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.)


Modified:
    httpd/httpd/trunk/server/util_expr_scan.l

Modified: httpd/httpd/trunk/server/util_expr_scan.l
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_expr_scan.l?rev=1519485&r1=1519484&r2=1519485&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_expr_scan.l (original)
+++ httpd/httpd/trunk/server/util_expr_scan.l Mon Sep  2 17:55:28 2013
@@ -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;
 }