Fix bug 4645

orbeon · Jul 24, 2020 · a35007d · a35007d
1 parent 561f17c
commit a35007d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/latest10/hej/net/sf/saxon/expr/HomogeneityChecker.java b/latest10/hej/net/sf/saxon/expr/HomogeneityChecker.java
@@ -7,13 +7,15 @@
 
 package net.sf.saxon.expr;
 
+import net.sf.saxon.Configuration;
 import net.sf.saxon.expr.parser.ContextItemStaticInfo;
 import net.sf.saxon.expr.parser.ExpressionTool;
 import net.sf.saxon.expr.parser.ExpressionVisitor;
 import net.sf.saxon.expr.parser.RebindingMap;
 import net.sf.saxon.expr.sort.DocumentSorter;
 import net.sf.saxon.om.SequenceIterator;
 import net.sf.saxon.pattern.AnyNodeTest;
+import net.sf.saxon.pattern.Pattern;
 import net.sf.saxon.trans.XPathException;
 import net.sf.saxon.tree.iter.HomogeneityCheckerIterator;
 import net.sf.saxon.type.Affinity;
@@ -80,6 +82,18 @@ public Expression typeCheck(ExpressionVisitor visitor, ContextItemStaticInfo con
         return this;
     }
 
+    /**
+     * Convert this expression to an equivalent XSLT pattern
+     *
+     * @param config the Saxon configuration
+     * @return the equivalent pattern
+     * @throws net.sf.saxon.trans.XPathException if conversion is not possible
+     */
+    @Override
+    public Pattern toPattern(Configuration config) throws XPathException {
+        return getBaseExpression().toPattern(config);
+    }
+
     /*@NotNull*/
     @Override
     public Expression optimize(ExpressionVisitor visitor, ContextItemStaticInfo contextInfo) throws XPathException {

diff --git a/latest10/hej/net/sf/saxon/expr/SlashExpression.java b/latest10/hej/net/sf/saxon/expr/SlashExpression.java
@@ -869,8 +869,18 @@ public Pattern toPattern(Configuration config) throws XPathException {
             }
         }
         if (headPattern == null) {
-            axis = PatternMaker.getAxisForPathStep(tail);
-            headPattern = head.toPattern(config);
+            if (tail instanceof VennExpression) {
+                Expression lhExpansion = new SlashExpression(
+                        head.copy(new RebindingMap()), ((VennExpression)tail).getLhsExpression());
+                Expression rhExpansion = new SlashExpression(
+                        head.copy(new RebindingMap()), ((VennExpression) tail).getRhsExpression());
+                VennExpression topExpansion = new VennExpression(
+                        lhExpansion, ((VennExpression)tail).operator, rhExpansion);
+                return topExpansion.toPattern(config);
+            } else {
+                axis = PatternMaker.getAxisForPathStep(tail);
+                headPattern = head.toPattern(config);
+            }
         }
         return new AncestorQualifiedPattern(tailPattern, headPattern, axis);
     }