Skip to content

[7.x.x] report the first wrong let variable type #247

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

Open
Laurettta wants to merge 1 commit into
base: develop-7.x.x
Choose a base branch
from
Open

[7.x.x] report the first wrong let variable type #247

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
3 changes: 1 addition & 2 deletions exist-core/src/main/java/org/exist/xquery/LetExpr.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ public Sequence eval(Sequence contextSequence, Item contextItem)
var.setContextDocs(inputSequence.getContextDocSet());
registerUpdateListener(in);

resultSequence = returnExpr.eval(contextSequence, null);

if (sequenceType != null) {
Cardinality actualCardinality;
if (var.getValue().isEmpty()) {actualCardinality = Cardinality.EMPTY_SEQUENCE;}
Expand Down Expand Up @@ -166,6 +164,7 @@ public Sequence eval(Sequence contextSequence, Item contextItem)
}
}
}
resultSequence = returnExpr.eval(contextSequence, null);
} finally {
// Restore the local variable stack
context.popLocalVariables(mark, resultSequence);
Expand Down
25 changes: 25 additions & 0 deletions exist-core/src/test/java/org/exist/xquery/XQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2233,6 +2233,31 @@ public void noErrorNeOperatorWithSequence_1740883() {
}
}

@Test
public void letTypeErrorReportedOnFirstVariable () throws XMLDBException {
try{
final String query = "let $input as xs:string := () " +
"let $output as xs:string := $input " +
"return $output";

try (final Collection testCollection = getTestCollection()) {
final XPathQueryService service = testCollection.getService(XPathQueryService.class);

try(final EXistResourceSet result = (EXistResourceSet) service.query(query)) {
// needed to ensure that result is closed

}

fail("Expected XPTY0004 error for $input");
}
} catch (XMLDBException e) {
if (!e.getMessage().contains("$input")) {
LOG.error(e.getMessage(), e);
fail(e.getMessage());
}
}
}

/**
* <a href="http://sourceforge.net/support/tracker.php?aid=1740885">http://sourceforge.net/support/tracker.php?aid=1740885</a>
*/
Expand Down
Loading