Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wrong evaluation of lambda expression #257 #258

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Wrong evaluation of lambda expression #257 #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,621 changes: 2,944 additions & 3,677 deletions impl/src/main/java/com/sun/el/parser/ELParser.java
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions impl/src/main/java/com/sun/el/parser/ELParser.jjt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -113,8 +113,8 @@ void SemiColon() : {}
*/
void Assignment() : {}
{
LOOKAHEAD(3) LambdaExpression() |
Choice() (<ASSIGN> Assignment() #Assign(2) )?
LOOKAHEAD(4) LambdaExpression() | // Do not mistake ((i)) with Lambdaexp check until the arrow
Choice() ( LOOKAHEAD(2) <ASSIGN> Assignment() #Assign(2) )* // avoid failure of expr ${x = 10}
}

/*
Expand Down Expand Up @@ -323,7 +323,7 @@ void LambdaExpressionOrCall() #LambdaExpression : {}
*/
void NonLiteral() : {}
{
LOOKAHEAD(4) LambdaExpressionOrCall()
LOOKAHEAD(5) LambdaExpressionOrCall() // check beyond the arrow
| <LPAREN> Expression() <RPAREN>
| LOOKAHEAD(4) Function()
| Identifier()
Expand Down
325 changes: 193 additions & 132 deletions impl/src/main/java/com/sun/el/parser/ELParserConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, 2024 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -17,141 +17,202 @@
/* Generated By:JJTree&JavaCC: Do not edit this line. ELParserConstants.java */
package com.sun.el.parser;

/**
* Token literal values and constants. Generated by org.javacc.parser.OtherFilesGen#start()

/**
* Token literal values and constants.
* Generated by org.javacc.parser.OtherFilesGen#start()
*/
public interface ELParserConstants {

/** End of File. */
int EOF = 0;
/** RegularExpression Id. */
int LITERAL_EXPRESSION = 1;
/** RegularExpression Id. */
int START_DYNAMIC_EXPRESSION = 2;
/** RegularExpression Id. */
int START_DEFERRED_EXPRESSION = 3;
/** RegularExpression Id. */
int START_MAP = 9;
/** RegularExpression Id. */
int RCURL = 10;
/** RegularExpression Id. */
int INTEGER_LITERAL = 11;
/** RegularExpression Id. */
int FLOATING_POINT_LITERAL = 12;
/** RegularExpression Id. */
int EXPONENT = 13;
/** RegularExpression Id. */
int STRING_LITERAL = 14;
/** RegularExpression Id. */
int BADLY_ESCAPED_STRING_LITERAL = 15;
/** RegularExpression Id. */
int TRUE = 16;
/** RegularExpression Id. */
int FALSE = 17;
/** RegularExpression Id. */
int NULL = 18;
/** RegularExpression Id. */
int DOT = 19;
/** RegularExpression Id. */
int LPAREN = 20;
/** RegularExpression Id. */
int RPAREN = 21;
/** RegularExpression Id. */
int LBRACK = 22;
/** RegularExpression Id. */
int RBRACK = 23;
/** RegularExpression Id. */
int COLON = 24;
/** RegularExpression Id. */
int COMMA = 25;
/** RegularExpression Id. */
int SEMICOLON = 26;
/** RegularExpression Id. */
int GT0 = 27;
/** RegularExpression Id. */
int GT1 = 28;
/** RegularExpression Id. */
int LT0 = 29;
/** RegularExpression Id. */
int LT1 = 30;
/** RegularExpression Id. */
int GE0 = 31;
/** RegularExpression Id. */
int GE1 = 32;
/** RegularExpression Id. */
int LE0 = 33;
/** RegularExpression Id. */
int LE1 = 34;
/** RegularExpression Id. */
int EQ0 = 35;
/** RegularExpression Id. */
int EQ1 = 36;
/** RegularExpression Id. */
int NE0 = 37;
/** RegularExpression Id. */
int NE1 = 38;
/** RegularExpression Id. */
int NOT0 = 39;
/** RegularExpression Id. */
int NOT1 = 40;
/** RegularExpression Id. */
int AND0 = 41;
/** RegularExpression Id. */
int AND1 = 42;
/** RegularExpression Id. */
int OR0 = 43;
/** RegularExpression Id. */
int OR1 = 44;
/** RegularExpression Id. */
int EMPTY = 45;
/** RegularExpression Id. */
int INSTANCEOF = 46;
/** RegularExpression Id. */
int MULT = 47;
/** RegularExpression Id. */
int PLUS = 48;
/** RegularExpression Id. */
int MINUS = 49;
/** RegularExpression Id. */
int QUESTIONMARK = 50;
/** RegularExpression Id. */
int DIV0 = 51;
/** RegularExpression Id. */
int DIV1 = 52;
/** RegularExpression Id. */
int MOD0 = 53;
/** RegularExpression Id. */
int MOD1 = 54;
/** RegularExpression Id. */
int CONCAT = 55;
/** RegularExpression Id. */
int ASSIGN = 56;
/** RegularExpression Id. */
int ARROW = 57;
/** RegularExpression Id. */
int IDENTIFIER = 58;
/** RegularExpression Id. */
int IMPL_OBJ_START = 59;
/** RegularExpression Id. */
int LETTER = 60;
/** RegularExpression Id. */
int DIGIT = 61;
/** RegularExpression Id. */
int ILLEGAL_CHARACTER = 62;
/** End of File. */
int EOF = 0;
/** RegularExpression Id. */
int LITERAL_EXPRESSION = 1;
/** RegularExpression Id. */
int START_DYNAMIC_EXPRESSION = 2;
/** RegularExpression Id. */
int START_DEFERRED_EXPRESSION = 3;
/** RegularExpression Id. */
int START_MAP = 9;
/** RegularExpression Id. */
int RCURL = 10;
/** RegularExpression Id. */
int INTEGER_LITERAL = 11;
/** RegularExpression Id. */
int FLOATING_POINT_LITERAL = 12;
/** RegularExpression Id. */
int EXPONENT = 13;
/** RegularExpression Id. */
int STRING_LITERAL = 14;
/** RegularExpression Id. */
int BADLY_ESCAPED_STRING_LITERAL = 15;
/** RegularExpression Id. */
int TRUE = 16;
/** RegularExpression Id. */
int FALSE = 17;
/** RegularExpression Id. */
int NULL = 18;
/** RegularExpression Id. */
int DOT = 19;
/** RegularExpression Id. */
int LPAREN = 20;
/** RegularExpression Id. */
int RPAREN = 21;
/** RegularExpression Id. */
int LBRACK = 22;
/** RegularExpression Id. */
int RBRACK = 23;
/** RegularExpression Id. */
int COLON = 24;
/** RegularExpression Id. */
int COMMA = 25;
/** RegularExpression Id. */
int SEMICOLON = 26;
/** RegularExpression Id. */
int GT0 = 27;
/** RegularExpression Id. */
int GT1 = 28;
/** RegularExpression Id. */
int LT0 = 29;
/** RegularExpression Id. */
int LT1 = 30;
/** RegularExpression Id. */
int GE0 = 31;
/** RegularExpression Id. */
int GE1 = 32;
/** RegularExpression Id. */
int LE0 = 33;
/** RegularExpression Id. */
int LE1 = 34;
/** RegularExpression Id. */
int EQ0 = 35;
/** RegularExpression Id. */
int EQ1 = 36;
/** RegularExpression Id. */
int NE0 = 37;
/** RegularExpression Id. */
int NE1 = 38;
/** RegularExpression Id. */
int NOT0 = 39;
/** RegularExpression Id. */
int NOT1 = 40;
/** RegularExpression Id. */
int AND0 = 41;
/** RegularExpression Id. */
int AND1 = 42;
/** RegularExpression Id. */
int OR0 = 43;
/** RegularExpression Id. */
int OR1 = 44;
/** RegularExpression Id. */
int EMPTY = 45;
/** RegularExpression Id. */
int INSTANCEOF = 46;
/** RegularExpression Id. */
int MULT = 47;
/** RegularExpression Id. */
int PLUS = 48;
/** RegularExpression Id. */
int MINUS = 49;
/** RegularExpression Id. */
int QUESTIONMARK = 50;
/** RegularExpression Id. */
int DIV0 = 51;
/** RegularExpression Id. */
int DIV1 = 52;
/** RegularExpression Id. */
int MOD0 = 53;
/** RegularExpression Id. */
int MOD1 = 54;
/** RegularExpression Id. */
int CONCAT = 55;
/** RegularExpression Id. */
int ASSIGN = 56;
/** RegularExpression Id. */
int ARROW = 57;
/** RegularExpression Id. */
int IDENTIFIER = 58;
/** RegularExpression Id. */
int IMPL_OBJ_START = 59;
/** RegularExpression Id. */
int LETTER = 60;
/** RegularExpression Id. */
int DIGIT = 61;
/** RegularExpression Id. */
int ILLEGAL_CHARACTER = 62;

/** Lexical state. */
int DEFAULT = 0;
/** Lexical state. */
int IN_EXPRESSION = 1;
/** Lexical state. */
int IN_MAP = 2;
/** Lexical state. */
int DEFAULT = 0;
/** Lexical state. */
int IN_EXPRESSION = 1;
/** Lexical state. */
int IN_MAP = 2;

/** Literal token values. */
String[] tokenImage = { "<EOF>", "<LITERAL_EXPRESSION>", "\"${\"", "\"#{\"", "\"\\\\\"", "\" \"", "\"\\t\"", "\"\\n\"", "\"\\r\"", "\"{\"", "\"}\"",
"<INTEGER_LITERAL>", "<FLOATING_POINT_LITERAL>", "<EXPONENT>", "<STRING_LITERAL>", "<BADLY_ESCAPED_STRING_LITERAL>", "\"true\"", "\"false\"",
"\"null\"", "\".\"", "\"(\"", "\")\"", "\"[\"", "\"]\"", "\":\"", "\",\"", "\";\"", "\">\"", "\"gt\"", "\"<\"", "\"lt\"", "\">=\"", "\"ge\"",
"\"<=\"", "\"le\"", "\"==\"", "\"eq\"", "\"!=\"", "\"ne\"", "\"!\"", "\"not\"", "\"&&\"", "\"and\"", "\"||\"", "\"or\"", "\"empty\"",
"\"instanceof\"", "\"*\"", "\"+\"", "\"-\"", "\"?\"", "\"/\"", "\"div\"", "\"%\"", "\"mod\"", "\"+=\"", "\"=\"", "\"->\"", "<IDENTIFIER>", "\"#\"",
"<LETTER>", "<DIGIT>", "<ILLEGAL_CHARACTER>", };
/** Literal token values. */
String[] tokenImage = {
"<EOF>",
"<LITERAL_EXPRESSION>",
"\"${\"",
"\"#{\"",
"\"\\\\\"",
"\" \"",
"\"\\t\"",
"\"\\n\"",
"\"\\r\"",
"\"{\"",
"\"}\"",
"<INTEGER_LITERAL>",
"<FLOATING_POINT_LITERAL>",
"<EXPONENT>",
"<STRING_LITERAL>",
"<BADLY_ESCAPED_STRING_LITERAL>",
"\"true\"",
"\"false\"",
"\"null\"",
"\".\"",
"\"(\"",
"\")\"",
"\"[\"",
"\"]\"",
"\":\"",
"\",\"",
"\";\"",
"\">\"",
"\"gt\"",
"\"<\"",
"\"lt\"",
"\">=\"",
"\"ge\"",
"\"<=\"",
"\"le\"",
"\"==\"",
"\"eq\"",
"\"!=\"",
"\"ne\"",
"\"!\"",
"\"not\"",
"\"&&\"",
"\"and\"",
"\"||\"",
"\"or\"",
"\"empty\"",
"\"instanceof\"",
"\"*\"",
"\"+\"",
"\"-\"",
"\"?\"",
"\"/\"",
"\"div\"",
"\"%\"",
"\"mod\"",
"\"+=\"",
"\"=\"",
"\"->\"",
"<IDENTIFIER>",
"\"#\"",
"<LETTER>",
"<DIGIT>",
"<ILLEGAL_CHARACTER>",
};

}
Loading