jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sh...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser ELParser.java ELParserConstants.java ELParserTokenManager.java
Date Tue, 05 Mar 2002 21:14:30 GMT
shawn       02/03/05 13:14:29

  Modified:    standard/src/org/apache/taglibs/standard/lang/jstl
                        ApplicationScope.java ArraySuffix.java
                        Attributes.java Coercions.java ELParser.jj
                        Logger.java UnaryMinusOperator.java
               standard/src/org/apache/taglibs/standard/lang/jstl/parser
                        ELParser.java ELParserConstants.java
                        ELParserTokenManager.java
  Log:
  EL update.
  Submitted by: Nathan Abramson (ATG)
  
  Revision  Changes    Path
  1.2       +1 -1      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ApplicationScope.java
  
  Index: ApplicationScope.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ApplicationScope.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationScope.java	5 Mar 2002 14:10:43 -0000	1.1
  +++ ApplicationScope.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -83,7 +83,7 @@
      **/
     public String getScopeString ()
     {
  -    return "app";
  +    return "application";
     }
   
     //-------------------------------------
  
  
  
  1.2       +2 -2      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java
  
  Index: ArraySuffix.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ArraySuffix.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ArraySuffix.java	5 Mar 2002 14:10:43 -0000	1.1
  +++ ArraySuffix.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -71,9 +71,9 @@
    * <ul><pre>
    * Evaluating a[b] (assuming a.b == a["b"])
    *   a is null
  - *     warning - return null
  + *     return null
    *   b is null
  - *     warning - return null
  + *     return null
    *   a is Map
    *     !a.containsKey (b)
    *       return null
  
  
  
  1.2       +5 -5      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/Attributes.java
  
  Index: Attributes.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/Attributes.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Attributes.java	5 Mar 2002 14:10:43 -0000	1.1
  +++ Attributes.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -78,7 +78,7 @@
     Map mPage;
     Map mRequest;
     Map mSession;
  -  Map mApp;
  +  Map mApplication;
   
     //-------------------------------------
     /**
  @@ -134,12 +134,12 @@
      *
      * Returns the map of application-scoped attributes
      **/
  -  public Map getApp ()
  +  public Map getApplication ()
     {
  -    if (mApp == null) {
  -      mApp = ImplicitObjects.getApplicationScopeMap (mContext);
  +    if (mApplication == null) {
  +      mApplication = ImplicitObjects.getApplicationScopeMap (mContext);
       }
  -    return mApp;
  +    return mApplication;
     }
   
     //-------------------------------------
  
  
  
  1.2       +44 -38    jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/Coercions.java
  
  Index: Coercions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/Coercions.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Coercions.java	5 Mar 2002 14:10:43 -0000	1.1
  +++ Coercions.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -70,7 +70,7 @@
    * Applying arithmetic operator
    *   Binary operator - A {+,-,*} B
    *     if A and B are null
  - *       warning - return 0
  + *       return 0
    *     if A or B is Float or Double
    *       coerce both A and B to Double
    *       apply operator
  @@ -83,7 +83,7 @@
    * 
    *   Binary operator - A {/,div} B
    *     if A and B are null
  - *       warning - return 0
  + *       return 0
    *     otherwise
    *       coerce both A and B to Double
    *       apply operator
  @@ -91,7 +91,7 @@
    * 
    *   Binary operator - A {%,mod} B
    *     if A and B are null
  - *       warning - return 0
  + *       return 0
    *     if A or B is Float or Double
    *       coerce both to Double
    *       apply operator
  @@ -102,7 +102,9 @@
    * 
    *   Unary minus operator - -A
    *     if A is null
  - *      return 0
  + *       return 0
  + *     if A is String
  + *       coerce to Double, apply operator
    *     if A is Byte,Short,Integer,Long,Float,Double
    *       retain type, apply operator
    *     if operator results in exception, error
  @@ -180,7 +182,7 @@
    *       return A.toString
    * 
    *   coerce A to primitive Number type N
  - *     A is null
  + *     A is null or ""
    *       return 0
    *     A is Character
    *       convert to short, apply following rules
  @@ -200,7 +202,7 @@
    *       error
    * 
    *   coerce A to Character should be
  - *     A is null
  + *     A is null or ""
    *       return (char) 0
    *     A is Character
    *       return A
  @@ -211,15 +213,12 @@
    *     A is Number with greater precision than short
    *       coerce quietly - return (char) A
    *     A is String
  - *       A.length () > 0
  - *         return A.charAt (0)
  - *       otherwise
  - *         error
  + *       return A.charAt (0)
    *     otherwise
    *       error
    * 
    *   coerce A to Boolean
  - *     A is null
  + *     A is null or ""
    *       return false
    *     A is Boolean
    *       return A
  @@ -237,9 +236,11 @@
    *       coerce quietly
    *     A is String
    *       T has no PropertyEditor
  - *         error
  + *         if A is "", return null
  + *         otherwise error
    *       T's PropertyEditor throws exception
  - *         error
  + *         if A is "", return null
  + *         otherwise error
    *       otherwise
    *         apply T's PropertyEditor
    *     otherwise
  @@ -344,7 +345,8 @@
   						Logger pLogger)
       throws ELException
     {
  -    if (pValue == null) {
  +    if (pValue == null ||
  +	"".equals (pValue)) {
         return coerceToPrimitiveNumber (0, pClass);
       }
       else if (pValue instanceof Character) {
  @@ -584,7 +586,8 @@
   					     Logger pLogger)
       throws ELException
     {
  -    if (pValue == null) {
  +    if (pValue == null ||
  +	"".equals (pValue)) {
         return PrimitiveObjects.getCharacter ((char) 0);
       }
       else if (pValue instanceof Character) {
  @@ -602,15 +605,7 @@
       }
       else if (pValue instanceof String) {
         String str = (String) pValue;
  -      if (str.length () > 0) {
  -	return PrimitiveObjects.getCharacter (str.charAt (0));
  -      }
  -      else {
  -	if (pLogger.isLoggingError ()) {
  -	  pLogger.logError (Constants.EMPTY_STRING_TO_CHARACTER);
  -	}
  -	return PrimitiveObjects.getCharacter ((char) 0);
  -      }
  +      return PrimitiveObjects.getCharacter (str.charAt (0));
       }
       else {
         if (pLogger.isLoggingError ()) {
  @@ -631,7 +626,8 @@
   					 Logger pLogger)
       throws ELException
     {
  -    if (pValue == null) {
  +    if (pValue == null ||
  +	"".equals (pValue)) {
         return Boolean.FALSE;
       }
       else if (pValue instanceof Boolean) {
  @@ -683,27 +679,37 @@
         String str = (String) pValue;
         PropertyEditor pe = PropertyEditorManager.findEditor (pClass);
         if (pe == null) {
  -	if (pLogger.isLoggingError ()) {
  -	  pLogger.logError
  -	    (Constants.NO_PROPERTY_EDITOR,
  -	     str,
  -	     pClass.getName ());
  +	if ("".equals (str)) {
  +	  return null;
  +	}
  +	else {
  +	  if (pLogger.isLoggingError ()) {
  +	    pLogger.logError
  +	      (Constants.NO_PROPERTY_EDITOR,
  +	       str,
  +	       pClass.getName ());
  +	  }
  +	  return null;
   	}
  -	return null;
         }
         try {
   	pe.setAsText (str);
   	return pe.getValue ();
         }
         catch (IllegalArgumentException exc) {
  -	if (pLogger.isLoggingError ()) {
  -	  pLogger.logError
  -	    (Constants.PROPERTY_EDITOR_ERROR,
  -	     exc,
  -	     pValue,
  -	     pClass.getName ());
  +	if ("".equals (str)) {
  +	  return null;
  +	}
  +	else {
  +	  if (pLogger.isLoggingError ()) {
  +	    pLogger.logError
  +	      (Constants.PROPERTY_EDITOR_ERROR,
  +	       exc,
  +	       pValue,
  +	       pClass.getName ());
  +	  }
  +	  return null;
   	}
  -	return null;
         }
       }
       else {
  
  
  
  1.2       +5 -5      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ELParser.jj
  
  Index: ELParser.jj
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/ELParser.jj,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ELParser.jj	5 Mar 2002 14:10:43 -0000	1.1
  +++ ELParser.jj	5 Mar 2002 21:14:29 -0000	1.2
  @@ -93,8 +93,8 @@
   | < GT: ">" | "gt" >
   | < LT: "<" | "lt" >
   | < EQ: "==" >
  -| < LE: "<=" | "lte" >
  -| < GE: ">=" | "gte" >
  +| < LE: "<=" | "le" >
  +| < GE: ">=" | "ge" >
   | < NE: "!=" >
   | < LPAREN: "(" >
   | < RPAREN: ")" >
  @@ -112,7 +112,7 @@
   | < PAGE: "page" >
   | < REQUEST: "request" >
   | < SESSION: "session" >
  -| < APP: "app" >
  +| < APPLICATION: "application" >
   | < HEADER: "header" >
   | < PARAM: "param" >
   | < PARAMVALUES: "paramvalues" >
  @@ -603,7 +603,7 @@
     <PAGE> { return PageScope.SINGLETON; }
     | <REQUEST> { return RequestScope.SINGLETON; }
     | <SESSION> { return SessionScope.SINGLETON; }
  -  | <APP> { return ApplicationScope.SINGLETON; }
  +  | <APPLICATION> { return ApplicationScope.SINGLETON; }
     | <HEADER> { return HeaderScope.SINGLETON; }
     | <PARAM> { return ParamScope.SINGLETON; }
     | <PARAMVALUES> { return ParamvaluesScope.SINGLETON; }
  @@ -732,7 +732,7 @@
      | t = <PAGE>
      | t = <REQUEST>
      | t = <SESSION>
  -   | t = <APP>
  +   | t = <APPLICATION>
      | t = <HEADER>
      | t = <PARAM>
      | t = <PARAMVALUES>
  
  
  
  1.2       +1 -1      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/Logger.java
  
  Index: Logger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/Logger.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Logger.java	5 Mar 2002 14:10:43 -0000	1.1
  +++ Logger.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -101,7 +101,7 @@
      **/
     public boolean isLoggingWarning ()
     {
  -    return true;
  +    return false;
     }
   
     //-------------------------------------
  
  
  
  1.2       +9 -0      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java
  
  Index: UnaryMinusOperator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/UnaryMinusOperator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnaryMinusOperator.java	5 Mar 2002 14:10:43 -0000	1.1
  +++ UnaryMinusOperator.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -118,6 +118,15 @@
         return PrimitiveObjects.getInteger (0);
       }
   
  +    else if (pValue instanceof String) {
  +      double dval =
  +	((Number) 
  +	 (Coercions.coerceToPrimitiveNumber 
  +	  (pValue, Double.class, pLogger))).
  +	doubleValue ();
  +      return PrimitiveObjects.getDouble (-dval);
  +    }
  +
       else if (pValue instanceof Byte) {
         return PrimitiveObjects.getByte 
   	((byte) -(((Byte) pValue).byteValue ()));
  
  
  
  1.2       +8 -8      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java
  
  Index: ELParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ELParser.java	5 Mar 2002 14:10:45 -0000	1.1
  +++ ELParser.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -503,7 +503,7 @@
       case PAGE:
       case REQUEST:
       case SESSION:
  -    case APP:
  +    case APPLICATION:
       case HEADER:
       case PARAM:
       case PARAMVALUES:
  @@ -553,9 +553,9 @@
         jj_consume_token(SESSION);
                   {if (true) return SessionScope.SINGLETON;}
         break;
  -    case APP:
  -      jj_consume_token(APP);
  -            {if (true) return ApplicationScope.SINGLETON;}
  +    case APPLICATION:
  +      jj_consume_token(APPLICATION);
  +                    {if (true) return ApplicationScope.SINGLETON;}
         break;
       case HEADER:
         jj_consume_token(HEADER);
  @@ -603,7 +603,7 @@
       case PAGE:
       case REQUEST:
       case SESSION:
  -    case APP:
  +    case APPLICATION:
       case HEADER:
       case PARAM:
       case PARAMVALUES:
  @@ -720,8 +720,8 @@
       case SESSION:
         t = jj_consume_token(SESSION);
         break;
  -    case APP:
  -      t = jj_consume_token(APP);
  +    case APPLICATION:
  +      t = jj_consume_token(APPLICATION);
         break;
       case HEADER:
         t = jj_consume_token(HEADER);
  @@ -775,7 +775,7 @@
     }
   
     final private boolean jj_3R_14() {
  -    if (jj_scan_token(APP)) return true;
  +    if (jj_scan_token(APPLICATION)) return true;
       if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
       return false;
     }
  
  
  
  1.2       +2 -2      jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java
  
  Index: ELParserConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParserConstants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ELParserConstants.java	5 Mar 2002 14:10:45 -0000	1.1
  +++ ELParserConstants.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -37,7 +37,7 @@
     int PAGE = 35;
     int REQUEST = 36;
     int SESSION = 37;
  -  int APP = 38;
  +  int APPLICATION = 38;
     int HEADER = 39;
     int PARAM = 40;
     int PARAMVALUES = 41;
  @@ -88,7 +88,7 @@
       "\"page\"",
       "\"request\"",
       "\"session\"",
  -    "\"app\"",
  +    "\"application\"",
       "\"header\"",
       "\"param\"",
       "\"paramvalues\"",
  
  
  
  1.2       +36 -33    jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java
  
  Index: ELParserTokenManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/lang/jstl/parser/ELParserTokenManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ELParserTokenManager.java	5 Mar 2002 14:10:45 -0000	1.1
  +++ ELParserTokenManager.java	5 Mar 2002 21:14:29 -0000	1.2
  @@ -236,17 +236,17 @@
               return 30;
            return -1;
         case 2:
  -         if ((active0 & 0x3b800003800L) != 0L)
  +         if ((active0 & 0x3f800003800L) != 0L)
            {
               jjmatchedKind = 42;
               jjmatchedPos = 2;
               return 30;
            }
  -         if ((active0 & 0x4300000000L) != 0L)
  +         if ((active0 & 0x300000000L) != 0L)
               return 30;
            return -1;
         case 3:
  -         if ((active0 & 0x3b000001000L) != 0L)
  +         if ((active0 & 0x3f000001000L) != 0L)
            {
               jjmatchedKind = 42;
               jjmatchedPos = 3;
  @@ -258,7 +258,7 @@
         case 4:
            if ((active0 & 0x30000001000L) != 0L)
               return 30;
  -         if ((active0 & 0xb000000000L) != 0L)
  +         if ((active0 & 0xf000000000L) != 0L)
            {
               if (jjmatchedPos != 4)
               {
  @@ -269,7 +269,7 @@
            }
            return -1;
         case 5:
  -         if ((active0 & 0x23000000000L) != 0L)
  +         if ((active0 & 0x27000000000L) != 0L)
            {
               jjmatchedKind = 42;
               jjmatchedPos = 5;
  @@ -279,7 +279,7 @@
               return 30;
            return -1;
         case 6:
  -         if ((active0 & 0x20000000000L) != 0L)
  +         if ((active0 & 0x24000000000L) != 0L)
            {
               jjmatchedKind = 42;
               jjmatchedPos = 6;
  @@ -289,7 +289,7 @@
               return 30;
            return -1;
         case 7:
  -         if ((active0 & 0x20000000000L) != 0L)
  +         if ((active0 & 0x24000000000L) != 0L)
            {
               jjmatchedKind = 42;
               jjmatchedPos = 7;
  @@ -297,7 +297,7 @@
            }
            return -1;
         case 8:
  -         if ((active0 & 0x20000000000L) != 0L)
  +         if ((active0 & 0x24000000000L) != 0L)
            {
               jjmatchedKind = 42;
               jjmatchedPos = 8;
  @@ -305,7 +305,7 @@
            }
            return -1;
         case 9:
  -         if ((active0 & 0x20000000000L) != 0L)
  +         if ((active0 & 0x24000000000L) != 0L)
            {
               jjmatchedKind = 42;
               jjmatchedPos = 9;
  @@ -436,9 +436,7 @@
         case 108:
            return jjMoveStringLiteralDfa3_1(active0, 0x3000L);
         case 112:
  -         if ((active0 & 0x4000000000L) != 0L)
  -            return jjStartNfaWithStates_1(2, 38, 30);
  -         break;
  +         return jjMoveStringLiteralDfa3_1(active0, 0x4000000000L);
         case 113:
            return jjMoveStringLiteralDfa3_1(active0, 0x1000000000L);
         case 114:
  @@ -480,7 +478,7 @@
         case 108:
            if ((active0 & 0x2000L) != 0L)
               return jjStartNfaWithStates_1(3, 13, 30);
  -         break;
  +         return jjMoveStringLiteralDfa4_1(active0, 0x4000000000L);
         case 115:
            return jjMoveStringLiteralDfa4_1(active0, 0x2000001000L);
         case 117:
  @@ -506,7 +504,7 @@
               return jjStartNfaWithStates_1(4, 12, 30);
            return jjMoveStringLiteralDfa5_1(active0, 0x9000000000L);
         case 105:
  -         return jjMoveStringLiteralDfa5_1(active0, 0x2000000000L);
  +         return jjMoveStringLiteralDfa5_1(active0, 0x6000000000L);
         case 109:
            if ((active0 & 0x10000000000L) != 0L)
            {
  @@ -530,6 +528,8 @@
      }
      switch(curChar)
      {
  +      case 99:
  +         return jjMoveStringLiteralDfa6_1(active0, 0x4000000000L);
         case 111:
            return jjMoveStringLiteralDfa6_1(active0, 0x2000000000L);
         case 114:
  @@ -557,7 +557,7 @@
      switch(curChar)
      {
         case 97:
  -         return jjMoveStringLiteralDfa7_1(active0, 0x20000000000L);
  +         return jjMoveStringLiteralDfa7_1(active0, 0x24000000000L);
         case 110:
            if ((active0 & 0x2000000000L) != 0L)
               return jjStartNfaWithStates_1(6, 37, 30);
  @@ -584,6 +584,8 @@
      {
         case 108:
            return jjMoveStringLiteralDfa8_1(active0, 0x20000000000L);
  +      case 116:
  +         return jjMoveStringLiteralDfa8_1(active0, 0x4000000000L);
         default :
            break;
      }
  @@ -600,6 +602,8 @@
      }
      switch(curChar)
      {
  +      case 105:
  +         return jjMoveStringLiteralDfa9_1(active0, 0x4000000000L);
         case 117:
            return jjMoveStringLiteralDfa9_1(active0, 0x20000000000L);
         default :
  @@ -620,6 +624,8 @@
      {
         case 101:
            return jjMoveStringLiteralDfa10_1(active0, 0x20000000000L);
  +      case 111:
  +         return jjMoveStringLiteralDfa10_1(active0, 0x4000000000L);
         default :
            break;
      }
  @@ -636,6 +642,10 @@
      }
      switch(curChar)
      {
  +      case 110:
  +         if ((active0 & 0x4000000000L) != 0L)
  +            return jjStartNfaWithStates_1(10, 38, 30);
  +         break;
         case 115:
            if ((active0 & 0x20000000000L) != 0L)
               return jjStartNfaWithStates_1(10, 41, 30);
  @@ -667,7 +677,7 @@
   {
      int[] nextStates;
      int startsAt = 0;
  -   jjnewStateCnt = 51;
  +   jjnewStateCnt = 49;
      int i = 1;
      jjstateSet[0] = startState;
      int j, kind = 0x7fffffff;
  @@ -982,25 +992,17 @@
                        kind = 21;
                     break;
                  case 46:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 45;
  -                  break;
  -               case 47:
                     if (curChar == 108)
                        jjAddStates(11, 12);
                     break;
  -               case 48:
  +               case 47:
                     if (curChar == 116 && kind > 18)
                        kind = 18;
                     break;
  -               case 49:
  +               case 48:
                     if (curChar == 101 && kind > 20)
                        kind = 20;
                     break;
  -               case 50:
  -                  if (curChar == 116)
  -                     jjstateSet[jjnewStateCnt++] = 49;
  -                  break;
                  default : break;
               }
            } while(i != startsAt);
  @@ -1043,14 +1045,14 @@
            kind = 0x7fffffff;
         }
         ++curPos;
  -      if ((i = jjnewStateCnt) == (startsAt = 51 - (jjnewStateCnt = startsAt)))
  +      if ((i = jjnewStateCnt) == (startsAt = 49 - (jjnewStateCnt = startsAt)))
            return curPos;
         try { curChar = input_stream.readChar(); }
         catch(java.io.IOException e) { return curPos; }
      }
   }
   static final int[] jjnextStates = {
  -   32, 33, 34, 39, 40, 11, 12, 14, 6, 7, 9, 48, 50, 44, 46, 3, 
  +   32, 33, 34, 39, 40, 11, 12, 14, 6, 7, 9, 47, 48, 44, 45, 3, 
      4, 37, 38, 41, 42, 
   };
   private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
  @@ -1090,8 +1092,9 @@
   "\164\162\165\145", "\146\141\154\163\145", "\156\165\154\154", "\175", "\72", "\56", null,
null, 
   "\75\75", null, null, "\41\75", "\50", "\51", "\133", "\135", "\53", "\55", "\52", null,

   null, "\156\157\164", "\141\156\144", "\157\162", "\160\141\147\145", 
  -"\162\145\161\165\145\163\164", "\163\145\163\163\151\157\156", "\141\160\160", "\150\145\141\144\145\162",

  -"\160\141\162\141\155", "\160\141\162\141\155\166\141\154\165\145\163", null, null, null,
null, };
  +"\162\145\161\165\145\163\164", "\163\145\163\163\151\157\156", 
  +"\141\160\160\154\151\143\141\164\151\157\156", "\150\145\141\144\145\162", "\160\141\162\141\155",

  +"\160\141\162\141\155\166\141\154\165\145\163", null, null, null, null, };
   public static final String[] lexStateNames = {
      "DEFAULT", 
      "IN_EXPRESSION", 
  @@ -1107,8 +1110,8 @@
      0x78L, 
   };
   private JavaCharStream input_stream;
  -private final int[] jjrounds = new int[51];
  -private final int[] jjstateSet = new int[102];
  +private final int[] jjrounds = new int[49];
  +private final int[] jjstateSet = new int[98];
   protected char curChar;
   public ELParserTokenManager(JavaCharStream stream)
   {
  @@ -1132,7 +1135,7 @@
   {
      int i;
      jjround = 0x80000001;
  -   for (i = 51; i-- > 0;)
  +   for (i = 49; i-- > 0;)
         jjrounds[i] = 0x80000000;
   }
   public void ReInit(JavaCharStream stream, int lexState)
  
  
  

--
To unsubscribe, e-mail:   <mailto:taglibs-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:taglibs-dev-help@jakarta.apache.org>


Mime
View raw message