Skip to content

Commit 0c650d3

Browse files
adamretteradamretter
committed
[ignore] Code cleanup
1 parent 11eefe8 commit 0c650d3

2 files changed

Lines changed: 67 additions & 43 deletions

File tree

‎exist-core/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,6 +1215,7 @@
12151215
<include>src/test/java/org/exist/xquery/ForwardReferenceTest.java</include>
12161216
<include>src/main/java/org/exist/xquery/Function.java</include>
12171217
<include>src/main/java/org/exist/xquery/FunctionFactory.java</include>
1218+
<include>src/main/java/org/exist/xquery/InlineFunction.java</include>
12181219
<include>src/main/java/org/exist/xquery/Intersect.java</include>
12191220
<include>src/test/java/org/exist/xquery/LexerTest.java</include>
12201221
<include>src/main/java/org/exist/xquery/LocationStep.java</include>
@@ -2014,6 +2015,7 @@
20142015
<exclude>src/test/resources-filtered/org/exist/xquery/import-from-pkg-test.conf.xml</exclude>
20152016
<exclude>src/test/java/org/exist/xquery/ImportFromPkgTest.java</exclude>
20162017
<exclude>src/test/java/org/exist/xquery/ImportModuleTest.java</exclude>
2018+
<exclude>src/main/java/org/exist/xquery/InlineFunction.java</exclude>
20172019
<exclude>src/main/java/org/exist/xquery/Intersect.java</exclude>
20182020
<exclude>src/main/java/org/exist/xquery/JavaBinding.java</exclude>
20192021
<exclude>src/test/resources-filtered/org/exist/xquery/JavaBindingTest.conf.xml</exclude>

‎exist-core/src/main/java/org/exist/xquery/InlineFunction.java‎

Lines changed: 65 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
* admin@evolvedbinary.com
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*
@@ -33,67 +57,65 @@
3357

3458
/**
3559
* An XQuery 3.0 inline function expression.
36-
*
37-
* @author wolf
3860
*
61+
* @author wolf
3962
*/
4063
public class InlineFunction extends AbstractExpression {
4164

42-
public final static QName INLINE_FUNCTION_QNAME = QName.EMPTY_QNAME;
43-
44-
private UserDefinedFunction function;
45-
private ArrayDeque<FunctionCall> calls = new ArrayDeque<>();
46-
47-
private AnalyzeContextInfo cachedContextInfo;
65+
public static final QName INLINE_FUNCTION_QNAME = QName.EMPTY_QNAME;
66+
67+
private final UserDefinedFunction function;
68+
private final ArrayDeque<FunctionCall> calls = new ArrayDeque<>();
4869

49-
public InlineFunction(XQueryContext context, UserDefinedFunction function) {
50-
super(context);
51-
this.function = function;
52-
}
70+
private AnalyzeContextInfo cachedContextInfo;
5371

54-
@Override
55-
public void analyze(AnalyzeContextInfo contextInfo) throws XPathException {
72+
public InlineFunction(final XQueryContext context, final UserDefinedFunction function) {
73+
super(context);
74+
this.function = function;
75+
}
5676

77+
@Override
78+
public void analyze(final AnalyzeContextInfo contextInfo) throws XPathException {
5779
cachedContextInfo = new AnalyzeContextInfo(contextInfo);
5880
cachedContextInfo.addFlag(SINGLE_STEP_EXECUTION);
5981
cachedContextInfo.setParent(this);
60-
}
82+
}
6183

62-
@Override
63-
public void dump(ExpressionDumper dumper) {
64-
dumper.display("function");
65-
function.dump(dumper);
66-
}
84+
@Override
85+
public void dump(final ExpressionDumper dumper) {
86+
dumper.display("function");
87+
function.dump(dumper);
88+
}
89+
90+
/**
91+
* Wraps a function call around the function and returns a
92+
* reference to it. Make sure local variables in the context
93+
* are visible.
94+
*/
95+
@Override
96+
public Sequence eval(final Sequence contextSequence, final Item contextItem) throws XPathException {
97+
// local variable context is known within inline function
98+
final List<ClosureVariable> closureVars = context.getLocalStack();
6799

68-
/**
69-
* Wraps a function call around the function and returns a
70-
* reference to it. Make sure local variables in the context
71-
* are visible.
72-
*/
73-
public Sequence eval(Sequence contextSequence, Item contextItem)
74-
throws XPathException {
75-
// local variable context is known within inline function
76-
final List<ClosureVariable> closureVars = context.getLocalStack();
77-
78-
final FunctionCall call = new FunctionCall(context, function);
79-
call.getFunction().setClosureVariables(closureVars);
80-
call.setLocation(function.getLine(), function.getColumn());
81-
call.analyze(new AnalyzeContextInfo(cachedContextInfo));
100+
final FunctionCall call = new FunctionCall(context, function);
101+
call.getFunction().setClosureVariables(closureVars);
102+
call.setLocation(function.getLine(), function.getColumn());
103+
call.analyze(new AnalyzeContextInfo(cachedContextInfo));
82104

83-
// push the created function call to the stack so we can clear
105+
// push the created function call to the stack so we can clear
84106
// it after execution
85-
calls.push(call);
107+
calls.push(call);
86108

87-
return new FunctionReference(this, call);
88-
}
109+
return new FunctionReference(this, call);
110+
}
89111

90-
@Override
91-
public int returnsType() {
92-
return Type.FUNCTION;
93-
}
112+
@Override
113+
public int returnsType() {
114+
return Type.FUNCTION;
115+
}
94116

95117
@Override
96-
public void resetState(boolean postOptimization) {
118+
public void resetState(final boolean postOptimization) {
97119
super.resetState(postOptimization);
98120
calls.clear();
99121
function.resetState(postOptimization);

0 commit comments

Comments
 (0)