Return-Path: 
 <dev-return-89391-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 17027 invoked from network); 20 May 2008 23:13:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 20 May 2008 23:13:08 -0000
Received: (qmail 31973 invoked by uid 500); 20 May 2008 23:13:07 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 31904 invoked by uid 500); 20 May 2008 23:13:07 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 31893 invoked by uid 99); 20 May 2008 23:13:07 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 16:13:07 -0700
X-ASF-Spam-Status: No, hits=1.2 required=10.0
	tests=SPF_NEUTRAL
X-Spam-Check-By: apache.org
Received-SPF: neutral (nike.apache.org: local policy)
Received: from [64.97.136.150] (HELO n068.sc1.he.tucows.com) (64.97.136.150)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 23:12:12 +0000
Received: from sc1-out04.emaildefenseservice.com (64.97.139.2) by
 n068.sc1.he.tucows.com (7.2.069.1)
        id 4769316E01539707 for dev@tomcat.apache.org;
 Tue, 20 May 2008 23:12:33 +0000
X-SpamScore: 2
X-Spamcatcher-Summary: 
 2,0,0,8cebb66539ebde45,1a917c3c965d2d21,markt@apache.org,-,RULES_HIT:152:355:379:599:601:854:960:967:973:983:988:989:1187:1208:1260:1261:1277:1311:1313:1314:1345:1358:1359:1431:1434:1437:1515:1516:1518:1534:1541:1593:1594:1676:1711:1730:1747:1766:1792:2393:2525:2534:2553:2559:2564:2682:2685:2857:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3027:3280:3352:3636:3865:3866:3867:3869:3871:3874:3934:3936:3938:3941:3944:3947:3950:5007:6117:6119:6120:7652:7679:
	7875,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not
 bulk,SPF:fu,MSBL:none,DNSBL:none,TSO:0
X-Spamcatcher-Explanation: 
Received: from [192.168.0.100] (unknown [91.109.181.143])
	(Authenticated sender: med.thomas)
	by sc1-out04.emaildefenseservice.com (Postfix) with ESMTP
	for <dev@tomcat.apache.org>; Tue, 20 May 2008 23:12:32 +0000 (UTC)
Message-ID: <48335AD6.30603@apache.org>
Date: Wed, 21 May 2008 00:12:22 +0100
From: Mark Thomas <markt@apache.org>
User-Agent: Thunderbird 2.0.0.14 (Windows/20080421)
MIME-Version: 1.0
To: Tomcat Developers List <dev@tomcat.apache.org>
Subject: Re: svn commit: r658470 [2/2] - in /tomcat/tc6.0.x/trunk: ./
 java/org/apache/el/parser/
 webapps/docs/
References: <20080520223943.7304D2388A2F@eris.apache.org>
 <4833592E.7030109@hanik.com>
In-Reply-To: <4833592E.7030109@hanik.com>
X-Enigmail-Version: 0.95.6
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Checked: Checked by ClamAV on apache.org

Filip Hanik - Dev Lists wrote:
> is this really the diff?
Yep. The joys of using code generation tools.

> basically impossible to tell what changed
The bits that matter are:

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt?rev=658470&r1=658469&r2=658470&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.jjt Tue May 20 
15:39:42 2008
@@ -104,7 +104,7 @@
   */
  void Choice() : {}
  {
-	Or() (<QUESTIONMARK> Or() <COLON> Choice() #Choice(3))*
+	Or() (<QUESTIONMARK> Choice() <COLON> Choice() #Choice(3))*
  }

  /*



Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html?rev=658470&r1=658469&r2=658470&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/parser/ELParser.html Tue May 20 
15:39:42 2008
@@ -51,7 +51,7 @@
  <TR>
  <TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod6">Choice</A></TD>
  <TD ALIGN=CENTER VALIGN=BASELINE>::=</TD>
-<TD ALIGN=LEFT VALIGN=BASELINE><A HREF="#prod7">Or</A> ( 
&lt;QUESTIONMARK&gt; <A HREF="#prod7">Or</A> &lt;COLON&gt; <A 
HREF="#prod6">Choice</A> )*</TD>
+<TD ALIGN=LEFT VALIGN=BASELINE><A HREF="#prod7">Or</A> ( 
&lt;QUESTIONMARK&gt; <A HREF="#prod6">Choice</A> &lt;COLON&gt; <A 
HREF="#prod6">Choice</A> )*</TD>
  </TR>
  <TR>
  <TD ALIGN=RIGHT VALIGN=BASELINE><A NAME="prod7">Or</A></TD>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org