This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cefdcf1520cf46973f6a1ff0c6af1ab238aa91b3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 19 09:56:12 2025 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/el/parser/AstIdentifier.java | 4 +-
java/org/apache/el/parser/AstValue.java | 4 +-
java/org/apache/el/parser/ELParser.java | 57 ++++++++++++++--------
.../org/apache/el/parser/ELParserTokenManager.java | 3 +-
4 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/el/parser/AstIdentifier.java
b/java/org/apache/el/parser/AstIdentifier.java
index 63b6e89e7a..835f32bd86 100644
--- a/java/org/apache/el/parser/AstIdentifier.java
+++ b/java/org/apache/el/parser/AstIdentifier.java
@@ -79,8 +79,8 @@ public final class AstIdentifier extends SimpleNode {
ctx.setPropertyResolved(false);
Object result;
/*
- * Putting the Boolean into the ELContext is part of a performance
optimisation for ImportELResolver.
- * When looking up "foo", the resolver can't differentiate between ${
foo } and ${ foo.bar }. This is important
+ * Putting the Boolean into the ELContext is part of a performance
optimisation for ImportELResolver. When
+ * looking up "foo", the resolver can't differentiate between ${ foo }
and ${ foo.bar }. This is important
* because the expensive class lookup only needs to be performed in
the later case. This flag tells the resolver
* if the lookup can be skipped.
*/
diff --git a/java/org/apache/el/parser/AstValue.java
b/java/org/apache/el/parser/AstValue.java
index 936245a0ae..60f52df1e7 100644
--- a/java/org/apache/el/parser/AstValue.java
+++ b/java/org/apache/el/parser/AstValue.java
@@ -269,8 +269,8 @@ public final class AstValue extends SimpleNode {
int paramCount = types.length;
- if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount >
src.length) || !m.isVarArgs() &&
- (src == null || src.length != paramCount)) {
+ if (m.isVarArgs() && paramCount > 1 && (src == null || paramCount >
src.length) ||
+ !m.isVarArgs() && (src == null || src.length != paramCount)) {
String srcCount = null;
if (src != null) {
srcCount = Integer.toString(src.length);
diff --git a/java/org/apache/el/parser/ELParser.java
b/java/org/apache/el/parser/ELParser.java
index 60e2729a36..97a4919ea9 100644
--- a/java/org/apache/el/parser/ELParser.java
+++ b/java/org/apache/el/parser/ELParser.java
@@ -26,7 +26,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
try {
- label_1: while (true) {
+ label_1:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LITERAL_EXPRESSION:
case START_DYNAMIC_EXPRESSION:
@@ -219,7 +220,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
*/
final public void Semicolon() throws ParseException {
Assignment();
- label_2: while (true) {
+ label_2:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case SEMICOLON: {
;
@@ -292,7 +294,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
case MINUS:
case IDENTIFIER: {
Ternary();
- label_3: while (true) {
+ label_3:
+ while (true) {
if (jj_2_1(2)) {
;
} else {
@@ -434,7 +437,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case IDENTIFIER: {
Identifier();
- label_4: while (true) {
+ label_4:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case COMMA: {
;
@@ -534,7 +538,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
}
}
jj_consume_token(RPAREN);
- label_5: while (true) {
+ label_5:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LPAREN: {
;
@@ -584,7 +589,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
*/
final public void Ternary() throws ParseException {
Or();
- label_6: while (true) {
+ label_6:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case QUESTIONMARK: {
;
@@ -737,7 +743,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
boolean jjtc001 = true;
jjtree.openNodeScope(jjtn001);
try {
- label_7: while (true) {
+ label_7:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case OR0: {
jj_consume_token(OR0);
@@ -815,7 +822,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
boolean jjtc001 = true;
jjtree.openNodeScope(jjtn001);
try {
- label_8: while (true) {
+ label_8:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case AND0: {
jj_consume_token(AND0);
@@ -886,7 +894,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
*/
final public void Equality() throws ParseException {
Compare();
- label_9: while (true) {
+ label_9:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case EQ0:
case EQ1:
@@ -1021,7 +1030,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
*/
final public void Compare() throws ParseException {
Concatenation();
- label_10: while (true) {
+ label_10:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case GT0:
case GT1:
@@ -1269,7 +1279,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
*/
final public void Concatenation() throws ParseException {
Math();
- label_11: while (true) {
+ label_11:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case CONCAT: {
;
@@ -1324,7 +1335,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
*/
final public void Math() throws ParseException {
Multiplication();
- label_12: while (true) {
+ label_12:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case PLUS:
case MINUS: {
@@ -1429,7 +1441,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
*/
final public void Multiplication() throws ParseException {
Unary();
- label_13: while (true) {
+ label_13:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case MULT:
case DIV0:
@@ -1826,7 +1839,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
jjtree.openNodeScope(jjtn001);
try {
ValuePrefix();
- label_14: while (true) {
+ label_14:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case DOT:
case LBRACK: {
@@ -2019,7 +2033,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
case MINUS:
case IDENTIFIER: {
Expression();
- label_15: while (true) {
+ label_15:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case COMMA: {
;
@@ -2148,7 +2163,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
case MINUS:
case IDENTIFIER: {
Expression();
- label_16: while (true) {
+ label_16:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case COMMA: {
;
@@ -2223,7 +2239,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
case MINUS:
case IDENTIFIER: {
Expression();
- label_17: while (true) {
+ label_17:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case COMMA: {
;
@@ -2302,7 +2319,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
case MINUS:
case IDENTIFIER: {
MapEntry();
- label_18: while (true) {
+ label_18:
+ while (true) {
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case COMMA: {
;
@@ -2443,7 +2461,8 @@ public class ELParser/* @bgen(jjtree) */ implements
ELParserTreeConstants, ELPar
} else {
jjtn000.setLocalName(t0.image);
}
- label_19: while (true) {
+ label_19:
+ while (true) {
MethodParameters();
switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
case LPAREN: {
diff --git a/java/org/apache/el/parser/ELParserTokenManager.java
b/java/org/apache/el/parser/ELParserTokenManager.java
index d75d1b2076..5d8aa28395 100644
--- a/java/org/apache/el/parser/ELParserTokenManager.java
+++ b/java/org/apache/el/parser/ELParserTokenManager.java
@@ -2465,7 +2465,8 @@ public class ELParserTokenManager implements
ELParserConstants {
Token matchedToken;
int curPos = 0;
- EOFLoop: for (;;) {
+ EOFLoop:
+ for (;;) {
try {
curChar = input_stream.BeginToken();
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
